Fix prompt

Co-authored-by: i-usebruno <anon.repressed498@passinbox.com>
Co-authored-by: Gregory Schier <gschier1990@gmail.com>

.eslintignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
-.prettierrc.cjs
 .eslintrc.cjs
-env.d.ts
+.prettierrc.cjs
+src-web/postcss.config.cjs
+src-web/vite.config.ts

.eslintrc.cjs

@@ -17,9 +17,8 @@ module.exports = {
     'plugin-runtime/**/*',
     'plugin-runtime-types/**/*',
     'src-tauri/**/*',
-    'plugins/**/*',
-    'tailwind.config.cjs',
-    'vite.config.ts',
+    'src-web/tailwind.config.cjs',
+    'src-web/vite.config.ts',
   ],
   settings: {
     react: {

.gitattributes

@@ -0,0 +1,2 @@
+src-tauri/vendored/**/* linguist-generated=true
+src-tauri/gen/schemas/**/* linguist-generated=true

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,45 +0,0 @@
-name: Bug Report
-description: "Something isn't working properly in Yaak"
-title: "Short description"
-labels: ["bug", "needs triage"]
-assignees:
-  - gschier
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report 🤗
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see!
-      value: "A bug happened!"
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: What version of our software are you running?
-      placeholder: 2024.8.0
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: What operating system are you on?
-      multiple: false
-      options:
-        - macOS
-        - Windows
-        - Linux
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Feature Request, Question, etc.
+  - name: Bugs, Feedback, Feature Requests, and Questions
     url: https://feedback.yaak.app
-    about: Report all non-bugs to the feedback board 👉🏼
+    about: "Please report to Yaak's public feedback board. Issues will be created and linked here when applicable."

.github/workflows/release.yml

@@ -16,10 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: 'macos-latest' # for Arm-based macs (M1 and above).
+          - platform: 'macos-latest' # for Arm-based Macs (M1 and above).
             args: '--target aarch64-apple-darwin'
             yaak_arch: 'arm64'
-          - platform: 'macos-latest' # for Intel-based macs.
+          - platform: 'macos-latest' # for Intel-based Macs.
             args: '--target x86_64-apple-darwin'
             yaak_arch: 'x64'
           - platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04.
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - uses: actions/setup-go@v5
         with:
@@ -66,25 +66,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Install Node dependencies
-        run: |
-          npm ci
-
-      - name: Install plugin-runtime Node dependencies
-        working-directory: plugin-runtime
+      - name: Install NPM Dependencies
         run: |
           npm ci
+          npm install @yaakapp/cli
 
       - name: Install Protoc for plugin-runtime
         uses: arduino/setup-protoc@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install yaak CLI
-        run: |
-          npm install -g @yaakapp/cli
-          yaakcli --version
-
       - name: Run lint
         run: npm run lint
 

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged

.sqllsrc.json

@@ -1,5 +0,0 @@
-{
-  "name": "yaak-dev",
-  "adapter": "sqlite3",
-  "filename": "src-tauri/db.sqlite"
-}

DEVELOPMENT.md

@@ -1,12 +1,62 @@
-## Developer Setup
+# Developer Setup
 
-Development requires the following tools
+Yaak is a combined Node.js and Rust monorepo. It is a [Tauri](https://tauri.app) project, so 
+uses Rust and HTML/CSS/JS for the main application but there is also a plugin system powered
+by a Node.js sidecar that communicates to the app over gRPC.
+
+Because of the moving parts, there are a few setup steps required before development can 
+begin.
+
+## Prerequisites
+
+Make sure you have the following tools installed:
 
 - [Node.js](https://nodejs.org/en/download/package-manager)
 - [Rust](https://www.rust-lang.org/tools/install)
 
-Then, you can run the app.
+Check the installations with the following commands:
 
-1. Checkout the [plugins](https://github.com/yaakapp/plugins) repository
-2. Run `YAAK_PLUGINS_DIR="..." npm run build` to generate an icon, fetch external binaries, and build local JS dependencies
-3. Run the desktop app in dev mode `npm start`
+```shell
+node -v
+npm -v
+rustc --version
+```
+
+Install the NPM dependencies:
+
+```shell
+npm install
+```
+
+Run the `bootstrap` command to do some initial setup:
+
+```shell
+npm run bootstrap
+```
+
+_NOTE: Run with `YAAK_PLUGINS_DIR=<Path to yaakapp/plugins>` to re-build bundled plugins_
+
+## Run the App
+
+After bootstrapping, start the app in development mode:
+
+```shell
+npm start
+```
+
+_NOTE: If working on bundled plugins, run with `YAAK_PLUGINS_DIR=<Path to yaakapp/plugins>`_
+
+## SQLite Migrations
+
+New migrations can be created from the `src-tauri/` directory:
+   
+```shell
+cd src-tauri
+sqlx migrate add migration-name
+```
+
+Run the app to apply the migrations. 
+
+If nothing happens, try `cargo clean` and run the app again.
+
+_Note: Development builds use a separate database location from production builds._

README.md

@@ -7,10 +7,14 @@ requests. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.
 
 ## Feedback and Bug Reports
 
-Please [Create an Issue](https://github.com/yaakapp/app/issues/new) for bug reports and
-submit all other feedback to the [Feedback Board](https://feedback.yaak.app).
+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.
 
 ## Contribution Policy
 
-Yaak open source, but currently only accepting contributions for bug fixes. See [
-`DEVELOPMENT.md`](DEVELOPMENT.md).
+Yaak 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.

package.json

@@ -2,120 +2,46 @@
   "name": "yaak-app",
   "private": true,
   "version": "0.0.0",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yaakapp/app.git"
   },
+  "workspaces": [
+    "plugin-runtime",
+    "plugin-runtime-types",
+    "src-tauri/yaak_models",
+    "src-tauri/yaak_plugin_runtime",
+    "src-tauri/yaak_sync",
+    "src-tauri/yaak_templates",
+    "src-web"
+  ],
   "scripts": {
-    "start": "npm run tauri-dev:desktop",
-    "tauri-dev:desktop": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-dev:ios": "tauri ios dev --force-ip-prompt --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-build": "tauri build",
+    "start": "npm run app-dev",
+    "app-build": "tauri build",
+    "app-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
+    "bootstrap": "run-p bootstrap:* && npm run --workspaces --if-present bootstrap",
+    "bootstrap:vendor-node": "node scripts/vendor-node.cjs",
+    "bootstrap:vendor-plugins": "node scripts/vendor-plugins.cjs",
+    "bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",
+    "lint": "npm run --workspaces --if-present lint",
+    "replace-version": "node scripts/replace-version.cjs",
     "tauri": "tauri",
-    "dev:js": "vite dev",
-    "lint": "tsc && eslint . --ext .ts,.tsx",
-    "build": "run-p build:*",
-    "build:icon:release": "tauri icon design/icon.png --output ./src-tauri/icons/release",
-    "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
-    "build:js": "vite build",
-    "build:plugin-runtime": "npm run --prefix plugin-runtime build",
-    "build:vendor-protoc": "node scripts/vendor-protoc.cjs",
-    "build:vendor-plugins": "node scripts/vendor-plugins.cjs",
-    "build:vendor-node": "node scripts/vendor-node.cjs",
-    "prepare": "husky install",
-    "replace-version": "node scripts/replace-version.cjs"
-  },
-  "dependencies": {
-    "@codemirror/commands": "^6",
-    "@codemirror/lang-javascript": "^6",
-    "@codemirror/lang-json": "^6",
-    "@codemirror/lang-xml": "^6",
-    "@codemirror/language": "^6",
-    "@codemirror/search": "^6",
-    "@lezer/generator": "^1.7.1",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/lr": "^1.4.2",
-    "@react-hook/resize-observer": "^2.0.2",
-    "@tailwindcss/container-queries": "^0.1.1",
-    "@tanstack/react-query": "^5.55.4",
-    "@tauri-apps/api": "^2.0.0-rc.4",
-    "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.2",
-    "@tauri-apps/plugin-dialog": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-fs": "^2.0.0-rc.2",
-    "@tauri-apps/plugin-log": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-os": "^2.0.0-rc.1",
-    "@tauri-apps/plugin-shell": "^2.0.0-rc.1",
-    "@yaakapp/api": "^0.1.17",
-    "buffer": "^6.0.3",
-    "classnames": "^2.5.1",
-    "cm6-graphql": "^0.0.9",
-    "codemirror": "^6.0.1",
-    "codemirror-json-schema": "^0.7.8",
-    "date-fns": "^3.6.0",
-    "eventemitter3": "^5.0.1",
-    "fast-fuzzy": "^1.12.0",
-    "focus-trap-react": "^10.2.3",
-    "format-graphql": "^1.5.0",
-    "framer-motion": "^11.5.4",
-    "jotai": "^2.9.3",
-    "lucide-react": "^0.439.0",
-    "mime": "^4.0.4",
-    "papaparse": "^5.4.1",
-    "parse-color": "^1.0.0",
-    "react": "^18.3.1",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.3.1",
-    "react-helmet-async": "^2.0.5",
-    "react-pdf": "^9.1.0",
-    "react-router-dom": "^6.26.2",
-    "react-use": "^17.5.1",
-    "slugify": "^1.6.6",
-    "uuid": "^10.0.0",
-    "xml-formatter": "^3.6.3"
+    "tauri-before-build": "npm run bootstrap && npm run --workspaces --if-present build",
+    "tauri-before-dev": "npm run --workspaces --if-present dev"
   },
   "devDependencies": {
-    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.55.4",
-    "@tauri-apps/cli": "^2.0.0-rc.14",
-    "@types/node": "^22.5.4",
-    "@types/papaparse": "^5.3.14",
-    "@types/parse-color": "^1.0.3",
-    "@types/parse-json": "^4.0.2",
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
-    "@types/uuid": "^10.0.0",
+    "@tauri-apps/cli": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^8.5.0",
     "@typescript-eslint/parser": "^8.5.0",
-    "@vitejs/plugin-react": "^4.3.1",
-    "autoprefixer": "^10.4.20",
-    "decompress": "^4.2.1",
     "eslint": "^8",
     "eslint-config-prettier": "^8",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-jsx-a11y": "^6.10.0",
     "eslint-plugin-react": "^7.35.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "husky": "^9.1.5",
-    "internal-ip": "^8.0.0",
-    "lint-staged": "^15.2.10",
     "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.45",
-    "postcss-nesting": "^13.0.0",
     "prettier": "^3.3.3",
-    "react-devtools": "^5.3.1",
-    "rimraf": "^6.0.1",
-    "tailwindcss": "^3.4.10",
-    "typescript": "^5.6.0",
-    "vite": "^5.4.4",
-    "vite-plugin-static-copy": "^1.0.6",
-    "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-top-level-await": "^1.4.4"
-  },
-  "lint-staged": {
-    "*.{ts,tsx}": "eslint --cache --fix",
-    "*.{js,css,md}": "prettier --write"
+    "typescript": "^5.6.2"
   }
 }

plugin-runtime-types/package.json

@@ -1,19 +1,26 @@
 {
   "name": "@yaakapp/api",
-  "version": "0.1.17",
+  "version": "0.2.15",
   "main": "lib/index.js",
   "typings": "./lib/index.d.ts",
   "files": [
-    "lib"
+    "lib/**/*"
   ],
   "scripts": {
-    "build": "tsc",
+    "bootstrap": "npm run build",
+    "build": "run-s build:copy-types build:tsc",
+    "build:tsc": "tsc",
+    "build:copy-types": "run-p build:copy-types:*",
+    "build:copy-types:root": "cpy --flat ../src-tauri/yaak_plugin_runtime/bindings/*.ts ./src/bindings",
+    "build:copy-types:next": "cpy --flat ../src-tauri/yaak_plugin_runtime/bindings/serde_json/*.ts ./src/bindings/serde_json",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@types/node": "^22.5.4"
   },
   "devDependencies": {
+    "cpy-cli": "^5.0.0",
+    "npm-run-all": "^4.1.5",
     "typescript": "^5.6.2"
   }
 }

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

@@ -0,0 +1,232 @@
+// 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 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 ExportHttpRequestRequest = { httpRequest: HttpRequest, };
+
+export type ExportHttpRequestResponse = { content: 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 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 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" } | { "type": "reload_response" } | { "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" } & GetHttpRequestActionsRequest | { "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": "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" };
+
+export type OpenFileFilter = { name: string, 
+/**
+ * File extensions to require
+ */
+extensions: Array<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
+ */
+require?: 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, aliases?: Array<string>, args: Array<TemplateFunctionArg>, };
+
+export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg | { "type": "file" } & TemplateFunctionFileArg;
+
+export type TemplateFunctionBaseArg = { 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateFunctionCheckboxArg = { 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateFunctionFileArg = { 
+/**
+ * The title of the file selection window
+ */
+title: string, 
+/**
+ * Allow selecting multiple files
+ */
+multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<OpenFileFilter>, 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateFunctionHttpRequestArg = { 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateFunctionSelectArg = { 
+/**
+ * The options that will be available in the select input
+ */
+options: Array<TemplateFunctionSelectOption>, 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateFunctionSelectOption = { label: string, value: string, };
+
+export type TemplateFunctionTextArg = { 
+/**
+ * Placeholder for the text input
+ */
+placeholder?: string, 
+/**
+ * The name of the argument. Should be `camelCase` format
+ */
+name: string, 
+/**
+ * Whether the user must fill in the argument
+ */
+optional?: boolean, 
+/**
+ * The label of the input 
+ */
+label?: string, 
+/**
+ * The default value
+ */
+defaultValue?: string, };
+
+export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, };
+
+export type TemplateRenderResponse = { data: JsonValue, };
+
+export type WindowContext = { "type": "none" } | { "type": "label", label: string, };

plugin-runtime-types/src/bindings/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, createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };
+
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, };
+
+export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, name: string, sortPriority: number, };
+
+export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: 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>, 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, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };
+
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, };
+
+export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, status: number, statusReason: string | null, url: string, version: string | null, };
+
+export type HttpResponseHeader = { name: string, value: string, };
+
+export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, };
+
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, name: string, description: string, variables: Array<EnvironmentVariable>, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

plugin-runtime-types/src/bindings/serde_json/JsonValue.ts

@@ -1,3 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type CopyTextRequest = { text: string, };
+export type JsonValue = number | string | Array<JsonValue> | { [key in string]?: JsonValue };

plugin-runtime-types/src/gen/CallHttpRequestActionArgs.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/CallHttpRequestActionRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallHttpRequestActionArgs } from "./CallHttpRequestActionArgs";
-
-export type CallHttpRequestActionRequest = { key: string, pluginRefId: string, args: CallHttpRequestActionArgs, };

plugin-runtime-types/src/gen/CallTemplateFunctionArgs.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { RenderPurpose } from "./RenderPurpose";
-
-export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key: string]: string }, };

plugin-runtime-types/src/gen/CallTemplateFunctionRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallTemplateFunctionArgs } from "./CallTemplateFunctionArgs";
-
-export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };

plugin-runtime-types/src/gen/Cookie.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.
-import type { CookieDomain } from "./CookieDomain";
-import type { CookieExpires } from "./CookieExpires";
-
-export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };

plugin-runtime-types/src/gen/CookieDomain.ts

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

plugin-runtime-types/src/gen/CookieExpires.ts

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

plugin-runtime-types/src/gen/CookieJar.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Cookie } from "./Cookie";
-
-export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array<Cookie>, };

plugin-runtime-types/src/gen/EmptyResponse.ts

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

plugin-runtime-types/src/gen/Environment.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EnvironmentVariable } from "./EnvironmentVariable";
-
-export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };

plugin-runtime-types/src/gen/EnvironmentVariable.ts

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

plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts

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

plugin-runtime-types/src/gen/FilterRequest.ts

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

plugin-runtime-types/src/gen/FilterResponse.ts

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

plugin-runtime-types/src/gen/FindHttpResponsesRequest.ts

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

plugin-runtime-types/src/gen/FindHttpResponsesResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponse } from "./HttpResponse";
-
-export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };

plugin-runtime-types/src/gen/Folder.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, };

plugin-runtime-types/src/gen/GetHttpRequestActionsRequest.ts

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

plugin-runtime-types/src/gen/GetHttpRequestActionsResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequestAction } from "./HttpRequestAction";
-
-export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };

plugin-runtime-types/src/gen/GetHttpRequestByIdRequest.ts

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

plugin-runtime-types/src/gen/GetHttpRequestByIdResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };

plugin-runtime-types/src/gen/GetTemplateFunctionsResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunction } from "./TemplateFunction";
-
-export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };

plugin-runtime-types/src/gen/GrpcConnection.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key: string]: string }, };

plugin-runtime-types/src/gen/GrpcEvent.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { GrpcEventType } from "./GrpcEventType";
-
-export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, updatedAt: string, content: string, eventType: GrpcEventType, metadata: { [key: string]: string }, status: number | null, error: string | null, };

plugin-runtime-types/src/gen/GrpcEventType.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";

plugin-runtime-types/src/gen/GrpcMetadataEntry.ts

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

plugin-runtime-types/src/gen/GrpcRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { GrpcMetadataEntry } from "./GrpcMetadataEntry";
-
-export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record<string, any>, metadata: Array<GrpcMetadataEntry>, };

plugin-runtime-types/src/gen/HttpRequest.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.
-import type { HttpRequestHeader } from "./HttpRequestHeader";
-import type { HttpUrlParameter } from "./HttpUrlParameter";
-
-export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array<HttpUrlParameter>, method: string, body: Record<string, any>, bodyType: string | null, authentication: Record<string, any>, authenticationType: string | null, headers: Array<HttpRequestHeader>, };

plugin-runtime-types/src/gen/HttpRequestAction.ts

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

plugin-runtime-types/src/gen/HttpRequestHeader.ts

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

plugin-runtime-types/src/gen/HttpResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponseHeader } from "./HttpResponseHeader";
-
-export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array<HttpResponseHeader>, };

plugin-runtime-types/src/gen/HttpResponseHeader.ts

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

plugin-runtime-types/src/gen/HttpUrlParameter.ts

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

plugin-runtime-types/src/gen/ImportRequest.ts

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

plugin-runtime-types/src/gen/ImportResources.ts

@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment } from "./Environment";
-import type { Folder } from "./Folder";
-import type { GrpcRequest } from "./GrpcRequest";
-import type { HttpRequest } from "./HttpRequest";
-import type { Workspace } from "./Workspace";
-
-export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, };

plugin-runtime-types/src/gen/ImportResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ImportResources } from "./ImportResources";
-
-export type ImportResponse = { resources: ImportResources, };

plugin-runtime-types/src/gen/InternalEvent.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InternalEventPayload } from "./InternalEventPayload";
-
-export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, };

plugin-runtime-types/src/gen/InternalEventPayload.ts

@@ -1,30 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CallHttpRequestActionRequest } from "./CallHttpRequestActionRequest";
-import type { CallTemplateFunctionRequest } from "./CallTemplateFunctionRequest";
-import type { CallTemplateFunctionResponse } from "./CallTemplateFunctionResponse";
-import type { CopyTextRequest } from "./CopyTextRequest";
-import type { EmptyResponse } from "./EmptyResponse";
-import type { ExportHttpRequestRequest } from "./ExportHttpRequestRequest";
-import type { ExportHttpRequestResponse } from "./ExportHttpRequestResponse";
-import type { FilterRequest } from "./FilterRequest";
-import type { FilterResponse } from "./FilterResponse";
-import type { FindHttpResponsesRequest } from "./FindHttpResponsesRequest";
-import type { FindHttpResponsesResponse } from "./FindHttpResponsesResponse";
-import type { GetHttpRequestActionsRequest } from "./GetHttpRequestActionsRequest";
-import type { GetHttpRequestActionsResponse } from "./GetHttpRequestActionsResponse";
-import type { GetHttpRequestByIdRequest } from "./GetHttpRequestByIdRequest";
-import type { GetHttpRequestByIdResponse } from "./GetHttpRequestByIdResponse";
-import type { GetTemplateFunctionsResponse } from "./GetTemplateFunctionsResponse";
-import type { ImportRequest } from "./ImportRequest";
-import type { ImportResponse } from "./ImportResponse";
-import type { PluginBootRequest } from "./PluginBootRequest";
-import type { PluginBootResponse } from "./PluginBootResponse";
-import type { PluginReloadRequest } from "./PluginReloadRequest";
-import type { PluginReloadResponse } from "./PluginReloadResponse";
-import type { RenderHttpRequestRequest } from "./RenderHttpRequestRequest";
-import type { RenderHttpRequestResponse } from "./RenderHttpRequestResponse";
-import type { SendHttpRequestRequest } from "./SendHttpRequestRequest";
-import type { SendHttpRequestResponse } from "./SendHttpRequestResponse";
-import type { ShowToastRequest } from "./ShowToastRequest";
-
-export type InternalEventPayload = { "type": "boot_request" } & PluginBootRequest | { "type": "boot_response" } & PluginBootResponse | { "type": "reload_request" } & PluginReloadRequest | { "type": "reload_response" } & PluginReloadResponse | { "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" } & GetHttpRequestActionsRequest | { "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": "copy_text_request" } & CopyTextRequest | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "show_toast_request" } & ShowToastRequest | { "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" } & EmptyResponse;

plugin-runtime-types/src/gen/KeyValue.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, };

plugin-runtime-types/src/gen/Model.ts

@@ -1,15 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { CookieJar } from "./CookieJar";
-import type { Environment } from "./Environment";
-import type { Folder } from "./Folder";
-import type { GrpcConnection } from "./GrpcConnection";
-import type { GrpcEvent } from "./GrpcEvent";
-import type { GrpcRequest } from "./GrpcRequest";
-import type { HttpRequest } from "./HttpRequest";
-import type { HttpResponse } from "./HttpResponse";
-import type { KeyValue } from "./KeyValue";
-import type { Plugin } from "./Plugin";
-import type { Settings } from "./Settings";
-import type { Workspace } from "./Workspace";
-
-export type Model = Environment | Folder | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | KeyValue | Workspace | CookieJar | Settings | Plugin;

plugin-runtime-types/src/gen/Plugin.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Plugin = { id: string, model: "plugin", createdAt: string, updatedAt: string, checkedAt: string | null, directory: string, url: string | null, enabled: boolean, };

plugin-runtime-types/src/gen/PluginBootRequest.ts

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

plugin-runtime-types/src/gen/PluginBootResponse.ts

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

plugin-runtime-types/src/gen/PluginReloadRequest.ts

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

plugin-runtime-types/src/gen/PluginReloadResponse.ts

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

plugin-runtime-types/src/gen/RenderHttpRequestRequest.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.
-import type { HttpRequest } from "./HttpRequest";
-import type { RenderPurpose } from "./RenderPurpose";
-
-export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };

plugin-runtime-types/src/gen/RenderHttpRequestResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/RenderPurpose.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type RenderPurpose = "send" | "preview";

plugin-runtime-types/src/gen/SendHttpRequestRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpRequest } from "./HttpRequest";
-
-export type SendHttpRequestRequest = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/SendHttpRequestResponse.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { HttpResponse } from "./HttpResponse";
-
-export type SendHttpRequestResponse = { httpResponse: HttpResponse, };

plugin-runtime-types/src/gen/Settings.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Settings = { id: string, model: "settings", createdAt: string, updatedAt: string, theme: string, appearance: string, themeDark: string, themeLight: string, updateChannel: string, interfaceFontSize: number, interfaceScale: number, editorFontSize: number, editorSoftWrap: boolean, telemetry: boolean, openWorkspaceNewWindow: boolean | null, };

plugin-runtime-types/src/gen/ShowToastRequest.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ToastVariant } from "./ToastVariant";
-
-export type ShowToastRequest = { message: string, variant: ToastVariant, };

plugin-runtime-types/src/gen/TemplateFunction.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionArg } from "./TemplateFunctionArg";
-
-export type TemplateFunction = { name: string, args: Array<TemplateFunctionArg>, };

plugin-runtime-types/src/gen/TemplateFunctionArg.ts

@@ -1,7 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionCheckboxArg } from "./TemplateFunctionCheckboxArg";
-import type { TemplateFunctionHttpRequestArg } from "./TemplateFunctionHttpRequestArg";
-import type { TemplateFunctionSelectArg } from "./TemplateFunctionSelectArg";
-import type { TemplateFunctionTextArg } from "./TemplateFunctionTextArg";
-
-export type TemplateFunctionArg = { "type": "text" } & TemplateFunctionTextArg | { "type": "select" } & TemplateFunctionSelectArg | { "type": "checkbox" } & TemplateFunctionCheckboxArg | { "type": "http_request" } & TemplateFunctionHttpRequestArg;

plugin-runtime-types/src/gen/TemplateFunctionBaseArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionBaseArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionCheckboxArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionCheckboxArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionHttpRequestArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionHttpRequestArg = { name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionSelectArg.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { TemplateFunctionSelectOption } from "./TemplateFunctionSelectOption";
-
-export type TemplateFunctionSelectArg = { options: Array<TemplateFunctionSelectOption>, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/TemplateFunctionSelectOption.ts

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

plugin-runtime-types/src/gen/TemplateFunctionTextArg.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type TemplateFunctionTextArg = { placeholder?: string | null, name: string, optional?: boolean | null, label?: string | null, defaultValue?: string | null, };

plugin-runtime-types/src/gen/ToastVariant.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type ToastVariant = "custom" | "copied" | "success" | "info" | "warning" | "error";

plugin-runtime-types/src/gen/Workspace.ts

@@ -1,4 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { EnvironmentVariable } from "./EnvironmentVariable";
-
-export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array<EnvironmentVariable>, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

plugin-runtime-types/src/helpers.ts

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

plugin-runtime-types/src/index.ts

@@ -1,68 +1,5 @@
 export type * from './plugins';
 export type * from './themes';
 
-// TODO: The next ts-rs release includes the ability to put everything in 1 file!
-export * from './gen/CallHttpRequestActionArgs';
-export * from './gen/CallHttpRequestActionRequest';
-export * from './gen/CallTemplateFunctionRequest';
-export * from './gen/CallTemplateFunctionResponse';
-export * from './gen/CallTemplateFunctionArgs';
-export * from './gen/Cookie';
-export * from './gen/CookieDomain';
-export * from './gen/CookieExpires';
-export * from './gen/CookieJar';
-export * from './gen/CopyTextRequest';
-export * from './gen/EmptyResponse';
-export * from './gen/Environment';
-export * from './gen/EnvironmentVariable';
-export * from './gen/ExportHttpRequestRequest';
-export * from './gen/ExportHttpRequestResponse';
-export * from './gen/FilterRequest';
-export * from './gen/FilterResponse';
-export * from './gen/Folder';
-export * from './gen/FindHttpResponsesRequest';
-export * from './gen/FindHttpResponsesResponse';
-export * from './gen/GetHttpRequestActionsResponse';
-export * from './gen/GetHttpRequestByIdRequest';
-export * from './gen/GetHttpRequestByIdResponse';
-export * from './gen/GetTemplateFunctionsResponse';
-export * from './gen/GrpcConnection';
-export * from './gen/GrpcEvent';
-export * from './gen/GrpcMetadataEntry';
-export * from './gen/GrpcRequest';
-export * from './gen/HttpRequest';
-export * from './gen/HttpRequestAction';
-export * from './gen/HttpRequestHeader';
-export * from './gen/HttpResponse';
-export * from './gen/HttpResponseHeader';
-export * from './gen/HttpUrlParameter';
-export * from './gen/ImportRequest';
-export * from './gen/ImportResources';
-export * from './gen/ImportResponse';
-export * from './gen/InternalEvent';
-export * from './gen/InternalEventPayload';
-export * from './gen/KeyValue';
-export * from './gen/Model';
-export * from './gen/PluginBootRequest';
-export * from './gen/PluginBootResponse';
-export * from './gen/PluginReloadRequest';
-export * from './gen/PluginReloadResponse';
-export * from './gen/RenderHttpRequestRequest';
-export * from './gen/RenderHttpRequestResponse';
-export * from './gen/RenderPurpose';
-export * from './gen/SendHttpRequestRequest';
-export * from './gen/SendHttpRequestResponse';
-export * from './gen/SendHttpRequestResponse';
-export * from './gen/Settings';
-export * from './gen/ShowToastRequest';
-export * from './gen/TemplateFunction';
-export * from './gen/TemplateFunctionArg';
-export * from './gen/TemplateFunctionBaseArg';
-export * from './gen/TemplateFunctionCheckboxArg';
-export * from './gen/TemplateFunctionHttpRequestArg';
-export * from './gen/TemplateFunctionSelectArg';
-export * from './gen/TemplateFunctionSelectOption';
-export * from './gen/TemplateFunctionTextArg';
-export * from './gen/ToastVariant';
-export * from './gen/Workspace';
-export * from './gen/Plugin';
+export * from './bindings/models';
+export * from './bindings/events';

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

@@ -1,12 +1,18 @@
-import { FindHttpResponsesRequest } from '../gen/FindHttpResponsesRequest';
-import { FindHttpResponsesResponse } from '../gen/FindHttpResponsesResponse';
-import { GetHttpRequestByIdRequest } from '../gen/GetHttpRequestByIdRequest';
-import { GetHttpRequestByIdResponse } from '../gen/GetHttpRequestByIdResponse';
-import { RenderHttpRequestRequest } from '../gen/RenderHttpRequestRequest';
-import { RenderHttpRequestResponse } from '../gen/RenderHttpRequestResponse';
-import { SendHttpRequestRequest } from '../gen/SendHttpRequestRequest';
-import { SendHttpRequestResponse } from '../gen/SendHttpRequestResponse';
-import { ShowToastRequest } from '../gen/ShowToastRequest';
+import {
+  FindHttpResponsesRequest,
+  FindHttpResponsesResponse,
+  GetHttpRequestByIdRequest,
+  GetHttpRequestByIdResponse,
+  PromptTextRequest,
+  PromptTextResponse,
+  RenderHttpRequestRequest,
+  RenderHttpRequestResponse,
+  SendHttpRequestRequest,
+  SendHttpRequestResponse,
+  ShowToastRequest,
+  TemplateRenderRequest,
+  TemplateRenderResponse,
+} from '..';
 
 export type Context = {
   clipboard: {
@@ -15,6 +21,9 @@ export type Context = {
   toast: {
     show(args: ShowToastRequest): void;
   };
+  prompt: {
+    text(args: PromptTextRequest): Promise<PromptTextResponse['value']>;
+  };
   httpRequest: {
     send(args: SendHttpRequestRequest): Promise<SendHttpRequestResponse['httpResponse']>;
     getById(args: GetHttpRequestByIdRequest): Promise<GetHttpRequestByIdResponse['httpRequest']>;
@@ -23,4 +32,7 @@ export type Context = {
   httpResponse: {
     find(args: FindHttpResponsesRequest): Promise<FindHttpResponsesResponse['httpResponses']>;
   };
+  templates: {
+    render(args: TemplateRenderRequest): Promise<TemplateRenderResponse['data']>;
+  };
 };

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

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

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

@@ -1,7 +1,4 @@
-import { Environment } from '../gen/Environment';
-import { Folder } from '../gen/Folder';
-import { HttpRequest } from '../gen/HttpRequest';
-import { Workspace } from '../gen/Workspace';
+import { Environment, Folder, HttpRequest, Workspace } from '..';
 import { AtLeast } from '../helpers';
 import { Context } from './Context';
 

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

@@ -1,5 +1,4 @@
-import { CallTemplateFunctionArgs } from '../gen/CallTemplateFunctionArgs';
-import { TemplateFunction } from '../gen/TemplateFunction';
+import { CallTemplateFunctionArgs, TemplateFunction } from '..';
 import { Context } from './Context';
 
 export type TemplateFunctionPlugin = TemplateFunction & {

plugin-runtime/nodemon.json

@@ -1,5 +0,0 @@
-{
-  "watch": ["src"],
-  "ext": "ts",
-  "exec": "node -r ts-node/register ./src/index.ts"
-}

plugin-runtime/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@yaak/plugin-runtime",
+  "name": "@yaakapp-internal/plugin-runtime",
   "scripts": {
-    "dev": "nodemon",
+    "bootstrap": "npm run build",
     "build": "run-p build:*",
-    "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=build/index.cjs",
-    "build:worker": "esbuild src/index.worker.ts --bundle --platform=node --outfile=build/index.worker.cjs",
+    "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"
   },
   "dependencies": {
@@ -16,10 +16,6 @@
   "devDependencies": {
     "@types/intercept-stdout": "^0.1.3",
     "grpc-tools": "^1.12.4",
-    "nodemon": "^3.1.4",
-    "npm-run-all": "^4.1.5",
-    "ts-node": "^10.9.2",
-    "ts-proto": "^2.2.0",
-    "typescript": "^5.6.0"
+    "ts-proto": "^2.2.0"
   }
 }

plugin-runtime/src/PluginHandle.ts

@@ -1,14 +1,15 @@
-import { InternalEvent } from '@yaakapp/api';
+import { BootRequest, InternalEvent } from '@yaakapp-internal/plugin';
 import path from 'node:path';
 import { Worker } from 'node:worker_threads';
 import { EventChannel } from './EventChannel';
+import { PluginWorkerData } from './index.worker';
 
 export class PluginHandle {
   #worker: Worker;
 
   constructor(
-    readonly pluginDir: string,
     readonly pluginRefId: string,
+    readonly bootRequest: BootRequest,
     readonly events: EventChannel,
   ) {
     this.#worker = this.#createWorker();
@@ -18,30 +19,38 @@ export class PluginHandle {
     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: { pluginDir: this.pluginDir, pluginRefId: this.pluginRefId },
+      workerData,
     });
 
     worker.on('message', (e) => this.events.emit(e));
     worker.on('error', this.#handleError.bind(this));
     worker.on('exit', this.#handleExit.bind(this));
 
-    console.log('Created plugin worker for ', this.pluginDir);
+    console.log('Created plugin worker for ', this.bootRequest.dir);
 
     return worker;
   }
 
   async #handleError(err: Error) {
-    console.error('Plugin errored', this.pluginDir, err);
+    console.error('Plugin errored', this.bootRequest.dir, err);
   }
 
   async #handleExit(code: number) {
     if (code === 0) {
-      console.log('Plugin exited successfully', this.pluginDir);
+      console.log('Plugin exited successfully', this.bootRequest.dir);
     } else {
-      console.log('Plugin exited with status', code, this.pluginDir);
+      console.log('Plugin exited with status', code, this.bootRequest.dir);
     }
   }
 }

plugin-runtime/src/index.ts

@@ -18,17 +18,23 @@ const plugins: Record<string, PluginHandle> = {};
       const pluginEvent: InternalEvent = JSON.parse(e.event);
       // Handle special event to bootstrap plugin
       if (pluginEvent.payload.type === 'boot_request') {
-        const plugin = new PluginHandle(pluginEvent.payload.dir, pluginEvent.pluginRefId, events);
+        const plugin = new PluginHandle(pluginEvent.pluginRefId, pluginEvent.payload, events);
         plugins[pluginEvent.pluginRefId] = plugin;
       }
 
-      // Once booted, forward all events to plugin's worker
+      // 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');

plugin-runtime/src/index.worker.ts

@@ -1,29 +1,42 @@
 import {
-  Context,
+  BootRequest,
   FindHttpResponsesResponse,
   GetHttpRequestByIdResponse,
   HttpRequestAction,
   ImportResponse,
   InternalEvent,
   InternalEventPayload,
+  PromptTextResponse,
   RenderHttpRequestResponse,
   SendHttpRequestResponse,
   TemplateFunction,
-} from '@yaakapp/api';
+  TemplateRenderResponse,
+  WindowContext,
+} from '@yaakapp-internal/plugin';
+import { Context } from '@yaakapp/api';
 import { HttpRequestActionPlugin } from '@yaakapp/api/lib/plugins/HttpRequestActionPlugin';
 import { TemplateFunctionPlugin } from '@yaakapp/api/lib/plugins/TemplateFunctionPlugin';
 import interceptStdout from 'intercept-stdout';
 import * as console from 'node:console';
-import { Stats, readFileSync, statSync, watch } from 'node:fs';
+import { readFileSync, Stats, 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 { pluginDir, pluginRefId } = workerData;
+  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];
@@ -41,21 +54,26 @@ async function initialize() {
   if (typeof mod.pluginHookImport === 'function') capabilities.push('import');
   if (typeof mod.pluginHookResponseFilter === 'function') capabilities.push('filter');
 
-  console.log('Plugin initialized', pkg.name, capabilities, Object.keys(mod));
+  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 };
+    return { pluginRefId, id: genId(), replyId, payload, windowContext };
   }
 
-  function sendEmpty(replyId: string | null = null): string {
-    return sendPayload({ type: 'empty_response' }, replyId);
+  function sendEmpty(windowContext: WindowContext, replyId: string | null = null): string {
+    return sendPayload(windowContext, { type: 'empty_response' }, replyId);
   }
 
-  function sendPayload(payload: InternalEventPayload, replyId: string | null): string {
-    const event = buildEventToSend(payload, replyId);
+  function sendPayload(
+    windowContext: WindowContext,
+    payload: InternalEventPayload,
+    replyId: string | null,
+  ): string {
+    const event = buildEventToSend(windowContext, payload, replyId);
     sendEvent(event);
     return event.id;
   }
@@ -68,10 +86,11 @@ async function initialize() {
   }
 
   async function sendAndWaitForReply<T extends Omit<InternalEventPayload, 'type'>>(
+    windowContext: WindowContext,
     payload: InternalEventPayload,
   ): Promise<T> {
     // 1. Build event to send
-    const eventToSend = buildEventToSend(payload, null);
+    const eventToSend = buildEventToSend(windowContext, payload, null);
 
     // 2. Spawn listener in background
     const promise = new Promise<InternalEventPayload>(async (resolve) => {
@@ -96,53 +115,93 @@ async function initialize() {
   }
 
   // Reload plugin if JS or package.json changes
+  const windowContextNone: WindowContext = { type: 'none' };
   const cb = async () => {
     await reloadModule();
-    return sendPayload({ type: 'reload_response' }, null);
+    return sendPayload(windowContextNone, { type: 'reload_response' }, null);
   };
 
-  watchFile(pathMod, cb);
-  watchFile(pathPkg, cb);
+  if (enableWatch) {
+    watchFile(pathMod, cb);
+    watchFile(pathPkg, cb);
+  }
 
-  const ctx: Context = {
+  const newCtx = (event: InternalEvent): Context => ({
     clipboard: {
       async copyText(text) {
-        await sendAndWaitForReply({ type: 'copy_text_request', text });
+        await sendAndWaitForReply(event.windowContext, { type: 'copy_text_request', text });
       },
     },
     toast: {
       async show(args) {
-        await sendAndWaitForReply({ type: 'show_toast_request', ...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>(payload);
+        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>(payload);
+        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>(payload);
+        const { httpResponse } = await sendAndWaitForReply<SendHttpRequestResponse>(
+          event.windowContext,
+          payload,
+        );
         return httpResponse;
       },
       async render(args) {
         const payload = { type: 'render_http_request_request', ...args } as const;
-        const result = await sendAndWaitForReply<RenderHttpRequestResponse>(payload);
-        return result.httpRequest;
+        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 ({ payload, id: replyId }: InternalEvent) => {
+  parentPort!.on('message', async (event: InternalEvent) => {
+    let { windowContext, payload, id: replyId } = event;
+    const ctx = newCtx(event);
     try {
       if (payload.type === 'boot_request') {
         const payload: InternalEventPayload = {
@@ -151,7 +210,15 @@ async function initialize() {
           version: pkg.version,
           capabilities,
         };
-        sendPayload(payload, replyId);
+        sendPayload(windowContext, payload, replyId);
+        return;
+      }
+
+      if (payload.type === 'terminate_request') {
+        const payload: InternalEventPayload = {
+          type: 'terminate_response',
+        };
+        sendPayload(windowContext, payload, replyId);
         return;
       }
 
@@ -162,7 +229,7 @@ async function initialize() {
             type: 'import_response',
             resources: reply?.resources,
           };
-          sendPayload(replyPayload, replyId);
+          sendPayload(windowContext, replyPayload, replyId);
           return;
         } else {
           // Continue, to send back an empty reply
@@ -178,7 +245,7 @@ async function initialize() {
           type: 'export_http_request_response',
           content: reply,
         };
-        sendPayload(replyPayload, replyId);
+        sendPayload(windowContext, replyPayload, replyId);
         return;
       }
 
@@ -191,7 +258,7 @@ async function initialize() {
           type: 'filter_response',
           content: reply,
         };
-        sendPayload(replyPayload, replyId);
+        sendPayload(windowContext, replyPayload, replyId);
         return;
       }
 
@@ -211,7 +278,7 @@ async function initialize() {
           pluginRefId,
           actions: reply,
         };
-        sendPayload(replyPayload, replyId);
+        sendPayload(windowContext, replyPayload, replyId);
         return;
       }
 
@@ -231,7 +298,7 @@ async function initialize() {
           pluginRefId,
           functions: reply,
         };
-        sendPayload(replyPayload, replyId);
+        sendPayload(windowContext, replyPayload, replyId);
         return;
       }
 
@@ -239,10 +306,12 @@ async function initialize() {
         payload.type === 'call_http_request_action_request' &&
         Array.isArray(mod.plugin?.httpRequestActions)
       ) {
-        const action = mod.plugin.httpRequestActions.find((a) => a.key === payload.key);
+        const action = mod.plugin.httpRequestActions.find(
+          (a: HttpRequestActionPlugin) => a.key === payload.key,
+        );
         if (typeof action?.onSelect === 'function') {
           await action.onSelect(ctx, payload.args);
-          sendEmpty(replyId);
+          sendEmpty(windowContext, replyId);
           return;
         }
       }
@@ -251,10 +320,19 @@ async function initialize() {
         payload.type === 'call_template_function_request' &&
         Array.isArray(mod.plugin?.templateFunctions)
       ) {
-        const action = mod.plugin.templateFunctions.find((a) => a.name === payload.name);
+        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({ type: 'call_template_function_response', value: result ?? null }, replyId);
+          sendPayload(
+            windowContext,
+            {
+              type: 'call_template_function_response',
+              value: result ?? null,
+            },
+            replyId,
+          );
           return;
         }
       }
@@ -268,7 +346,7 @@ async function initialize() {
     }
 
     // No matches, so send back an empty response so the caller doesn't block forever
-    sendEmpty(replyId);
+    sendEmpty(windowContext, replyId);
   });
 }
 
@@ -313,8 +391,6 @@ function watchFile(filepath: string, cb: (filepath: string) => void) {
     const stat = statSync(filepath);
     if (stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
       cb(filepath);
-    } else {
-      console.log('SKIPPING SAME FILE STAT', filepath, stat);
     }
     watchedFiles[filepath] = stat;
   });

plugin-runtime/tsconfig.json

@@ -7,9 +7,9 @@
     "target": "es2021",
     "lib": ["es2021"],
     "noImplicitAny": false,
-    "moduleResolution": "node",
+    "moduleResolution": "node16",
     "sourceMap": true,
-    "outDir": "dist",
+    "outDir": "build",
     "baseUrl": ".",
     "paths": {
       "*": [
@@ -19,6 +19,6 @@
     }
   },
   "include": [
-    "src/**/*"
+    "src"
   ]
 }

scripts/.gitignore

@@ -0,0 +1 @@
+tmp-*

scripts/vendor-node.cjs

@@ -1,10 +1,10 @@
 const path = require('node:path');
 const decompress = require('decompress');
-const Downloader = require("nodejs-file-downloader");
-const {rmSync, cpSync, mkdirSync, existsSync} = require("node:fs");
-const {execSync} = require("node:child_process");
+const Downloader = require('nodejs-file-downloader');
+const { rmSync, cpSync, mkdirSync, existsSync } = require('node:fs');
+const { execSync } = require('node:child_process');
 
-const NODE_VERSION = 'v22.5.1';
+const NODE_VERSION = 'v22.9.0';
 
 // `${process.platform}_${process.arch}`
 const MAC_ARM = 'darwin_arm64';
@@ -39,20 +39,26 @@ const destDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'node');
 const binDest = path.join(destDir, DST_BIN_MAP[key]);
 console.log(`Vendoring NodeJS ${NODE_VERSION} for ${key}`);
 
-if (existsSync(binDest) && execSync(`${binDest} --version`).toString('utf-8').trim() === NODE_VERSION) {
-  console.log("NodeJS already vendored");
+if (existsSync(binDest) && tryExecSync(`${binDest} --version`).trim() === NODE_VERSION) {
+  console.log('NodeJS already vendored');
   return;
 }
 
-rmSync(destDir, {recursive: true, force: true});
-mkdirSync(destDir, {recursive: true});
+rmSync(destDir, { recursive: true, force: true });
+mkdirSync(destDir, { recursive: true });
+
+const url = URL_MAP[key];
+const tmpDir = path.join(__dirname, 'tmp-node');
+rmSync(tmpDir, { recursive: true, force: true });
 
 (async function () {
-  const url = URL_MAP[key];
-  const tmpDir = path.join(__dirname, 'tmp', Date.now().toString());
-
   // Download GitHub release artifact
-  const {filePath} = await new Downloader({url, directory: tmpDir}).download();
+  console.log('Downloading NodeJS at', url);
+  const { filePath } = await new Downloader({
+    url,
+    directory: tmpDir,
+    timeout: 1000 * 60 * 2,
+  }).download();
 
   // Decompress to the same directory
   await decompress(filePath, tmpDir, {});
@@ -60,10 +66,18 @@ mkdirSync(destDir, {recursive: true});
   // Copy binary
   const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]);
   cpSync(binSrc, binDest);
-  rmSync(tmpDir, {recursive: true, force: true});
+  rmSync(tmpDir, { recursive: true, force: true });
 
-  console.log("Downloaded NodeJS to", binDest);
-})().catch(err => {
+  console.log('Downloaded NodeJS to', binDest);
+})().catch((err) => {
   console.log('Script failed:', err);
   process.exit(1);
 });
+
+function tryExecSync(cmd) {
+  try {
+    return execSync(cmd).toString('utf-8');
+  } catch (_) {
+    return '';
+  }
+}

scripts/vendor-plugins.cjs

@@ -3,8 +3,8 @@ const path = require('node:path');
 const { execSync } = require('node:child_process');
 const pluginsDir = process.env.YAAK_PLUGINS_DIR;
 if (!pluginsDir) {
-  console.log('YAAK_PLUGINS_DIR is not set');
-  process.exit(1);
+  console.log('Skipping bundled plugins build because YAAK_PLUGINS_DIR is not set');
+  return;
 }
 
 console.log('Installing Yaak plugins dependencies', pluginsDir);

scripts/vendor-protoc.cjs

@@ -1,7 +1,8 @@
 const decompress = require('decompress');
-const Downloader = require("nodejs-file-downloader");
-const path = require("node:path");
-const {rmSync, mkdirSync, cpSync} = require("node:fs");
+const Downloader = require('nodejs-file-downloader');
+const path = require('node:path');
+const { rmSync, mkdirSync, cpSync, existsSync } = require('node:fs');
+const { execSync } = require('node:child_process');
 
 const VERSION = '27.2';
 
@@ -33,32 +34,46 @@ const DST_BIN_MAP = {
 };
 
 const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'protoc');
-rmSync(dstDir, {recursive: true, force: true});
-mkdirSync(dstDir, {recursive: true});
+const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;
+console.log(`Vendoring protoc ${VERSION} for ${key}`);
+
+const url = URL_MAP[key];
+const tmpDir = path.join(__dirname, 'tmp-protoc');
+const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]);
+const binDst = path.join(dstDir, DST_BIN_MAP[key]);
+
+if (existsSync(binDst) && tryExecSync(`${binDst} --version`).trim().includes(VERSION)) {
+  console.log('Protoc already vendored');
+  return;
+}
+
+rmSync(tmpDir, { recursive: true, force: true });
+rmSync(dstDir, { recursive: true, force: true });
+mkdirSync(dstDir, { recursive: true });
 
 (async function () {
-  const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;
-  console.log(`Vendoring protoc ${VERSION} for ${key}`);
-  const url = URL_MAP[key];
-  const tmpDir = path.join(__dirname, 'tmp', Date.now().toString());
-
   // Download GitHub release artifact
-  const {filePath} = await new Downloader({url, directory: tmpDir,}).download();
+  const { filePath } = await new Downloader({ url, directory: tmpDir }).download();
 
   // Decompress to the same directory
   await decompress(filePath, tmpDir, {});
 
   // Copy binary
-  const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]);
-  const binDst = path.join(dstDir, DST_BIN_MAP[key]);
   cpSync(binSrc, binDst);
 
   // Copy other files
   const includeSrc = path.join(tmpDir, 'include');
   const includeDst = path.join(dstDir, 'include');
-  cpSync(includeSrc, includeDst, {recursive: true});
+  cpSync(includeSrc, includeDst, { recursive: true });
+  rmSync(tmpDir, { recursive: true, force: true });
 
-  rmSync(tmpDir, {recursive: true, force: true});
+  console.log('Downloaded protoc to', binDst);
+})().catch((err) => console.log('Script failed:', err));
 
-  console.log("Downloaded protoc to", binDst);
-})().catch(err => console.log('Script failed:', err));
+function tryExecSync(cmd) {
+  try {
+    return execSync(cmd).toString('utf-8');
+  } catch (_) {
+    return '';
+  }
+}

src-tauri/.gitignore

@@ -1,5 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+target/
 
-vendored
+vendored/*
+!vendored/plugins

src-tauri/Cargo.lock

@@ -143,18 +143,22 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "ashpd"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
+checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
 dependencies = [
  "enumflags2",
  "futures-channel",
  "futures-util",
  "rand 0.8.5",
+ "raw-window-handle",
  "serde",
  "serde_repr",
  "tokio",
  "url",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
  "zbus",
 ]
 
@@ -1344,6 +1348,15 @@ dependencies = [
  "syn 2.0.72",
 ]
 
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading",
+]
+
 [[package]]
 name = "dlopen2"
 version = "0.7.0"
@@ -1373,6 +1386,12 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.1"
@@ -1937,19 +1956,6 @@ dependencies = [
  "x11",
 ]
 
-[[package]]
-name = "generator"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.48.0",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1970,6 +1976,16 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30"
+dependencies = [
+ "rustix",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -2969,21 +2985,6 @@ dependencies = [
  "value-bag",
 ]
 
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "mac"
 version = "0.1.1"
@@ -3013,15 +3014,6 @@ dependencies = [
  "tendril",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -3117,16 +3109,17 @@ dependencies = [
 
 [[package]]
 name = "muda"
-version = "0.14.1"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1"
+checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591"
 dependencies = [
- "cocoa 0.26.0",
  "crossbeam-channel",
  "dpi",
  "gtk",
  "keyboard-types",
- "objc",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "once_cell",
  "png",
  "serde",
@@ -3231,16 +3224,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -3334,17 +3317,6 @@ dependencies = [
  "objc_exception",
 ]
 
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -3589,12 +3561,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "pad"
 version = "0.1.6"
@@ -3913,7 +3879,7 @@ checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.3.0",
- "quick-xml",
+ "quick-xml 0.32.0",
  "serde",
  "time",
 ]
@@ -4201,6 +4167,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.36.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quinn"
 version = "0.11.3"
@@ -4436,17 +4411,8 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -4457,15 +4423,9 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.4"
@@ -4549,21 +4509,20 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251"
+checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e"
 dependencies = [
  "ashpd",
- "block",
- "dispatch",
+ "block2",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
  "js-sys",
  "log",
- "objc",
- "objc-foundation",
- "objc_id",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "raw-window-handle",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -4835,6 +4794,7 @@ dependencies = [
  "serde",
  "serde_json",
  "url",
+ "uuid",
 ]
 
 [[package]]
@@ -5169,15 +5129,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shared_child"
 version = "1.0.1"
@@ -5534,15 +5485,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "state"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
-dependencies = [
- "loom",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -5700,9 +5642,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.30.0"
+version = "0.30.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e"
+checksum = "06e48d7c56b3f7425d061886e8ce3b6acfab1993682ed70bef50fd133d721ee6"
 dependencies = [
  "bitflags 2.6.0",
  "cocoa 0.26.0",
@@ -5731,7 +5673,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows 0.58.0",
+ "windows",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -5773,13 +5715,12 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.0.0-rc.12"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e5d4a319f11ae72c77d0f4dbd9703ab6b401eb91d1ca88d89c33d13d4ea20c"
+checksum = "3c9c08beea86d5095b6f5fb1c788fe8759b23c3f71927c66a69e725a91d089cd"
 dependencies = [
  "anyhow",
  "bytes",
- "cocoa 0.26.0",
  "dirs",
  "dunce",
  "embed_plist",
@@ -5795,7 +5736,9 @@ dependencies = [
  "log",
  "mime",
  "muda",
- "objc",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "percent-encoding",
  "plist",
  "raw-window-handle",
@@ -5804,7 +5747,6 @@ dependencies = [
  "serde_json",
  "serde_repr",
  "serialize-to-javascript",
- "state",
  "swift-rs",
  "tauri-build",
  "tauri-macros",
@@ -5819,14 +5761,14 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows 0.58.0",
+ "windows",
 ]
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "148441d64674b2885c1ba5baf3ae61662bb8753859ffcfb541962cbc6b847f39"
+checksum = "93bb649a284aec2ab43e8df6831b8c8060d231ec8ddf05bf021d58cb67570e1f"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5846,9 +5788,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a15c3f9282c82871c69ddb65d02ae552738bbac848c8adcab521bf14d8b9e6"
+checksum = "a4511912612ba0da11aeb300e18e18b2c7067fd14aa886eac46bdcc43b4fa3ee"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -5873,9 +5815,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.0-rc.10"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d1aa317bec56f78388cf6012d788876d838595a48f95cbd7835642db356a0"
+checksum = "62ee976578a14b779996d7b6879d7e625c8ce674bc87e223953664f37def2eef"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -5887,9 +5829,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82a2adea16b8a71b7a5ad23f720bb13f8d2830b820cc1c266512314ba99bf67"
+checksum = "774d084450b7ec8e445ad119079307f935b7bf3d736da139a8664eb1d4909aa5"
 dependencies = [
  "anyhow",
  "glob",
@@ -5920,9 +5862,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.0.0-rc.7"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "785722c81beb4a6b729ae55d06aeb68d47166c933e64b727e33254dcb5d4d82d"
+checksum = "6da13d0dd431efe6b5e40a3314d7a33d7bce8f8ed34e2bf044f95ccad82f10ec"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -5938,9 +5880,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.0.0-rc.5"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cb1dfbbea322afbc9dec49351bc29edf4e85e74d37d9a3fcc72d67ed55ffdbd"
+checksum = "6ba59d7880ffdc24f72350b48bec374482803e167b7275655f6bd8426b7fc9c3"
 dependencies = [
  "anyhow",
  "dunce",
@@ -5959,13 +5901,13 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-log"
-version = "2.0.0-rc.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57e4666c4a5d81f81b7bb8eacf51ae32c4e69c35071aabb480ad20a80836e4e"
+checksum = "76553b57322a5fd316971fc607c0886f68f7fbced7fba53911bdfb4209fa3ed9"
 dependencies = [
  "android_logger",
  "byte-unit",
- "cocoa 0.25.0",
+ "cocoa 0.26.0",
  "fern",
  "log",
  "objc",
@@ -5981,11 +5923,11 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-os"
-version = "2.0.0-rc.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee761edd532fce2232453e9c8e0f7d9c0b6fe125c4b90b3eb4362ee84224"
+checksum = "fac65dc1cf2276651d6a53976a3be618434aacfd5a39eeecc4be9ea74e07f4fb"
 dependencies = [
- "gethostname",
+ "gethostname 0.5.0",
  "log",
  "os_info",
  "serde",
@@ -5999,9 +5941,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.0.0-rc.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83800ddf78b820172efb5ed7310344e8e4f97fd30cd8237a3f20c12a79eb136"
+checksum = "2929bb35edb7255949e0cbcb2285ff6b02371bf826ad03471077b6b3bf4e6d60"
 dependencies = [
  "encoding_rs",
  "log",
@@ -6020,9 +5962,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-updater"
-version = "2.0.0-rc.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391ebb8ae8cd6aec44b5d96d3005659d88cde69c57326f639bbc660116a30d63"
+checksum = "64531b5ae953faa8ff3cd4b5d7752e8c9b3df2a47bfbd0a495d47b5cd492dc63"
 dependencies = [
  "base64 0.22.1",
  "dirs",
@@ -6031,6 +5973,7 @@ dependencies = [
  "http 1.1.0",
  "infer",
  "minisign-verify",
+ "percent-encoding",
  "reqwest",
  "semver",
  "serde",
@@ -6049,9 +5992,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-window-state"
-version = "2.0.0-rc.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c9b841c8164b949eac9e4fe8d56a23ed5e8ef0ac1c52e26a500709f7a50e50"
+checksum = "47f5bdd802302c72e6e52f786d4d7abc976a8a7938b05c121ae689106bcd4a40"
 dependencies = [
  "bitflags 2.6.0",
  "log",
@@ -6064,9 +6007,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389f78c8e8e6eff3897d8d9581087943b5976ea96a0ab5036be691f28c2b0df0"
+checksum = "2570e1f33f332a2d2d9967ebb3903bc4e1f92b9c47e4d1b302c10ea4153fcdbb"
 dependencies = [
  "dpi",
  "gtk",
@@ -6078,20 +6021,22 @@ dependencies = [
  "tauri-utils",
  "thiserror",
  "url",
- "windows 0.58.0",
+ "windows",
 ]
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "466c418aef2ddc7d31173a5b00bfae3df9b58ed66644339f3ca55008bfc54f25"
+checksum = "8147d8f9ed418d83a90af3d64fbdca5e0e924ae28e5351da88f9568169db8665"
 dependencies = [
- "cocoa 0.26.0",
  "gtk",
  "http 1.1.0",
  "jni",
  "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "percent-encoding",
  "raw-window-handle",
  "softbuffer",
@@ -6101,15 +6046,15 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.58.0",
+ "windows",
  "wry",
 ]
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-rc.11"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3019641087c9039b57ebfca95fa42a93c07056845b7d8d57c8966061bcee83b4"
+checksum = "f87856e9d7fa91fd710362f3c73fccbf6bfd036934908791e65bd803d54dc8a8"
 dependencies = [
  "brotli",
  "cargo_metadata",
@@ -6137,6 +6082,7 @@ dependencies = [
  "toml 0.8.2",
  "url",
  "urlpattern",
+ "uuid",
  "walkdir",
 ]
 
@@ -6209,16 +6155,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "tiff"
 version = "0.9.1"
@@ -6576,43 +6512,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
 ]
 
 [[package]]
 name = "tray-icon"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe"
+checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f"
 dependencies = [
  "core-graphics 0.24.0",
  "crossbeam-channel",
@@ -6637,11 +6543,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "ts-rs"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44017f9f875786e543595076374b9ef7d13465a518dd93d6ccdbf5b432dde8c"
+checksum = "3a2f31991cee3dce1ca4f929a8a04fdd11fd8801aac0f2030b0fa8a0a3fef6b9"
 dependencies = [
  "chrono",
+ "lazy_static",
  "serde_json",
  "thiserror",
  "ts-rs-macros",
@@ -6649,9 +6556,9 @@ dependencies = [
 
 [[package]]
 name = "ts-rs-macros"
-version = "9.0.1"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c88cc88fd23b5a04528f3a8436024f20010a16ec18eb23c164b1242f65860130"
+checksum = "0ea0b99e8ec44abd6f94a18f28f7934437809dd062820797c52401298116f70e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6839,14 +6746,9 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom 0.2.15",
  "rand 0.8.5",
+ "serde",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
 [[package]]
 name = "value-bag"
 version = "1.9.0"
@@ -7013,6 +6915,66 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
+dependencies = [
+ "bitflags 2.6.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
+dependencies = [
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.36.2",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.69"
@@ -7090,7 +7052,7 @@ checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.58.0",
+ "windows",
  "windows-core 0.58.0",
  "windows-implement",
  "windows-interface",
@@ -7114,7 +7076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886"
 dependencies = [
  "thiserror",
- "windows 0.58.0",
+ "windows",
  "windows-core 0.58.0",
 ]
 
@@ -7178,15 +7140,6 @@ dependencies = [
  "windows-version",
 ]
 
-[[package]]
-name = "windows"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows"
 version = "0.58.0"
@@ -7504,9 +7457,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.43.1"
+version = "0.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728"
+checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73"
 dependencies = [
  "base64 0.22.1",
  "block",
@@ -7536,7 +7489,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.58.0",
+ "windows",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -7578,7 +7531,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
 dependencies = [
- "gethostname",
+ "gethostname 0.4.3",
  "rustix",
  "x11rb-protocol",
 ]

src-tauri/Cargo.toml

@@ -16,7 +16,7 @@ crate-type = ["staticlib", "cdylib", "lib"]
 strip = true  # Automatically strip symbols from the binary.
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc.0", features = [] }
+tauri-build = { version = "2.0.0", features = [] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2.7"
@@ -47,12 +47,12 @@ serde_yaml = "0.9.34"
 tauri = { workspace = true }
 tauri-plugin-shell = { workspace = true }
 tauri-plugin-clipboard-manager = "2.1.0-beta.7"
-tauri-plugin-dialog = "2.0.0-rc.7"
-tauri-plugin-fs = "2.0.0-rc.5"
-tauri-plugin-log = { version = "2.0.0-rc.2", features = ["colored"] }
-tauri-plugin-os = "2.0.0-rc.1"
-tauri-plugin-updater = "2.0.0-rc.3"
-tauri-plugin-window-state = "2.0.0-rc.4"
+tauri-plugin-dialog = "2.0.0"
+tauri-plugin-fs = "2.0.0"
+tauri-plugin-log = { version = "2.0.0", features = ["colored"] }
+tauri-plugin-os = "2.0.0"
+tauri-plugin-updater = "2.0.0"
+tauri-plugin-window-state = "2.0.0"
 tokio = { version = "1.36.0", features = ["sync"] }
 tokio-stream = "0.1.15"
 uuid = "1.7.0"
@@ -63,5 +63,5 @@ urlencoding = "2.1.3"
 [workspace.dependencies]
 yaak_models = { path = "yaak_models" }
 yaak_plugin_runtime = { path = "yaak_plugin_runtime" }
-tauri-plugin-shell = "2.0.0-rc.3"
-tauri = { version = "2.0.0-rc.12", features = ["devtools", "protocol-asset"] }
+tauri-plugin-shell = "2.0.0"
+tauri = { version = "2.0.0", features = ["devtools", "protocol-asset"] }