Improved button labelling

Jordonbc · Jordonbc · commit a479ff292b71 · 2026-04-27T18:05:16.000+01:00
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
@@ -44,6 +44,7 @@ Backend:
   Feature-facing backend API lives under `Backend/src/tauri_commands/`.
 - Backend/plugin boundary:
   Backend communicates with plugin processes over JSON-RPC over stdio.
+- Repo-open UI labels can be resolved from the active backend via backend-provided action-label maps; generic VCS text remains the fallback.
 - Settings boundary:
   Backend persists/loads app configuration and mediates environment application.
 
diff --git a/Backend/src/lib.rs b/Backend/src/lib.rs
@@ -322,6 +322,7 @@ fn build_invoke_handler<R: tauri::Runtime>(
         tauri_commands::current_repo_path,
         tauri_commands::list_recent_repos,
         tauri_commands::vcs_list_branches,
+        tauri_commands::current_vcs_action_labels,
         tauri_commands::vcs_status,
         tauri_commands::vcs_log,
         tauri_commands::vcs_stash_list,
diff --git a/Backend/src/plugin_bundles.rs b/Backend/src/plugin_bundles.rs
@@ -112,6 +112,8 @@ pub enum VcsBackendProvide {
         id: String,
         #[serde(default)]
         name: Option<String>,
+        #[serde(default)]
+        action_labels: BTreeMap<String, String>,
     },
 }
 
@@ -147,12 +149,23 @@ pub struct PluginBundleStore {
     root: PathBuf,
 }
 
+/// Installed VCS backend metadata resolved from a plugin module.
+#[derive(Debug, Clone)]
+pub struct ModuleVcsBackend {
+    /// Logical backend identifier.
+    pub id: String,
+    /// Optional human-readable backend name.
+    pub name: Option<String>,
+    /// Optional action-label map keyed by namespaced VCS actions.
+    pub action_labels: BTreeMap<String, String>,
+}
+
 /// Installed module component metadata and resolved executable path.
 #[derive(Debug, Clone)]
 pub struct ModuleComponent {
     pub exec: String,
     pub exec_path: PathBuf,
-    pub vcs_backends: Vec<(String, Option<String>)>,
+    pub vcs_backends: Vec<ModuleVcsBackend>,
 }
 
 /// Active component metadata for a plugin selected by `current.json`.
@@ -718,9 +731,17 @@ impl PluginBundleStore {
                     .filter_map(|backend| match backend {
                         VcsBackendProvide::Id(id) => {
                             let id = id.trim().to_string();
-                            (!id.is_empty()).then_some((id, None))
+                            (!id.is_empty()).then_some(ModuleVcsBackend {
+                                id,
+                                name: None,
+                                action_labels: BTreeMap::new(),
+                            })
                         }
-                        VcsBackendProvide::Named { id, name } => {
+                        VcsBackendProvide::Named {
+                            id,
+                            name,
+                            action_labels,
+                        } => {
                             let id = id.trim().to_string();
                             if id.is_empty() {
                                 return None;
@@ -730,7 +751,11 @@ impl PluginBundleStore {
                                 .map(str::trim)
                                 .filter(|value| !value.is_empty())
                                 .map(str::to_string);
-                            Some((id, name))
+                            Some(ModuleVcsBackend {
+                                id,
+                                name,
+                                action_labels,
+                            })
                         }
                     })
                     .collect(),
@@ -872,6 +897,19 @@ mod tests {
         fs::write(root.join("bin").join("plugin.js"), "export {};\n").unwrap();
     }
 
+    /// Writes a prepared plugin directory with backend action labels.
+    fn write_plugin_with_labels(root: &Path, plugin_id: &str) {
+        fs::create_dir_all(root.join("bin")).unwrap();
+        fs::write(
+            root.join("package.json"),
+            format!(
+                "{{\n  \"name\": \"{plugin_id}\",\n  \"version\": \"0.1.0\",\n  \"openvcs\": {{\n    \"id\": \"{plugin_id}\",\n    \"name\": \"Test\",\n    \"version\": \"0.1.0\",\n    \"module\": {{\n      \"exec\": \"plugin.js\",\n      \"vcs_backends\": [{{\n        \"id\": \"git\",\n        \"name\": \"Git\",\n        \"action_labels\": {{\n          \"VCS.Commit\": \"Commit\",\n          \"VCS.Push\": \"Push\"\n        }}\n      }}]\n    }}\n  }}\n}}\n"
+            ),
+        )
+        .unwrap();
+        fs::write(root.join("bin").join("plugin.js"), "export {};\n").unwrap();
+    }
+
     #[test]
     fn install_prepared_plugin_dir_writes_index_and_source() {
         let dir = tempdir().unwrap();
@@ -898,4 +936,41 @@ mod tests {
                 .is_some_and(|metadata| metadata.kind == "path")
         );
     }
+
+    #[test]
+    fn load_current_components_reads_backend_action_labels() {
+        let dir = tempdir().unwrap();
+        let store = PluginBundleStore::new_at(dir.path().join("plugins"));
+        let prepared = dir.path().join("prepared");
+        write_plugin_with_labels(&prepared, "example.plugin");
+
+        store
+            .install_prepared_plugin_dir(
+                &prepared,
+                &InstalledPluginSourceMetadata {
+                    managed_by: "user-config".to_string(),
+                    kind: "path".to_string(),
+                    spec: "../example".to_string(),
+                },
+                true,
+            )
+            .unwrap();
+
+        let components = store.load_current_components("example.plugin").unwrap();
+        let module = components.and_then(|c| c.module).expect("module component");
+        let backend = module
+            .vcs_backends
+            .into_iter()
+            .find(|backend| backend.id == "git")
+            .expect("git backend");
+        assert_eq!(backend.name.as_deref(), Some("Git"));
+        assert_eq!(
+            backend.action_labels.get("VCS.Commit").map(String::as_str),
+            Some("Commit")
+        );
+        assert_eq!(
+            backend.action_labels.get("VCS.Push").map(String::as_str),
+            Some("Push")
+        );
+    }
 }
diff --git a/Backend/src/plugin_vcs_backends.rs b/Backend/src/plugin_vcs_backends.rs
@@ -11,7 +11,8 @@ use crate::plugin_runtime::settings_store;
 use crate::plugin_runtime::{vcs_proxy::PluginVcsProxy, PluginRuntimeManager};
 use crate::settings::AppConfig;
 use log::{debug, error, info, trace, warn};
-use std::{collections::BTreeMap, path::Path, sync::Arc};
+use std::collections::BTreeMap;
+use std::{path::Path, sync::Arc};
 
 const MODULE: &str = "plugin_vcs_backends";
 
@@ -48,6 +49,8 @@ pub struct PluginBackendDescriptor {
     pub backend_id: BackendId,
     /// Optional human-readable backend name.
     pub backend_name: Option<String>,
+    /// Optional action-label map keyed by namespaced VCS actions.
+    pub action_labels: BTreeMap<String, String>,
     /// Owning plugin identifier.
     pub plugin_id: String,
     /// Optional human-readable plugin name.
@@ -131,15 +134,16 @@ pub fn list_plugin_vcs_backends() -> Result<Vec<PluginBackendDescriptor>, String
             continue;
         };
 
-        for (id, name) in module.vcs_backends {
-            let backend_id = BackendId::from(id.as_str());
+        for backend in module.vcs_backends {
+            let backend_id = BackendId::from(backend.id.as_str());
             debug!(
                 "list_plugin_vcs_backends: found backend '{}' from plugin '{}'",
                 backend_id, p.plugin_id
             );
             let candidate = PluginBackendDescriptor {
                 backend_id: backend_id.clone(),
-                backend_name: name,
+                backend_name: backend.name,
+                action_labels: backend.action_labels,
                 plugin_id: p.plugin_id.clone(),
                 plugin_name: p.name.clone(),
             };
diff --git a/Backend/src/tauri_commands/backends.rs b/Backend/src/tauri_commands/backends.rs
@@ -67,6 +67,24 @@ pub fn list_vcs_backends_cmd(state: State<'_, AppState>) -> Vec<(String, String)
     backends
 }
 
+#[tauri::command]
+/// Returns the action-label map for the currently selected backend.
+///
+/// # Parameters
+/// - `state`: Shared application state.
+///
+/// # Returns
+/// - A list of `(action_key, label)` tuples for the active backend.
+pub fn current_vcs_action_labels(
+    state: State<'_, AppState>,
+) -> Result<Vec<(String, String)>, String> {
+    let repo = state
+        .current_repo()
+        .ok_or_else(|| "No repository selected".to_string())?;
+    let desc = plugin_vcs_backends::plugin_vcs_backend_descriptor(&repo.id())?;
+    Ok(desc.action_labels.into_iter().collect())
+}
+
 #[tauri::command]
 /// Sets the default backend and reopens the current repository with it when possible.
 ///
diff --git a/Backend/src/tauri_commands/general.rs b/Backend/src/tauri_commands/general.rs
@@ -64,7 +64,7 @@ pub async fn browse_directory<R: Runtime>(
 ) -> Option<String> {
     let title = match purpose.as_deref() {
         Some("clone_dest") => "Choose destination folder",
-        Some("add_repo") => "Select an existing Git repository folder",
+        Some("add_repo") => "Select an existing repository folder",
         _ => "Select a folder",
     };
     utilities::browse_directory_async(window.app_handle().clone(), title).await
diff --git a/Frontend/src/scripts/features/repo/hydrate.ts b/Frontend/src/scripts/features/repo/hydrate.ts
@@ -231,3 +231,23 @@ export async function hydrateStash(): Promise<void> {
         (state as any).stash = [];
     }
 }
+
+/**
+ * Loads the resolved action-label map for the active backend.
+ */
+export async function hydrateVcsActionLabels(): Promise<void> {
+    try {
+        const labels = await TAURI.invoke<Array<[string, string]>>('current_vcs_action_labels');
+        const resolved: Record<string, string> = {};
+        for (const pair of labels || []) {
+            if (!Array.isArray(pair) || pair.length < 2) continue;
+            const key = String(pair[0] || '').trim();
+            const label = String(pair[1] || '').trim();
+            if (!key || !label) continue;
+            resolved[key] = label;
+        }
+        state.vcsActionLabels = resolved;
+    } catch {
+        state.vcsActionLabels = {};
+    }
+}
diff --git a/Frontend/src/scripts/features/repo/index.ts b/Frontend/src/scripts/features/repo/index.ts
@@ -3,4 +3,4 @@
 export { bindRepoHotkeys } from './hotkeys';
 export { bindFilter } from './filter';
 export { renderList, wireRenderListCallbacks } from './list';
-export { hydrateBranches, hydrateStatus, hydrateCommits, hydrateStash, yieldToPaint } from './hydrate';
+export { hydrateBranches, hydrateStatus, hydrateCommits, hydrateStash, hydrateVcsActionLabels, yieldToPaint } from './hydrate';
diff --git a/Frontend/src/scripts/main.ts b/Frontend/src/scripts/main.ts
@@ -8,15 +8,15 @@ import { qs } from './lib/dom';
 import { notify } from './lib/notify';
 import { setStatus } from './lib/status';
 import { destroyOverlayScrollbarsFor, initOverlayScrollbarsFor, refreshOverlayScrollbarsFor } from './lib/scrollbars';
-import { prefs, state, hasRepo } from './state/state';
+import { prefs, state, hasRepo, resolveVcsActionLabel } from './state/state';
 import {
     bindTabs, initResizer, refreshRepoActions, setRepoHeader, resetRepoHeader, setTab, setTheme,
     bindLayoutActionState
 } from './ui/layout';
 import { clearPluginMenubarMenus, initMenubar, refreshPluginMenubarMenus } from './ui/menubar';
 import { closeAllModals } from './ui/modals';
 import { bindCommandSheet, openSheet, closeSheet } from './features/commandSheet';
-import { bindRepoHotkeys, bindFilter, renderList, wireRenderListCallbacks, hydrateBranches, hydrateStatus, hydrateCommits, hydrateStash, yieldToPaint } from './features/repo';
+import { bindRepoHotkeys, bindFilter, renderList, wireRenderListCallbacks, hydrateBranches, hydrateStatus, hydrateCommits, hydrateStash, hydrateVcsActionLabels, yieldToPaint } from './features/repo';
 import { bindBranchUI } from './features/branches';
 import { bindCommit } from './features/diff';
 import { openAbout } from './features/about';
@@ -188,7 +188,7 @@ async function boot() {
             const ctl = status ?? statusController();
             let success = false;
             try {
-                ctl.setBusy('Fetching…');
+                ctl.setBusy(`${resolveVcsActionLabel('VCS.Fetch', 'Fetch')}…`);
                 await TAURI.invoke('vcs_fetch', {});
                 notify('Fetched');
                 if (hydrate) {
@@ -243,10 +243,12 @@ async function boot() {
         const behind = getBehindCount();
         const repoOn = hasRepo();
         const canPull = repoOn;
-        const mainLabel = behind > 0 ? `Pull (${behind})` : 'Fetch';
+        const fetchLabel = resolveVcsActionLabel('VCS.Fetch', 'Fetch');
+        const pullLabel = resolveVcsActionLabel('VCS.Pull', 'Pull');
+        const mainLabel = behind > 0 ? `${pullLabel} (${behind})` : fetchLabel;
         const mainTitle = behind > 0
-            ? `Pull ${behind} commit${behind === 1 ? '' : 's'} (F5)`
-            : 'Fetch (F5)';
+            ? `${pullLabel} ${behind} commit${behind === 1 ? '' : 's'} (F5)`
+            : `${fetchLabel} (F5)`;
 
         if (fetchBtn) {
             fetchBtn.textContent = mainLabel;
@@ -262,18 +264,18 @@ async function boot() {
             fetchOnlyItem.setAttribute('aria-disabled', 'false');
             fetchOnlyItem.tabIndex = 0;
             const name = fetchOnlyItem.querySelector<HTMLElement>('.name');
-            if (name) name.textContent = 'Fetch';
+            if (name) name.textContent = fetchLabel;
         }
         if (fetchAllItem) {
             fetchAllItem.setAttribute('aria-disabled', 'false');
             fetchAllItem.tabIndex = 0;
         }
         if (pullItem) {
-            const pullLabel = behind > 0 ? `Pull (${behind})` : 'Pull';
+            const pullText = behind > 0 ? `${pullLabel} (${behind})` : pullLabel;
             pullItem.setAttribute('aria-disabled', canPull ? 'false' : 'true');
             pullItem.tabIndex = canPull ? 0 : -1;
             const name = pullItem.querySelector<HTMLElement>('.name');
-            if (name) name.textContent = pullLabel;
+            if (name) name.textContent = pullText;
         }
     }
 
@@ -283,7 +285,7 @@ async function boot() {
         if (!fetched) { ctl.clearBusy(); return; }
 
         try {
-            ctl.setBusy('Pulling…');
+            ctl.setBusy(`${resolveVcsActionLabel('VCS.Pull', 'Pull')}ing…`);
             const res = await TAURI.invoke<{ pulled: boolean; branch: string; reason?: string | null }>('vcs_pull', {});
             if (res?.pulled) {
                 notify('Pulled latest changes');
@@ -296,7 +298,7 @@ async function boot() {
             ctl.clearBusy();
         }
 
-        await Promise.allSettled([hydrateBranches(), hydrateStatus(), hydrateCommits(), hydrateStash()]);
+        await Promise.allSettled([hydrateBranches(), hydrateStatus(), hydrateCommits(), hydrateStash(), hydrateVcsActionLabels()]);
     }
 
     async function defaultFetchAction() {
@@ -513,7 +515,7 @@ async function boot() {
 
         await hydrateBranches();
         setRepoHeader(path);
-        await Promise.allSettled([hydrateStatus(), hydrateCommits()]);
+        await Promise.allSettled([hydrateStatus(), hydrateCommits(), hydrateVcsActionLabels()]);
         updateFetchUI();
 
         // Broadcast app-level event so branch UI and actions can sync
@@ -569,7 +571,7 @@ async function boot() {
         if (doFetch) {
             await fetchCurrentRemoteOnly({ hydrate: false });
         }
-        await Promise.allSettled([hydrateBranches(), hydrateStatus(), hydrateCommits(), hydrateStash()]);
+        await Promise.allSettled([hydrateBranches(), hydrateStatus(), hydrateCommits(), hydrateStash(), hydrateVcsActionLabels()]);
         updateFetchUI();
         })();
         try {
diff --git a/Frontend/src/scripts/state/state.test.ts b/Frontend/src/scripts/state/state.test.ts
@@ -0,0 +1,25 @@
+// Copyright © 2025-2026 OpenVCS Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
+import { describe, expect, it } from 'vitest';
+
+/** Provides a minimal `matchMedia` test shim used by state imports. */
+function createMatchMediaMock(query: string) {
+  return { matches: false, media: query, addListener: () => {}, removeListener: () => {} };
+}
+
+// Set matchMedia before importing modules that touch browser media APIs.
+(globalThis as any).matchMedia = createMatchMediaMock;
+
+import { resolveVcsActionLabel, state } from './state';
+
+describe('resolveVcsActionLabel', () => {
+  it('falls back to generic VCS text when a label is missing', () => {
+    state.vcsActionLabels = {};
+    expect(resolveVcsActionLabel('VCS.Push', 'Push')).toBe('Push');
+  });
+
+  it('returns the plugin-provided label when available', () => {
+    state.vcsActionLabels = { 'VCS.Push': 'Ship' };
+    expect(resolveVcsActionLabel('VCS.Push', 'Push')).toBe('Ship');
+  });
+});
diff --git a/Frontend/src/scripts/state/state.ts b/Frontend/src/scripts/state/state.ts
diff --git a/Frontend/src/scripts/ui/layout.ts b/Frontend/src/scripts/ui/layout.ts
diff --git a/docs/plugin architecture.md b/docs/plugin architecture.md
