Improved git

.github/workflows/codeql.yml

@@ -51,6 +51,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
+          submodules: recursive
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v3

.github/workflows/development.yml

@@ -40,6 +40,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
+          submodules: recursive
           # Dev CI doesn't need LFS assets; skipping saves bandwidth and disk.
           lfs: false
 

.github/workflows/nightly.yml

@@ -39,6 +39,7 @@ jobs:
         with:
           ref: ${{ env.TARGET_REF }}
           fetch-depth: 0   # we need history and tags
+          submodules: recursive
           lfs: false
 
       - name: Fetch tags
@@ -99,6 +100,7 @@ jobs:
         with:
           ref: ${{ env.TARGET_REF }}
           fetch-depth: 0
+          submodules: recursive
           lfs: true
 
       - name: Compute metadata (date, short SHA, compare, changelog)

.github/workflows/publish-stable.yml

@@ -33,6 +33,7 @@ jobs:
         with:
           lfs: true
           fetch-depth: 0
+          submodules: recursive
 
       - name: Compute version tag
         id: version

.gitignore

@@ -25,3 +25,4 @@ dist-ssr
 /target
 /Backend/icons/android
 /Backend/icons/ios
+/Core

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "Backend/built-in-plugins/Git"]
+	path = Backend/built-in-plugins/Git
+	url = git@github.com:Open-VCS/OpenVCS-Plugin-Git.git
+[submodule "Backend/built-in-plugins/OfficialThemes"]
+	path = Backend/built-in-plugins/OfficialThemes
+	url = git@github.com:Open-VCS/OpenVCS-Plugin-Themes.git

Backend/build.rs

@@ -86,6 +86,19 @@ fn sanitize_semver_ident(s: &str) -> String {
     }
 }
 
+fn ensure_generated_builtins_resource_dir(manifest_dir: &std::path::Path) {
+    // Keep `bundle.resources` valid for plain `cargo build` runs even before
+    // plugin bundles are generated.
+    let generated = manifest_dir.join("../target/openvcs/built-in-plugins");
+    if let Err(err) = fs::create_dir_all(&generated) {
+        panic!(
+            "failed to create generated built-in plugins resource dir {}: {}",
+            generated.display(),
+            err
+        );
+    }
+}
+
 fn main() {
     // Base config path (in the Backend crate)
     let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR"));
@@ -229,6 +242,8 @@ fn main() {
     println!("cargo:rustc-env=OPENVCS_VERSION={}", version);
     println!("cargo:rustc-env=OPENVCS_BUILD={}", build_id);
 
+    ensure_generated_builtins_resource_dir(&manifest_dir);
+
     // Proceed with tauri build steps
     tauri_build::build();
 }

Backend/src/lib.rs

@@ -1,5 +1,5 @@
 use log::warn;
-use openvcs_core::{backend_id, BackendId};
+use openvcs_core::BackendId;
 use std::sync::Arc;
 use tauri::path::BaseDirectory;
 use tauri::WindowEvent;
@@ -23,27 +23,21 @@ mod utilities;
 mod validate;
 mod workarounds;
 
-pub const GIT_SYSTEM_ID: BackendId = backend_id!("git-system");
-
-fn preferred_git_backend_id(cfg: &settings::AppConfig) -> Option<BackendId> {
-    let configured = cfg.git.backend.trim();
-    if !configured.is_empty() {
-        return Some(BackendId::from(configured.to_string()));
-    }
-
-    // No configured backend: pick a git backend from enabled plugins (if any exist).
-    let mut git_ids: Vec<String> = Vec::new();
-    if let Ok(plugin_bes) = crate::plugin_vcs_backends::list_plugin_vcs_backends() {
-        for p in plugin_bes {
-            let id = p.backend_id.as_ref();
-            if id.starts_with("git-") {
-                git_ids.push(id.to_string());
-            }
+fn preferred_vcs_backend_id(_cfg: &settings::AppConfig) -> Option<BackendId> {
+    let desired = _cfg.general.default_backend.trim().to_string();
+    if !desired.is_empty() {
+        let desired = BackendId::from(desired);
+        if crate::plugin_vcs_backends::has_plugin_vcs_backend(&desired) {
+            return Some(desired);
         }
     }
-    git_ids.sort();
-    git_ids.dedup();
-    git_ids.into_iter().next().map(BackendId::from)
+
+    crate::plugin_vcs_backends::list_plugin_vcs_backends()
+        .ok()
+        .and_then(|mut backends| {
+            backends.sort_by(|a, b| a.backend_id.as_ref().cmp(b.backend_id.as_ref()));
+            backends.into_iter().next().map(|b| b.backend_id)
+        })
 }
 
 /// Attempt to reopen the most recent repository at startup if the
@@ -60,8 +54,8 @@ fn try_reopen_last_repo<R: tauri::Runtime>(app_handle: &tauri::AppHandle<R>) {
 
     let recents = state.recents();
     if let Some(path) = recents.into_iter().find(|p| p.exists()) {
-        let Some(backend) = preferred_git_backend_id(&app_config) else {
-            log::warn!("startup reopen: no git backend available");
+        let Some(backend) = preferred_vcs_backend_id(&app_config) else {
+            log::warn!("startup reopen: no VCS backend available");
             return;
         };
 
@@ -175,6 +169,8 @@ fn build_invoke_handler<R: tauri::Runtime>(
         tauri_commands::add_repo,
         tauri_commands::list_vcs_backends_cmd,
         tauri_commands::set_vcs_backend_cmd,
+        tauri_commands::reopen_current_repo_cmd,
+        tauri_commands::call_vcs_backend_method,
         tauri_commands::validate_git_url,
         tauri_commands::validate_add_path,
         tauri_commands::validate_clone_input,
@@ -224,15 +220,9 @@ fn build_invoke_handler<R: tauri::Runtime>(
         tauri_commands::git_push,
         tauri_commands::git_undo_since_push,
         tauri_commands::git_undo_to_commit,
-        tauri_commands::git_lfs_fetch_all,
-        tauri_commands::git_lfs_pull,
-        tauri_commands::git_lfs_prune,
-        tauri_commands::git_lfs_track_paths,
-        tauri_commands::git_lfs_untrack_paths,
-        tauri_commands::git_lfs_is_tracked,
-        tauri_commands::git_lfs_tracked_paths,
         tauri_commands::git_add_to_gitignore_paths,
         tauri_commands::open_repo_file,
+        tauri_commands::read_repo_file_text,
         tauri_commands::list_themes,
         tauri_commands::load_theme,
         tauri_commands::list_plugins,

Backend/src/plugin_paths.rs

@@ -37,6 +37,10 @@ pub fn built_in_plugin_dirs() -> Vec<PathBuf> {
             // in a `resources` subdirectory or directly alongside the exe.
             candidates.push(dir.join("resources").join(BUILT_IN_PLUGINS_DIR_NAME));
             candidates.push(dir.join(BUILT_IN_PLUGINS_DIR_NAME));
+            // Dev builds can generate built-in bundles under `target/openvcs/`.
+            if let Some(target_dir) = dir.parent() {
+                candidates.push(target_dir.join("openvcs").join(BUILT_IN_PLUGINS_DIR_NAME));
+            }
             #[cfg(target_os = "macos")]
             if let Some(parent) = dir.parent() {
                 candidates.push(parent.join("Resources").join(BUILT_IN_PLUGINS_DIR_NAME));

Backend/src/plugin_runtime/vcs_proxy.rs

@@ -1,5 +1,6 @@
 use crate::plugin_bundles::ApprovalState;
 use crate::plugin_runtime::stdio_rpc::{RpcConfig, RpcError, SpawnConfig, StdioRpcProcess};
+use crate::settings::AppConfig;
 use openvcs_core::models::{
     Capabilities, ConflictDetails, ConflictSide, FetchOptions, LogQuery, StashItem, StatusPayload,
     StatusSummary, VcsEvent,
@@ -26,6 +27,11 @@ impl PluginVcsProxy {
         repo_path: &Path,
     ) -> Result<Arc<dyn Vcs>, VcsError> {
         let workdir = repo_path.to_path_buf();
+        let cfg = AppConfig::load_or_default();
+        let cfg = serde_json::to_value(cfg).map_err(|e| VcsError::Backend {
+            backend: backend_id.clone(),
+            msg: format!("serialize config: {e}"),
+        })?;
         let spawn = SpawnConfig {
             plugin_id,
             component_label: format!("vcs-backend-{}", backend_id.as_ref()),
@@ -42,7 +48,10 @@ impl PluginVcsProxy {
             rpc,
         };
         p.rpc
-            .call("open", json!({ "path": path_to_utf8(repo_path)? }))
+            .call(
+                "open",
+                json!({ "path": path_to_utf8(repo_path)?, "config": cfg }),
+            )
             .map_err(map_rpc_err)?;
         Ok(Arc::new(p))
     }

Backend/src/settings.rs

@@ -3,6 +3,10 @@ use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::{fs, io};
 
+fn default_true() -> bool {
+    true
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AppConfig {
     pub schema_version: u32,
@@ -61,7 +65,7 @@ pub struct General {
     #[serde(default)]
     pub language: Language,
     #[serde(default)]
-    pub default_backend: DefaultBackend,
+    pub default_backend: String,
     #[serde(default)]
     pub update_channel: UpdateChannel,
     #[serde(default)]
@@ -79,7 +83,7 @@ impl Default for General {
             theme: Theme::System,
             theme_pack: default_theme_pack(),
             language: Language::System,
-            default_backend: DefaultBackend::Git,
+            default_backend: "git".into(),
             update_channel: UpdateChannel::Stable,
             reopen_last_repos: true,
             checks_on_launch: true,
@@ -233,12 +237,15 @@ pub struct Performance {
     pub progressive_render: bool,
     #[serde(default)]
     pub gpu_accel: bool,
+    #[serde(default = "default_true")]
+    pub animations: bool,
 }
 impl Default for Performance {
     fn default() -> Self {
         Self {
             progressive_render: true,
             gpu_accel: true,
+            animations: true,
         }
     }
 }
@@ -398,14 +405,6 @@ pub enum GitSshBinary {
     Custom,
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "kebab-case")]
-#[derive(Default)]
-pub enum DefaultBackend {
-    #[default]
-    Git,
-}
-
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 #[derive(Default)]
@@ -609,6 +608,10 @@ impl AppConfig {
         if self.general.theme_pack.trim().is_empty() {
             self.general.theme_pack = default_theme_pack();
         }
+        self.general.default_backend = self.general.default_backend.trim().to_string();
+        if self.general.default_backend.is_empty() {
+            self.general.default_backend = "git".into();
+        }
 
         // Git
         self.git.backend = self.git.backend.trim().to_string();

Backend/src/state.rs

@@ -17,21 +17,31 @@ pub const MAX_RECENTS: usize = 10;
 fn apply_git_ssh_env(cfg: &AppConfig) {
     // Prefer config-driven runtime env so the VCS backend (in another crate) can read it.
     // Keep env var names stable for packaging and troubleshooting.
-    std::env::set_var(
-        "OPENVCS_SSH_MODE",
-        match cfg.git.ssh_binary {
-            crate::settings::GitSshBinary::Auto => "auto",
-            crate::settings::GitSshBinary::Host => "host",
-            crate::settings::GitSshBinary::Bundled => "bundled",
-            crate::settings::GitSshBinary::Custom => "custom",
-        },
-    );
+    unsafe {
+        // Safety: OpenVCS sets these env vars during startup/config updates and treats them as
+        // process-wide configuration for child processes (e.g. `git`).
+        std::env::set_var(
+            "OPENVCS_SSH_MODE",
+            match cfg.git.ssh_binary {
+                crate::settings::GitSshBinary::Auto => "auto",
+                crate::settings::GitSshBinary::Host => "host",
+                crate::settings::GitSshBinary::Bundled => "bundled",
+                crate::settings::GitSshBinary::Custom => "custom",
+            },
+        );
+    }
     if cfg.git.ssh_binary == crate::settings::GitSshBinary::Custom
         && !cfg.git.ssh_path.trim().is_empty()
     {
-        std::env::set_var("OPENVCS_SSH", cfg.git.ssh_path.trim());
+        unsafe {
+            // Safety: see comment above.
+            std::env::set_var("OPENVCS_SSH", cfg.git.ssh_path.trim());
+        }
     } else {
-        std::env::remove_var("OPENVCS_SSH");
+        unsafe {
+            // Safety: see comment above.
+            std::env::remove_var("OPENVCS_SSH");
+        }
     }
 }