From 80422ea7607a62c40ee6dd56d9a678b059d6bd58 Mon Sep 17 00:00:00 2001
From: Tony <legendmastertony@gmail.com>
Date: Tue, 25 Mar 2025 22:20:07 +0800
Subject: [PATCH 1/5] feat(auto-start): introduce a builder

---
 .changes/autostart-builder.md                 |   5 +
 .../autostart/permissions/schemas/schema.json |   4 +-
 plugins/autostart/src/lib.rs                  | 180 +++++++++++++-----
 .../permissions/schemas/schema.json           |   4 +-
 .../biometric/permissions/schemas/schema.json |   4 +-
 plugins/cli/permissions/schemas/schema.json   |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../deep-link/permissions/schemas/schema.json |   4 +-
 .../dialog/permissions/schemas/schema.json    |   4 +-
 plugins/fs/permissions/schemas/schema.json    |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../haptics/permissions/schemas/schema.json   |   4 +-
 plugins/http/permissions/schemas/schema.json  |   4 +-
 plugins/log/permissions/schemas/schema.json   |   4 +-
 plugins/nfc/permissions/schemas/schema.json   |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../opener/permissions/schemas/schema.json    |   4 +-
 plugins/os/permissions/schemas/schema.json    |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../process/permissions/schemas/schema.json   |   4 +-
 plugins/shell/permissions/schemas/schema.json |   4 +-
 plugins/sql/permissions/schemas/schema.json   |   4 +-
 plugins/store/permissions/schemas/schema.json |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 .../updater/permissions/schemas/schema.json   |   4 +-
 .../upload/permissions/schemas/schema.json    |   4 +-
 .../websocket/permissions/schemas/schema.json |   4 +-
 .../permissions/schemas/schema.json           |   4 +-
 29 files changed, 188 insertions(+), 105 deletions(-)
 create mode 100644 .changes/autostart-builder.md

diff --git a/.changes/autostart-builder.md b/.changes/autostart-builder.md
new file mode 100644
index 0000000000..d21fbc030f
--- /dev/null
+++ b/.changes/autostart-builder.md
@@ -0,0 +1,5 @@
+---
+autostart: minor
+autostart-js: minor
+
+Introduce a `Builder` for more flexible settings and also for the preparation of newer version of auto launch which introduced a new option to change the registry entry to enable auto start in
diff --git a/plugins/autostart/permissions/schemas/schema.json b/plugins/autostart/permissions/schemas/schema.json
index 59c81f521f..defb923c4c 100644
--- a/plugins/autostart/permissions/schemas/schema.json
+++ b/plugins/autostart/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/autostart/src/lib.rs b/plugins/autostart/src/lib.rs
index 5550bfa1d0..703148606e 100644
--- a/plugins/autostart/src/lib.rs
+++ b/plugins/autostart/src/lib.rs
@@ -14,7 +14,7 @@ use auto_launch::{AutoLaunch, AutoLaunchBuilder};
 use serde::{ser::Serializer, Serialize};
 use tauri::{
     command,
-    plugin::{Builder, TauriPlugin},
+    plugin::{Builder as PluginBuilder, TauriPlugin},
     Manager, Runtime, State,
 };
 
@@ -22,8 +22,9 @@ use std::env::current_exe;
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Default, Copy, Clone)]
 pub enum MacosLauncher {
+    #[default]
     LaunchAgent,
     AppleScript,
 }
@@ -71,10 +72,12 @@ impl AutoLaunchManager {
 }
 
 pub trait ManagerExt<R: Runtime> {
+    /// TODO: Rename these to `autostart` or `auto_start` in v3
     fn autolaunch(&self) -> State<'_, AutoLaunchManager>;
 }
 
 impl<R: Runtime, T: Manager<R>> ManagerExt<R> for T {
+    /// TODO: Rename these to `autostart` or `auto_start` in v3
     fn autolaunch(&self) -> State<'_, AutoLaunchManager> {
         self.state::<AutoLaunchManager>()
     }
@@ -95,59 +98,134 @@ async fn is_enabled(manager: State<'_, AutoLaunchManager>) -> Result<bool> {
     manager.is_enabled()
 }
 
+#[derive(Default)]
+pub struct Builder {
+    #[cfg(target_os = "macos")]
+    macos_launcher: MacosLauncher,
+    args: Vec<String>,
+}
+
+impl Builder {
+    /// Create a new auto start builder with default settings
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Adds an argument to pass to your app on startup.
+    ///
+    /// ## Examples
+    ///
+    /// ```no_run
+    /// Builder::new()
+    ///     .arg("--from-autostart")
+    ///     .arg("--hey")
+    ///     .build()
+    ///     .unwrap();
+    /// ```
+    pub fn arg<S: Into<String>>(mut self, arg: S) -> Self {
+        self.args.push(arg.into());
+        self
+    }
+
+    /// Adds multiple arguments to pass to your app on startup.
+    ///
+    /// ## Examples
+    ///
+    /// ```no_run
+    /// Builder::new()
+    ///     .args(["--from-autostart", "--hey"])
+    ///     .build()
+    ///     .unwrap();
+    /// ```
+    pub fn args<I, S>(mut self, args: I) -> Self
+    where
+        I: IntoIterator<Item = S>,
+        S: Into<String>,
+    {
+        for arg in args {
+            self = self.arg(arg);
+        }
+        self
+    }
+
+    /// Sets whether to use launch agent or apple script to be used to enable auto start,
+    /// the builder's default is [`MacosLauncher::LaunchAgent`]
+    #[cfg(target_os = "macos")]
+    pub fn macos_launcher(mut self, macos_launcher: MacosLauncher) -> Self {
+        self.macos_launcher = macos_launcher;
+        self
+    }
+
+    pub fn build<R: Runtime>(self) -> TauriPlugin<R> {
+        PluginBuilder::new("autostart")
+            .invoke_handler(tauri::generate_handler![enable, disable, is_enabled])
+            .setup(move |app, _api| {
+                let mut builder = AutoLaunchBuilder::new();
+                builder.set_app_name(&app.package_info().name);
+                builder.set_args(&self.args);
+
+                let current_exe = current_exe()?;
+
+                #[cfg(windows)]
+                builder.set_app_path(&current_exe.display().to_string());
+
+                #[cfg(target_os = "macos")]
+                {
+                    builder.set_use_launch_agent(matches!(
+                        self.macos_launcher,
+                        MacosLauncher::LaunchAgent
+                    ));
+                    // on macOS, current_exe gives path to /Applications/Example.app/MacOS/Example
+                    // but this results in seeing a Unix Executable in macOS login items
+                    // It must be: /Applications/Example.app
+                    // If it didn't find exactly a single occurance of .app, it will default to
+                    // exe path to not break it.
+                    let exe_path = current_exe.canonicalize()?.display().to_string();
+                    let parts: Vec<&str> = exe_path.split(".app/").collect();
+                    let app_path = if parts.len() == 2
+                        && matches!(macos_launcher, MacosLauncher::AppleScript)
+                    {
+                        format!("{}.app", parts.first().unwrap())
+                    } else {
+                        exe_path
+                    };
+                    builder.set_app_path(&app_path);
+                }
+
+                #[cfg(target_os = "linux")]
+                if let Some(appimage) = app
+                    .env()
+                    .appimage
+                    .and_then(|p| p.to_str().map(|s| s.to_string()))
+                {
+                    builder.set_app_path(&appimage);
+                } else {
+                    builder.set_app_path(&current_exe.display().to_string());
+                }
+
+                app.manage(AutoLaunchManager(
+                    builder.build().map_err(|e| e.to_string())?,
+                ));
+                Ok(())
+            })
+            .build()
+    }
+}
+
 /// Initializes the plugin.
 ///
 /// `args` - are passed to your app on startup.
 pub fn init<R: Runtime>(
-    macos_launcher: MacosLauncher,
+    #[allow(unused)] macos_launcher: MacosLauncher,
     args: Option<Vec<&'static str>>,
 ) -> TauriPlugin<R> {
-    Builder::new("autostart")
-        .invoke_handler(tauri::generate_handler![enable, disable, is_enabled])
-        .setup(move |app, _api| {
-            let mut builder = AutoLaunchBuilder::new();
-            builder.set_app_name(&app.package_info().name);
-            if let Some(args) = args {
-                builder.set_args(&args);
-            }
-            builder.set_use_launch_agent(matches!(macos_launcher, MacosLauncher::LaunchAgent));
-
-            let current_exe = current_exe()?;
-
-            #[cfg(windows)]
-            builder.set_app_path(&current_exe.display().to_string());
-            #[cfg(target_os = "macos")]
-            {
-                // on macOS, current_exe gives path to /Applications/Example.app/MacOS/Example
-                // but this results in seeing a Unix Executable in macOS login items
-                // It must be: /Applications/Example.app
-                // If it didn't find exactly a single occurance of .app, it will default to
-                // exe path to not break it.
-                let exe_path = current_exe.canonicalize()?.display().to_string();
-                let parts: Vec<&str> = exe_path.split(".app/").collect();
-                let app_path =
-                    if parts.len() == 2 && matches!(macos_launcher, MacosLauncher::AppleScript) {
-                        format!("{}.app", parts.first().unwrap())
-                    } else {
-                        exe_path
-                    };
-                builder.set_app_path(&app_path);
-            }
-            #[cfg(target_os = "linux")]
-            if let Some(appimage) = app
-                .env()
-                .appimage
-                .and_then(|p| p.to_str().map(|s| s.to_string()))
-            {
-                builder.set_app_path(&appimage);
-            } else {
-                builder.set_app_path(&current_exe.display().to_string());
-            }
-
-            app.manage(AutoLaunchManager(
-                builder.build().map_err(|e| e.to_string())?,
-            ));
-            Ok(())
-        })
-        .build()
+    let mut builder = Builder::new();
+    if let Some(args) = args {
+        builder = builder.args(args)
+    }
+    #[cfg(target_os = "macos")]
+    {
+        builder = builder.macos_launcher(macos_launcher);
+    }
+    builder.build()
 }
diff --git a/plugins/barcode-scanner/permissions/schemas/schema.json b/plugins/barcode-scanner/permissions/schemas/schema.json
index f41214b443..dc2ab019e3 100644
--- a/plugins/barcode-scanner/permissions/schemas/schema.json
+++ b/plugins/barcode-scanner/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/biometric/permissions/schemas/schema.json b/plugins/biometric/permissions/schemas/schema.json
index cc4d04d514..891877b6ad 100644
--- a/plugins/biometric/permissions/schemas/schema.json
+++ b/plugins/biometric/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/cli/permissions/schemas/schema.json b/plugins/cli/permissions/schemas/schema.json
index b376890ee1..fb1ec63768 100644
--- a/plugins/cli/permissions/schemas/schema.json
+++ b/plugins/cli/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/clipboard-manager/permissions/schemas/schema.json b/plugins/clipboard-manager/permissions/schemas/schema.json
index c276349231..7e23e9a368 100644
--- a/plugins/clipboard-manager/permissions/schemas/schema.json
+++ b/plugins/clipboard-manager/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/deep-link/permissions/schemas/schema.json b/plugins/deep-link/permissions/schemas/schema.json
index 7d887dc2dc..1c96c7d50c 100644
--- a/plugins/deep-link/permissions/schemas/schema.json
+++ b/plugins/deep-link/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/dialog/permissions/schemas/schema.json b/plugins/dialog/permissions/schemas/schema.json
index ed8c073337..4fa8bdf33f 100644
--- a/plugins/dialog/permissions/schemas/schema.json
+++ b/plugins/dialog/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/fs/permissions/schemas/schema.json b/plugins/fs/permissions/schemas/schema.json
index 2c13d5c61e..e8706b04be 100644
--- a/plugins/fs/permissions/schemas/schema.json
+++ b/plugins/fs/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/geolocation/permissions/schemas/schema.json b/plugins/geolocation/permissions/schemas/schema.json
index 4474ec6bd5..fe0129bbff 100644
--- a/plugins/geolocation/permissions/schemas/schema.json
+++ b/plugins/geolocation/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/global-shortcut/permissions/schemas/schema.json b/plugins/global-shortcut/permissions/schemas/schema.json
index 66b92b072f..6270e7f38f 100644
--- a/plugins/global-shortcut/permissions/schemas/schema.json
+++ b/plugins/global-shortcut/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/haptics/permissions/schemas/schema.json b/plugins/haptics/permissions/schemas/schema.json
index 763e0a7220..889da78f63 100644
--- a/plugins/haptics/permissions/schemas/schema.json
+++ b/plugins/haptics/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/http/permissions/schemas/schema.json b/plugins/http/permissions/schemas/schema.json
index 794ee20480..9b6ce6dd2b 100644
--- a/plugins/http/permissions/schemas/schema.json
+++ b/plugins/http/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/log/permissions/schemas/schema.json b/plugins/log/permissions/schemas/schema.json
index 78d8882671..547d1fd820 100644
--- a/plugins/log/permissions/schemas/schema.json
+++ b/plugins/log/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/nfc/permissions/schemas/schema.json b/plugins/nfc/permissions/schemas/schema.json
index 5fe3743c0d..69b4eb23ca 100644
--- a/plugins/nfc/permissions/schemas/schema.json
+++ b/plugins/nfc/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/notification/permissions/schemas/schema.json b/plugins/notification/permissions/schemas/schema.json
index 433f367f31..4c50cde6e1 100644
--- a/plugins/notification/permissions/schemas/schema.json
+++ b/plugins/notification/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/opener/permissions/schemas/schema.json b/plugins/opener/permissions/schemas/schema.json
index b958ac6368..4f289a93a5 100644
--- a/plugins/opener/permissions/schemas/schema.json
+++ b/plugins/opener/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/os/permissions/schemas/schema.json b/plugins/os/permissions/schemas/schema.json
index ad0535324e..ad3317c725 100644
--- a/plugins/os/permissions/schemas/schema.json
+++ b/plugins/os/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/positioner/permissions/schemas/schema.json b/plugins/positioner/permissions/schemas/schema.json
index ccf5515693..4b1d9221ed 100644
--- a/plugins/positioner/permissions/schemas/schema.json
+++ b/plugins/positioner/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/process/permissions/schemas/schema.json b/plugins/process/permissions/schemas/schema.json
index 95f67149be..1818871e42 100644
--- a/plugins/process/permissions/schemas/schema.json
+++ b/plugins/process/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/shell/permissions/schemas/schema.json b/plugins/shell/permissions/schemas/schema.json
index e70c39262e..ff3434677a 100644
--- a/plugins/shell/permissions/schemas/schema.json
+++ b/plugins/shell/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/sql/permissions/schemas/schema.json b/plugins/sql/permissions/schemas/schema.json
index e3add53743..241cf33cb4 100644
--- a/plugins/sql/permissions/schemas/schema.json
+++ b/plugins/sql/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/store/permissions/schemas/schema.json b/plugins/store/permissions/schemas/schema.json
index 4237bc624c..d3cfc815ab 100644
--- a/plugins/store/permissions/schemas/schema.json
+++ b/plugins/store/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/stronghold/permissions/schemas/schema.json b/plugins/stronghold/permissions/schemas/schema.json
index 5657e9bbd7..c7781f1f67 100644
--- a/plugins/stronghold/permissions/schemas/schema.json
+++ b/plugins/stronghold/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/updater/permissions/schemas/schema.json b/plugins/updater/permissions/schemas/schema.json
index 2df800dac9..8264f3e15d 100644
--- a/plugins/updater/permissions/schemas/schema.json
+++ b/plugins/updater/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/upload/permissions/schemas/schema.json b/plugins/upload/permissions/schemas/schema.json
index abe3a09f91..1d8d9c4aa1 100644
--- a/plugins/upload/permissions/schemas/schema.json
+++ b/plugins/upload/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/websocket/permissions/schemas/schema.json b/plugins/websocket/permissions/schemas/schema.json
index 9f5746508f..989d0159d8 100644
--- a/plugins/websocket/permissions/schemas/schema.json
+++ b/plugins/websocket/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
diff --git a/plugins/window-state/permissions/schemas/schema.json b/plugins/window-state/permissions/schemas/schema.json
index 67888bc64f..b94c25738c 100644
--- a/plugins/window-state/permissions/schemas/schema.json
+++ b/plugins/window-state/permissions/schemas/schema.json
@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"

From 3bf58eedb99fb6a69915b54fe15e3292bf607d45 Mon Sep 17 00:00:00 2001
From: Tony <legendmastertony@gmail.com>
Date: Tue, 25 Mar 2025 22:26:05 +0800
Subject: [PATCH 2/5] Update examples

---
 plugins/autostart/README.md  | 4 +---
 plugins/autostart/src/lib.rs | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md
index 76d68f73cc..bae2802afa 100644
--- a/plugins/autostart/README.md
+++ b/plugins/autostart/README.md
@@ -57,11 +57,9 @@ First you need to register the core plugin with Tauri:
 `src-tauri/src/lib.rs`
 
 ```rust
-use tauri_plugin_autostart::MacosLauncher;
-
 fn main() {
     tauri::Builder::default()
-        .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, Some(vec!["--flag1", "--flag2"]) /* arbitrary number of args to pass to your app */))
+        .plugin(tauri_plugin_autostart::Builder::new().args((["--flag1", "--flag2"])).build()))
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
diff --git a/plugins/autostart/src/lib.rs b/plugins/autostart/src/lib.rs
index 703148606e..07ed5119ed 100644
--- a/plugins/autostart/src/lib.rs
+++ b/plugins/autostart/src/lib.rs
@@ -119,8 +119,7 @@ impl Builder {
     /// Builder::new()
     ///     .arg("--from-autostart")
     ///     .arg("--hey")
-    ///     .build()
-    ///     .unwrap();
+    ///     .build();
     /// ```
     pub fn arg<S: Into<String>>(mut self, arg: S) -> Self {
         self.args.push(arg.into());
@@ -134,8 +133,7 @@ impl Builder {
     /// ```no_run
     /// Builder::new()
     ///     .args(["--from-autostart", "--hey"])
-    ///     .build()
-    ///     .unwrap();
+    ///     .build();
     /// ```
     pub fn args<I, S>(mut self, args: I) -> Self
     where

From 1e711fbabb0c0e3207caa7238b9ef9e8aa6faf53 Mon Sep 17 00:00:00 2001
From: Tony <legendmastertony@gmail.com>
Date: Tue, 25 Mar 2025 22:27:24 +0800
Subject: [PATCH 3/5] Fix missing end --- in change file

---
 .changes/autostart-builder.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.changes/autostart-builder.md b/.changes/autostart-builder.md
index d21fbc030f..98ad805671 100644
--- a/.changes/autostart-builder.md
+++ b/.changes/autostart-builder.md
@@ -1,5 +1,6 @@
 ---
 autostart: minor
 autostart-js: minor
+---
 
 Introduce a `Builder` for more flexible settings and also for the preparation of newer version of auto launch which introduced a new option to change the registry entry to enable auto start in

From fe72cd06e03f9bf7cdbb9cd9357cedec7108a134 Mon Sep 17 00:00:00 2001
From: Tony <legendmastertony@gmail.com>
Date: Tue, 25 Mar 2025 22:30:59 +0800
Subject: [PATCH 4/5] Fix missing self.

---
 .changes/autostart-builder.md | 2 +-
 plugins/autostart/src/lib.rs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changes/autostart-builder.md b/.changes/autostart-builder.md
index 98ad805671..fe7f291146 100644
--- a/.changes/autostart-builder.md
+++ b/.changes/autostart-builder.md
@@ -3,4 +3,4 @@ autostart: minor
 autostart-js: minor
 ---
 
-Introduce a `Builder` for more flexible settings and also for the preparation of newer version of auto launch which introduced a new option to change the registry entry to enable auto start in
+Introduce a `Builder` for more flexible settings and also for the preparation of newer version of auto launch which introduced a new option to change the registry entry it uses to enable auto start
diff --git a/plugins/autostart/src/lib.rs b/plugins/autostart/src/lib.rs
index 07ed5119ed..83cac89c41 100644
--- a/plugins/autostart/src/lib.rs
+++ b/plugins/autostart/src/lib.rs
@@ -181,7 +181,7 @@ impl Builder {
                     let exe_path = current_exe.canonicalize()?.display().to_string();
                     let parts: Vec<&str> = exe_path.split(".app/").collect();
                     let app_path = if parts.len() == 2
-                        && matches!(macos_launcher, MacosLauncher::AppleScript)
+                        && matches!(self.macos_launcher, MacosLauncher::AppleScript)
                     {
                         format!("{}.app", parts.first().unwrap())
                     } else {

From 82b2a7654433a5e2959edcb56cd757b62bb628eb Mon Sep 17 00:00:00 2001
From: Tony <68118705+Legend-Master@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:41:14 +0800
Subject: [PATCH 5/5] Update .changes/autostart-builder.md

Co-authored-by: Amr Bashir <amr.bashir2015@gmail.com>
---
 .changes/autostart-builder.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changes/autostart-builder.md b/.changes/autostart-builder.md
index fe7f291146..2ba577498c 100644
--- a/.changes/autostart-builder.md
+++ b/.changes/autostart-builder.md
@@ -3,4 +3,4 @@ autostart: minor
 autostart-js: minor
 ---
 
-Introduce a `Builder` for more flexible settings and also for the preparation of newer version of auto launch which introduced a new option to change the registry entry it uses to enable auto start
+Add a `Builder` for more flexible settings