Embed CLI plugin assets and share bundled plugin registration

Cargo.lock

@@ -10149,6 +10149,7 @@ dependencies = [
  "env_logger",
  "futures",
  "hex",
+ "include_dir",
  "keyring",
  "log 0.4.29",
  "oxc_resolver",

crates-cli/yaak-cli/Cargo.toml

@@ -16,6 +16,7 @@ dirs = "6"
 env_logger = "0.11"
 futures = "0.3"
 hex = { workspace = true }
+include_dir = "0.7"
 keyring = { workspace = true, features = ["apple-native", "windows-native", "sync-secret-service"] }
 log = { workspace = true }
 rand = "0.8"

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

@@ -1,4 +1,6 @@
 use crate::plugin_events::CliPluginEventBridge;
+use include_dir::{Dir, include_dir};
+use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use tokio::sync::Mutex;
@@ -9,6 +11,13 @@ use yaak_models::query_manager::QueryManager;
 use yaak_plugins::events::PluginContext;
 use yaak_plugins::manager::PluginManager;
 
+const EMBEDDED_PLUGIN_RUNTIME: &str = include_str!(concat!(
+    env!("CARGO_MANIFEST_DIR"),
+    "/../../crates-tauri/yaak-app/vendored/plugin-runtime/index.cjs"
+));
+static EMBEDDED_VENDORED_PLUGINS: Dir<'_> =
+    include_dir!("$CARGO_MANIFEST_DIR/../../crates-tauri/yaak-app/vendored/plugins");
+
 pub struct CliContext {
     data_dir: PathBuf,
     query_manager: QueryManager,
@@ -33,10 +42,13 @@ impl CliContext {
             let installed_plugin_dir = data_dir.join("installed-plugins");
             let node_bin_path = PathBuf::from("node");
 
+            prepare_embedded_vendored_plugins(&vendored_plugin_dir)
+                .expect("Failed to prepare bundled plugins");
+
             let plugin_runtime_main =
                 std::env::var("YAAK_PLUGIN_RUNTIME").map(PathBuf::from).unwrap_or_else(|_| {
-                    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-                        .join("../../crates-tauri/yaak-app/vendored/plugin-runtime/index.cjs")
+                    prepare_embedded_plugin_runtime(&data_dir)
+                        .expect("Failed to prepare embedded plugin runtime")
                 });
 
             let plugin_manager = Arc::new(
@@ -50,6 +62,13 @@ impl CliContext {
                 .await,
             );
 
+            {
+                let db = query_manager.connect();
+                if let Err(err) = plugin_manager.ensure_bundled_plugins_registered(&db).await {
+                    eprintln!("Warning: Failed to register bundled plugins: {err}");
+                }
+            }
+
             let plugins = query_manager.connect().list_plugins().unwrap_or_default();
             if !plugins.is_empty() {
                 let errors = plugin_manager
@@ -113,3 +132,17 @@ impl CliContext {
         }
     }
 }
+
+fn prepare_embedded_plugin_runtime(data_dir: &Path) -> std::io::Result<PathBuf> {
+    let runtime_dir = data_dir.join("vendored").join("plugin-runtime");
+    fs::create_dir_all(&runtime_dir)?;
+    let runtime_main = runtime_dir.join("index.cjs");
+    fs::write(&runtime_main, EMBEDDED_PLUGIN_RUNTIME)?;
+    Ok(runtime_main)
+}
+
+fn prepare_embedded_vendored_plugins(vendored_plugin_dir: &Path) -> std::io::Result<()> {
+    fs::create_dir_all(vendored_plugin_dir)?;
+    EMBEDDED_VENDORED_PLUGINS.extract(vendored_plugin_dir)?;
+    Ok(())
+}

crates-tauri/yaak-app/src/plugins_ext.rs

@@ -23,7 +23,6 @@ use tokio::sync::Mutex;
 use ts_rs::TS;
 use yaak_api::yaak_api_client;
 use yaak_models::models::Plugin;
-use yaak_models::util::UpdateSource;
 use yaak_plugins::api::{
     PluginNameVersion, PluginSearchResponse, PluginUpdatesResponse, check_plugin_updates,
     search_plugins,
@@ -281,28 +280,11 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                 )
                 .await;
 
-                // Initialize all plugins after manager is created
-                let bundled_dirs = manager
-                    .list_bundled_plugin_dirs()
-                    .await
-                    .expect("Failed to list bundled plugins");
-
-                // Ensure all bundled plugins make it into the database
                 let db = app_handle_clone.db();
-                for dir in &bundled_dirs {
-                    if db.get_plugin_by_directory(dir).is_none() {
-                        db.upsert_plugin(
-                            &Plugin {
-                                directory: dir.clone(),
-                                enabled: true,
-                                url: None,
-                                ..Default::default()
-                            },
-                            &UpdateSource::Background,
-                        )
-                        .expect("Failed to upsert bundled plugin");
-                    }
-                }
+                manager
+                    .ensure_bundled_plugins_registered(&db)
+                    .await
+                    .expect("Failed to register bundled plugins");
 
                 // Get all plugins from database and initialize
                 let plugins = db.list_plugins().expect("Failed to list plugins from database");

crates/yaak-plugins/src/manager.rs

@@ -33,8 +33,9 @@ use tokio::net::TcpListener;
 use tokio::sync::mpsc::error::TrySendError;
 use tokio::sync::{Mutex, mpsc, oneshot};
 use tokio::time::{Instant, timeout};
+use yaak_models::db_context::DbContext;
 use yaak_models::models::Plugin;
-use yaak_models::util::generate_id;
+use yaak_models::util::{UpdateSource, generate_id};
 use yaak_templates::error::Error::RenderError;
 use yaak_templates::error::Result as TemplateResult;
 
@@ -180,6 +181,33 @@ impl PluginManager {
         read_plugins_dir(&plugins_dir).await
     }
 
+    /// Ensure all bundled plugin directories are present in the plugins table.
+    /// Returns a list of newly registered plugin directories.
+    pub async fn ensure_bundled_plugins_registered(
+        &self,
+        db: &DbContext<'_>,
+    ) -> Result<Vec<String>> {
+        let bundled_dirs = self.list_bundled_plugin_dirs().await?;
+        let mut registered = Vec::new();
+
+        for dir in bundled_dirs {
+            if db.get_plugin_by_directory(&dir).is_none() {
+                db.upsert_plugin(
+                    &Plugin {
+                        directory: dir.clone(),
+                        enabled: true,
+                        url: None,
+                        ..Default::default()
+                    },
+                    &UpdateSource::Background,
+                )?;
+                registered.push(dir);
+            }
+        }
+
+        Ok(registered)
+    }
+
     pub async fn uninstall(&self, plugin_context: &PluginContext, dir: &str) -> Result<()> {
         let plugin = self.get_plugin_by_dir(dir).await.ok_or(PluginNotFoundErr(dir.to_string()))?;
         self.remove_plugin(plugin_context, &plugin).await

package-lock.json

@@ -73,7 +73,7 @@
       "devDependencies": {
         "@biomejs/biome": "^2.3.13",
         "@tauri-apps/cli": "^2.9.6",
-        "@yaakapp/cli": "^0.4.0-beta.1",
+        "@yaakapp/cli": "^0.4.0-beta.2",
         "dotenv-cli": "^11.0.0",
         "husky": "^9.1.7",
         "nodejs-file-downloader": "^4.13.0",
@@ -4326,9 +4326,9 @@
       "link": true
     },
     "node_modules/@yaakapp/cli": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.4.0-beta.1.tgz",
-      "integrity": "sha512-Q/nRjS9nSNZy8PSBJ8VfczwSmfK4k/s9Co5YnsCiomyFppDiIR4hGjwwXAZDjcjnVZYrzAboRM2BXMjJ9PfZCA==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli/-/cli-0.4.0-beta.2.tgz",
+      "integrity": "sha512-UXPxTS9oWVCIr4rShC7HjcAX+gSmw/BQ5F1Xp3Rub3vY/G7+513JJsc1HhLGVZqFfOVRSMEKRxtF9/9okSyiHg==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -4336,18 +4336,18 @@
         "yaakcli": "bin/cli.js"
       },
       "optionalDependencies": {
-        "@yaakapp/cli-darwin-arm64": "0.4.0-beta.1",
-        "@yaakapp/cli-darwin-x64": "0.4.0-beta.1",
-        "@yaakapp/cli-linux-arm64": "0.4.0-beta.1",
-        "@yaakapp/cli-linux-x64": "0.4.0-beta.1",
-        "@yaakapp/cli-win32-arm64": "0.4.0-beta.1",
-        "@yaakapp/cli-win32-x64": "0.4.0-beta.1"
+        "@yaakapp/cli-darwin-arm64": "0.4.0-beta.2",
+        "@yaakapp/cli-darwin-x64": "0.4.0-beta.2",
+        "@yaakapp/cli-linux-arm64": "0.4.0-beta.2",
+        "@yaakapp/cli-linux-x64": "0.4.0-beta.2",
+        "@yaakapp/cli-win32-arm64": "0.4.0-beta.2",
+        "@yaakapp/cli-win32-x64": "0.4.0-beta.2"
       }
     },
     "node_modules/@yaakapp/cli-darwin-arm64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-afvIQeT35bI6d6fRyJ6hnfr0FnzajL4wiVPniezXXEFsVjG74/FPB7jYHRTnIVwG+tPziOND1RG1ff3Hle/Duw==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-arm64/-/cli-darwin-arm64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-mqkyH5tIPRLs9JumP9ZmzjB5gIwmOL1yCDoJ1qVU8DIJ7mwlcQaPGYTK98pVdBcKOjofVakBTcpol9P8rBv4qw==",
       "cpu": [
         "arm64"
       ],
@@ -4358,9 +4358,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-darwin-x64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-4j2AwBnbmVgbzkqLDEZtSQ+/PvJ/eo6GecJcBW92YWnwR4+/R5vPT87Pd0Dy2L4X7Hy2VVmNbwNAEOVvef+u6g==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-darwin-x64/-/cli-darwin-x64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-QI/H2yUF8CkJq+cnRthoUWWTEJPH4QPA78FYcGjFRhvBaj1m2G/GlCA5NkTXm/fvIjNkQEODSihXrhU+zoSSCw==",
       "cpu": [
         "x64"
       ],
@@ -4371,9 +4371,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-arm64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-WgqeTcj7BIgCF1chunX/XcxmpArftYATO1q61aNPxNxIVDKVqbbOh/rLByvwFM8q9A49OjgcLI4QQT1CWdBLig==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-arm64/-/cli-linux-arm64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-nvAp97LkgRpqVHyMwDdpkzlKOWG2kJXezCLRZaRWaEpbnNuviSF+0yzCuFGZRHEEspj7B0TiM+sKGkpvjNlweA==",
       "cpu": [
         "arm64"
       ],
@@ -4384,9 +4384,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-linux-x64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-eMN7CiTbB4pH5NIHTGqNiv56PXb+V7cGg/yU+FopRk69ETH1n+cwGlx1UxSUlcLnaxx0s6pPoo3e+C4cq+i0BQ==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-linux-x64/-/cli-linux-x64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-9/qAMNrtE9glxih3XWGfFssIJpQ4mHNUTuWYKroc0aZZUrunnCw3tX1tQtFDxy0QRIZcGlBeBRtgxuuBd2fYbg==",
       "cpu": [
         "x64"
       ],
@@ -4397,9 +4397,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-win32-arm64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-arm64/-/cli-win32-arm64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-4ygqyEeHLNlTAWYpg83SuLK9dx1af6HqSfHnWFBigflENdZejD/oSGNr1XZeB61QQnjlvaJaqENs4BS9UI9piA==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-arm64/-/cli-win32-arm64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-eM1zL+hl0y3NBLxWO90y9VyaFsAf0HAsECBWvhKhvEdd6KG4K1XzpXrC30cHQBGePIrCa/az8eSuvTde0Z2C/g==",
       "cpu": [
         "arm64"
       ],
@@ -4410,9 +4410,9 @@
       ]
     },
     "node_modules/@yaakapp/cli-win32-x64": {
-      "version": "0.4.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.4.0-beta.1.tgz",
-      "integrity": "sha512-Xpxk+e9RWKOzY9siMDlgZPa0HU61GsTn5CTHOpPxUJHmUu+7urJ+sEgaoZx4fRjPBH+FVD9Y4s+zRCawd7O75w==",
+      "version": "0.4.0-beta.2",
+      "resolved": "https://registry.npmjs.org/@yaakapp/cli-win32-x64/-/cli-win32-x64-0.4.0-beta.2.tgz",
+      "integrity": "sha512-ySdiK0h216EqURkM5KZoqbPTgbIX4eNK/IgrKwSazxRb369HOZYQ8X68as+VRxEL4NCMmWlQNdbBDuf+apg/mg==",
       "cpu": [
         "x64"
       ],

package.json

@@ -98,7 +98,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.3.13",
     "@tauri-apps/cli": "^2.9.6",
-    "@yaakapp/cli": "^0.4.0-beta.1",
+    "@yaakapp/cli": "^0.4.0-beta.2",
     "dotenv-cli": "^11.0.0",
     "husky": "^9.1.7",
     "nodejs-file-downloader": "^4.13.0",