From 4f3530723e684a3e462feaa98c8f7dbd647327f4 Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 17:14:04 +0100
Subject: [PATCH 1/8] Implement commit messaging and added commit category in
 settings

---
 Backend/src/settings.rs                       |  70 ++++++++-
 Frontend/src/modals/settings.html             |  49 +++++-
 Frontend/src/scripts/features/diff.ts         |   3 +-
 .../src/scripts/features/repo/commit.test.ts  | 143 ++++++++++++++++++
 Frontend/src/scripts/features/repo/commit.ts  |  82 +++++++++-
 Frontend/src/scripts/features/settings.ts     |  39 ++++-
 .../scripts/features/settingsCommit.test.ts   | 102 +++++++++++++
 .../src/scripts/features/settingsCommit.ts    |  49 ++++++
 .../scripts/features/settingsGeneral.test.ts  |  17 +--
 .../src/scripts/features/settingsGeneral.ts   |   7 +-
 Frontend/src/scripts/main.ts                  |   7 +-
 Frontend/src/scripts/state/state.ts           |  11 +-
 Frontend/src/scripts/types.d.ts               |   8 +
 Frontend/src/scripts/ui/layout.ts             |   2 +
 14 files changed, 547 insertions(+), 42 deletions(-)
 create mode 100644 Frontend/src/scripts/features/repo/commit.test.ts
 create mode 100644 Frontend/src/scripts/features/settingsCommit.test.ts
 create mode 100644 Frontend/src/scripts/features/settingsCommit.ts

diff --git a/Backend/src/settings.rs b/Backend/src/settings.rs
index b6d373a1..e0c4c3ea 100644
--- a/Backend/src/settings.rs
+++ b/Backend/src/settings.rs
@@ -26,6 +26,8 @@ pub struct AppConfig {
     #[serde(default)]
     pub git: Git,
     #[serde(default)]
+    pub commit: Commit,
+    #[serde(default)]
     pub credentials: Credentials,
     #[serde(default)]
     pub diff: Diff,
@@ -58,6 +60,7 @@ impl Default for AppConfig {
             plugin: Default::default(),
             general: Default::default(),
             git: Default::default(),
+            commit: Default::default(),
             credentials: Default::default(),
             diff: Default::default(),
             lfs: Default::default(),
@@ -93,9 +96,6 @@ pub struct General {
     pub telemetry: bool,
     #[serde(default = "default_true")]
     pub crash_reports: bool,
-    /// When enabled, commit hooks may not rewrite the user-entered commit summary.
-    #[serde(default = "default_true")]
-    pub restrict_commit_summary: bool,
 }
 impl Default for General {
     /// Returns default general settings values.
@@ -113,7 +113,6 @@ impl Default for General {
             checks_on_launch: true,
             telemetry: false,
             crash_reports: true,
-            restrict_commit_summary: true,
         }
     }
 }
@@ -179,6 +178,69 @@ impl Default for Git {
     }
 }
 
+/// Commit settings for commit-message prefill behavior.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct Commit {
+    /// Enables commit summary prefill when one full file is selected.
+    #[serde(default = "default_true")]
+    pub commit_message_template_enabled: bool,
+    /// When enabled, commit hooks may not rewrite the user-entered commit summary.
+    #[serde(default = "default_true")]
+    pub restrict_commit_summary: bool,
+    /// Commit summary templates used for single-file prefill.
+    #[serde(default)]
+    pub commit_templates: CommitTemplates,
+}
+impl Default for Commit {
+    /// Returns default commit template settings values.
+    fn default() -> Self {
+        Self {
+            commit_message_template_enabled: true,
+            restrict_commit_summary: true,
+            commit_templates: Default::default(),
+        }
+    }
+}
+
+/// Commit template strings used for single-file prefill.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct CommitTemplates {
+    /// Commit summary template used for single new-file prefill.
+    #[serde(default = "default_commit_message_create_template")]
+    pub commit_message_template_create: String,
+    /// Commit summary template used for single modified-file prefill.
+    #[serde(default = "default_commit_message_update_template")]
+    pub commit_message_template_update: String,
+    /// Commit summary template used for single deleted-file prefill.
+    #[serde(default = "default_commit_message_delete_template")]
+    pub commit_message_template_delete: String,
+}
+impl Default for CommitTemplates {
+    /// Returns default commit template strings.
+    fn default() -> Self {
+        Self {
+            commit_message_template_create: default_commit_message_create_template(),
+            commit_message_template_update: default_commit_message_update_template(),
+            commit_message_template_delete: default_commit_message_delete_template(),
+        }
+    }
+}
+
+/// Returns the default template used for creating a commit from one new file.
+fn default_commit_message_create_template() -> String {
+    "Create {file:name}".to_string()
+}
+
+/// Returns the default template used for updating a commit from one modified file.
+fn default_commit_message_update_template() -> String {
+    "Update {file:name}".to_string()
+}
+
+/// Returns the default template used for deleting a commit from one deleted file.
+fn default_commit_message_delete_template() -> String {
+    "Delete {file:name}".to_string()
+}
+
 /// Settings for authentication and signing tools.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Credentials {
diff --git a/Frontend/src/modals/settings.html b/Frontend/src/modals/settings.html
index 4ab8dd00..6ade4043 100644
--- a/Frontend/src/modals/settings.html
+++ b/Frontend/src/modals/settings.html
@@ -13,6 +13,7 @@ <h3 id="settings-title" style="margin:0">Settings</h3>
                 <ul id="settings-nav" class="list">
                     <li><button class="seg-btn active" type="button" data-section="general">General</button></li>
                     <li><button class="seg-btn" type="button" data-section="diff">Diff &amp; Merge</button></li>
+                    <li><button class="seg-btn" type="button" data-section="commit">Commit</button></li>
                     <li><button class="seg-btn" type="button" data-section="performance">Performance</button></li>
                     <li><button class="seg-btn" type="button" data-section="ux">UX</button></li>
                     <li><button class="seg-btn" type="button" data-section="logging">Logging</button></li>
@@ -97,14 +98,6 @@ <h3 id="settings-title" style="margin:0">Settings</h3>
                         </label>
                     </div>
 
-                    <div class="group">
-                        <label class="checkbox">
-                            <input type="checkbox" id="set-restrict-commit-summary" />
-                            Limit commit summary to 72 characters
-                            <span class="help-tip" title="When enabled, the commit summary box caps input at 72 characters so it fits a standard Git commit title. Enabled by default.">?</span>
-                        </label>
-                    </div>
-
                 </form>
 
                 <!-- Diff -->
@@ -171,6 +164,46 @@ <h3 id="settings-title" style="margin:0">Settings</h3>
                     </div>
                 </form>
 
+                <!-- Commit -->
+                <form class="panel-form hidden" data-panel="commit">
+                    <div class="group">
+                        <label class="checkbox">
+                            <input type="checkbox" id="set-commit-message-template-enabled" />
+                            Prefill commit summary from file status
+                            <span class="help-tip" title="When enabled, a single full-file selection can fill the commit summary from the templates below. Enabled by default.">?</span>
+                        </label>
+                    </div>
+
+                    <div class="group">
+                        <label class="checkbox">
+                            <input type="checkbox" id="set-restrict-commit-summary" />
+                            Limit commit summary to 72 characters
+                            <span class="help-tip" title="When enabled, the commit summary box caps input at 72 characters so it fits a standard Git commit title. Enabled by default.">?</span>
+                        </label>
+                    </div>
+
+                    <div class="group">
+                        <label for="set-commit-message-template-create">Create template
+                            <span class="help-tip" title="Used for new and untracked files.">?</span>
+                        </label>
+                        <input id="set-commit-message-template-create" type="text" placeholder="Create {file:name}" />
+                    </div>
+
+                    <div class="group">
+                        <label for="set-commit-message-template-update">Update template
+                            <span class="help-tip" title="Used for modified, renamed, and copied files.">?</span>
+                        </label>
+                        <input id="set-commit-message-template-update" type="text" placeholder="Update {file:name}" />
+                    </div>
+
+                    <div class="group">
+                        <label for="set-commit-message-template-delete">Delete template
+                            <span class="help-tip" title="Used for deleted files.">?</span>
+                        </label>
+                        <input id="set-commit-message-template-delete" type="text" placeholder="Delete {file:name}" />
+                    </div>
+                </form>
+
                 <!-- Performance -->
                 <form class="panel-form hidden" data-panel="performance">
                     <div class="group">
diff --git a/Frontend/src/scripts/features/diff.ts b/Frontend/src/scripts/features/diff.ts
index f8b62e6a..036941e5 100644
--- a/Frontend/src/scripts/features/diff.ts
+++ b/Frontend/src/scripts/features/diff.ts
@@ -6,6 +6,7 @@ import { notify } from '../lib/notify';
 import { state } from '../state/state';
 import { hydrateStatus, hydrateCommits } from './repo';
 import { runHook } from '../plugins';
+import { getCommitSummaryHint } from './repo/commit';
 
 export function bindCommit() {
     const commitBtn     = qs<HTMLButtonElement>('#commit-btn');
@@ -13,7 +14,7 @@ export function bindCommit() {
     const commitDesc    = qs<HTMLTextAreaElement>('#commit-desc');
 
     commitBtn?.addEventListener('click', async () => {
-        let summary = commitSummary?.value.trim() || '';
+        let summary = commitSummary?.value.trim() || getCommitSummaryHint() || '';
         if (!summary) { commitSummary?.focus(); notify('Summary is required'); return; }
         const hunksMap = state.selectedHunksByFile || {};
         const linesMap = state.selectedLinesByFile || {};
diff --git a/Frontend/src/scripts/features/repo/commit.test.ts b/Frontend/src/scripts/features/repo/commit.test.ts
new file mode 100644
index 00000000..de9a9dae
--- /dev/null
+++ b/Frontend/src/scripts/features/repo/commit.test.ts
@@ -0,0 +1,143 @@
+// Copyright © 2025-2026 OpenVCS Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import { state, setGlobalSettings } from '../../state/state';
+import type { FileStatus } from '../../types';
+
+/** Mounts the minimal DOM touched by commit button refresh. */
+function mountCommitDom() {
+  document.body.innerHTML = `
+    <input id="commit-summary" />
+    <button id="commit-btn"></button>
+  `;
+}
+
+describe('updateCommitButton', () => {
+  beforeEach(() => {
+    mountCommitDom();
+    state.selectedFiles = new Set();
+    state.selectedHunks = [];
+    state.selectedHunksByFile = {};
+    state.selectedLinesByFile = {};
+    state.files = [];
+    setGlobalSettings(null);
+  });
+
+  it('shows create hint for one selected file', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: '?' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+
+    updateCommitButton();
+
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+    expect(summary.value).toBe('');
+    expect(summary.placeholder).toBe('Create test.cpp');
+  });
+
+  it('uses hint when summary box empty on commit', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Update test.cpp');
+    expect(summary.value).toBe('');
+  });
+
+  it('shows hint for one partially selected file', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedHunksByFile = { 'src/test.cpp': [0] };
+    state.selectedLinesByFile = { 'src/test.cpp': { 0: [1] } };
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Update test.cpp');
+    expect(summary.value).toBe('');
+  });
+
+  it('clears hint when nothing selected', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Summary (required)');
+    expect(summary.value).toBe('');
+  });
+
+  it('truncates overlong hints when summary cap is enabled', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        restrict_commit_summary: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name} with extra detail beyond seventy two characters and more text for truncation',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toHaveLength(72);
+    expect(summary.placeholder.endsWith('...')).toBe(true);
+    expect(summary.placeholder.startsWith('Update test.cpp with extra detail beyond seventy two')).toBe(true);
+  });
+});
diff --git a/Frontend/src/scripts/features/repo/commit.ts b/Frontend/src/scripts/features/repo/commit.ts
index c73b84fb..84781c04 100644
--- a/Frontend/src/scripts/features/repo/commit.ts
+++ b/Frontend/src/scripts/features/repo/commit.ts
@@ -1,12 +1,90 @@
 // Copyright © 2025-2026 OpenVCS Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
-import { state } from '../../state/state';
+import { globalSettings, state } from '../../state/state';
+import type { FileStatus } from '../../types';
+import {
+    DEFAULT_COMMIT_MESSAGE_CREATE,
+    DEFAULT_COMMIT_MESSAGE_DELETE,
+    DEFAULT_COMMIT_MESSAGE_UPDATE,
+} from '../settingsCommit';
+
+/** Returns the single file involved in commit selection, if exactly one. */
+function selectedCommitFile(): string | null {
+    const paths = new Set<string>();
+    for (const path of Array.from(state.selectedFiles || [])) {
+        const trimmed = String(path || '').trim();
+        if (trimmed) paths.add(trimmed);
+    }
+    for (const [path, hunks] of Object.entries((state as any).selectedHunksByFile || {})) {
+        if (Array.isArray(hunks) && hunks.length > 0) {
+            const trimmed = String(path || '').trim();
+            if (trimmed) paths.add(trimmed);
+        }
+    }
+    for (const [path, lineGroups] of Object.entries((state as any).selectedLinesByFile || {})) {
+        if (lineGroups && Object.keys(lineGroups).length > 0) {
+            const trimmed = String(path || '').trim();
+            if (trimmed) paths.add(trimmed);
+        }
+    }
+    if (paths.size !== 1) return null;
+    return Array.from(paths)[0] || null;
+}
+
+/** Returns status for one selected file, or null when unknown. */
+function selectedCommitFileStatus(filePath: string): string {
+    const file = (state.files || []).find((entry: FileStatus) => String(entry?.path || '') === filePath);
+    return String(file?.status || '').trim().toUpperCase();
+}
+
+/** Returns commit hint template for one selected file. */
+function selectedCommitTemplate(filePath: string): string {
+    const status = selectedCommitFileStatus(filePath);
+    if (status === 'A' || status === '?' || status.includes('?')) {
+        return globalSettings?.commit?.commit_templates?.commit_message_template_create || DEFAULT_COMMIT_MESSAGE_CREATE;
+    }
+    if (status === 'D') {
+        return globalSettings?.commit?.commit_templates?.commit_message_template_delete || DEFAULT_COMMIT_MESSAGE_DELETE;
+    }
+    return globalSettings?.commit?.commit_templates?.commit_message_template_update || DEFAULT_COMMIT_MESSAGE_UPDATE;
+}
+
+/** Expands commit template placeholders for one selected file. */
+function expandCommitTemplate(template: string, filePath: string): string {
+    const fileName = String(filePath || '').trim().split(/[/\\]/).pop() || filePath;
+    return template
+        .split('{file:name}').join(fileName)
+        .split('{file:path}').join(filePath);
+}
+
+/** Truncates long commit summary text with an ellipsis. */
+function truncateCommitSummaryHint(text: string): string {
+    const clean = String(text || '');
+    if (clean.length <= 72) return clean;
+    return `${clean.slice(0, 69)}...`;
+}
+
+/** Returns commit message hint when single-file prefill applies. */
+export function getCommitSummaryHint(): string {
+    const filePath = selectedCommitFile();
+    const enabled = globalSettings?.commit?.commit_message_template_enabled !== false;
+    if (!filePath || !enabled) return '';
+    const hint = expandCommitTemplate(selectedCommitTemplate(filePath), filePath);
+    if (globalSettings?.commit?.restrict_commit_summary === false) return hint;
+    return truncateCommitSummaryHint(hint);
+}
 
 export function updateCommitButton() {
     const btn = document.getElementById('commit-btn') as HTMLButtonElement | null;
     if (!btn) return;
     const summary = document.getElementById('commit-summary') as HTMLInputElement | null;
-    const summaryFilled = (summary?.value.trim().length ?? 0) > 0;
+    const hint = getCommitSummaryHint();
+
+    if (summary) {
+        summary.placeholder = hint || 'Summary (required)';
+    }
+
+    const summaryFilled = (summary?.value.trim().length ?? 0) > 0 || !!hint;
     const hunksSelected = Object.keys((state as any).selectedHunksByFile || {})
         .some((k) => Array.isArray((state as any).selectedHunksByFile[k]) && (state as any).selectedHunksByFile[k].length > 0);
     const linesSelected = Object.keys((state as any).selectedLinesByFile || {})
diff --git a/Frontend/src/scripts/features/settings.ts b/Frontend/src/scripts/features/settings.ts
index 14bc5c23..37b865c5 100644
--- a/Frontend/src/scripts/features/settings.ts
+++ b/Frontend/src/scripts/features/settings.ts
@@ -8,11 +8,21 @@ import { confirmBool } from '../lib/confirm';
 import { notify } from '../lib/notify';
 import { setTheme, applyCommitSummaryRestriction, applyGpuAccelerationPreference } from '../ui/layout';
 import { collectGeneralSettings, loadGeneralSettingsIntoForm } from './settingsGeneral';
-import { DEFAULT_DARK_THEME_ID, DEFAULT_LIGHT_THEME_ID, DEFAULT_THEME_ID, getActiveThemeId, getAvailableThemes, refreshAvailableThemes, selectThemePack } from '../themes';
+import {
+    collectCommitSettings,
+    collectCommitTemplateSettings,
+    DEFAULT_COMMIT_MESSAGE_CREATE,
+    DEFAULT_COMMIT_MESSAGE_DELETE,
+    DEFAULT_COMMIT_MESSAGE_UPDATE,
+    loadCommitSettingsIntoForm,
+} from './settingsCommit';
+import { DEFAULT_LIGHT_THEME_ID, getActiveThemeId, getAvailableThemes, refreshAvailableThemes, selectThemePack } from '../themes';
 import { invokePluginAction, reloadPlugins } from '../plugins';
 import type { PluginSummary } from '../plugins';
 import { applyPluginSettingsSections } from '../plugins';
 import type { GlobalSettings, ThemeSummary } from '../types';
+import { setGlobalSettings } from '../state/state';
+import { updateCommitButton } from './repo/commit';
 
 const THEME_PACK_HINT = 'Install a theme ZIP into the themes folder, or install a plugin that provides themes.';
 const SYSTEM_DARK_MQ = matchMedia('(prefers-color-scheme: dark)');
@@ -708,6 +718,7 @@ export function wireSettings() {
             const gpuChanged = previousCfg.performance?.gpu_accel !== next.performance?.gpu_accel;
 
             await TAURI.invoke('set_global_settings', { cfg: next });
+            setGlobalSettings(next);
             await syncFrontendMonitoring(next);
 
             modal.dataset.currentCfg = JSON.stringify(next);
@@ -727,7 +738,8 @@ export function wireSettings() {
                 else root.style.removeProperty('--mono');
                 applyAnimationPreference(next?.performance?.animations);
                 applyGpuAccelerationPreference(next?.performance?.gpu_accel);
-                applyCommitSummaryRestriction(next?.general?.restrict_commit_summary !== false);
+                applyCommitSummaryRestriction(next?.commit?.restrict_commit_summary !== false);
+                updateCommitButton();
             } catch {}
 
             notify(gpuChanged ? 'Settings saved. GPU changes apply after restart.' : 'Settings saved');
@@ -771,7 +783,15 @@ export function wireSettings() {
                 checks_on_launch: true,
                 telemetry: false,
                 crash_reports: true,
+            };
+            cur.commit = {
+                commit_message_template_enabled: true,
                 restrict_commit_summary: true,
+                commit_templates: {
+                    commit_message_template_create: DEFAULT_COMMIT_MESSAGE_CREATE,
+                    commit_message_template_update: DEFAULT_COMMIT_MESSAGE_UPDATE,
+                    commit_message_template_delete: DEFAULT_COMMIT_MESSAGE_DELETE,
+                },
             };
             cur.diff = { tab_width: 4, ignore_whitespace: 'none', max_file_size_mb: 10, intraline: true, show_binary_placeholders: true, external_diff: {enabled:false,path:'',args:''}, external_merge: {enabled:false,path:'',args:''}, binary_exts: ['png','jpg','dds','uasset'] };
             cur.lfs = { enabled: true, concurrency: 4, require_lock_before_edit: false, background_fetch_on_checkout: true };
@@ -781,10 +801,12 @@ export function wireSettings() {
             cur.plugins = { disabled: [], enabled: [] };
 
             await TAURI.invoke('set_global_settings', { cfg: cur });
+            setGlobalSettings(cur);
             await syncFrontendMonitoring(cur);
             applyAnimationPreference(cur.performance?.animations);
             applyGpuAccelerationPreference(cur.performance?.gpu_accel);
-            applyCommitSummaryRestriction(cur.general?.restrict_commit_summary !== false);
+            applyCommitSummaryRestriction(cur.commit?.restrict_commit_summary !== false);
+            updateCommitButton();
             await loadSettingsIntoForm(modal);
             setTheme('system');
             try { await selectThemePack(DEFAULT_LIGHT_THEME_ID, { silent: true, mode: 'system' }); } catch {}
@@ -808,6 +830,14 @@ function collectSettingsFromForm(root: HTMLElement): GlobalSettings {
     const o: GlobalSettings = { ...base };
 
     o.general = collectGeneralSettings(root, o, modeForTheme);
+    o.commit = {
+        ...o.commit,
+        ...collectCommitSettings(root),
+        commit_templates: {
+            ...(o.commit?.commit_templates || {}),
+            ...collectCommitTemplateSettings(root),
+        },
+    };
 
     o.diff = {
         ...o.diff,
@@ -921,6 +951,7 @@ export async function loadSettingsIntoForm(root?: HTMLElement) {
     await loadPluginsIntoForm(m, cfg);
 
     await loadGeneralSettingsIntoForm(m, cfg, toKebab, refreshDefaultBackendOptions, rebuildThemePackOptions);
+    loadCommitSettingsIntoForm(m, cfg);
     const elRl = get<HTMLInputElement>('#set-recents-limit'); if (elRl) elRl.value = String(cfg.ux?.recents_limit ?? 10);
 
     const elTw = get<HTMLInputElement>('#set-tab-width'); if (elTw) elTw.value = String(cfg.diff?.tab_width ?? 0);
@@ -928,7 +959,7 @@ export async function loadSettingsIntoForm(root?: HTMLElement) {
     const elMx = get<HTMLInputElement>('#set-max-file-size-mb'); if (elMx) elMx.value = String(cfg.diff?.max_file_size_mb ?? 0);
     const elIn = get<HTMLInputElement>('#set-intraline'); if (elIn) elIn.checked = !!cfg.diff?.intraline;
     const elBp = get<HTMLInputElement>('#set-binary-placeholders'); if (elBp) elBp.checked = !!cfg.diff?.show_binary_placeholders;
-    const elRestrict = get<HTMLInputElement>('#set-restrict-commit-summary'); if (elRestrict) elRestrict.checked = cfg.general?.restrict_commit_summary !== false;
+    const elRestrict = get<HTMLInputElement>('#set-restrict-commit-summary'); if (elRestrict) elRestrict.checked = cfg.commit?.restrict_commit_summary !== false;
     const elMm = get<HTMLSelectElement>('#set-merge-mode');
     const elMp = get<HTMLInputElement>('#set-merge-path');
     const elMa = get<HTMLInputElement>('#set-merge-args');
diff --git a/Frontend/src/scripts/features/settingsCommit.test.ts b/Frontend/src/scripts/features/settingsCommit.test.ts
new file mode 100644
index 00000000..6251ea08
--- /dev/null
+++ b/Frontend/src/scripts/features/settingsCommit.test.ts
@@ -0,0 +1,102 @@
+// Copyright © 2025-2026 OpenVCS Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import { describe, expect, it } from 'vitest';
+
+import type { GlobalSettings } from '../types';
+import {
+  collectCommitSettings,
+  collectCommitTemplateSettings,
+  loadCommitSettingsIntoForm,
+  DEFAULT_COMMIT_MESSAGE_CREATE,
+  DEFAULT_COMMIT_MESSAGE_UPDATE,
+  DEFAULT_COMMIT_MESSAGE_DELETE,
+} from './settingsCommit';
+
+describe('collectCommitSettings', () => {
+  it('captures commit template controls from the commit settings panel', () => {
+    document.body.innerHTML = `
+      <div>
+        <input id="set-commit-message-template-enabled" type="checkbox" checked />
+        <input id="set-restrict-commit-summary" type="checkbox" checked />
+        <input id="set-commit-message-template-create" type="text" value="Create {file:name}" />
+        <input id="set-commit-message-template-update" type="text" value="Update {file:name}" />
+        <input id="set-commit-message-template-delete" type="text" value="Delete {file:name}" />
+      </div>
+    `;
+
+    const root = document.body.firstElementChild as HTMLElement;
+    const commit = collectCommitSettings(root);
+
+    expect(commit?.commit_message_template_enabled).toBe(true);
+    expect(commit?.restrict_commit_summary).toBe(true);
+  });
+
+  it('captures commit template controls from the commit templates panel', () => {
+    document.body.innerHTML = `
+      <div>
+        <input id="set-commit-message-template-create" type="text" value="Create {file:name}" />
+        <input id="set-commit-message-template-update" type="text" value="Update {file:name}" />
+        <input id="set-commit-message-template-delete" type="text" value="Delete {file:name}" />
+      </div>
+    `;
+
+    const root = document.body.firstElementChild as HTMLElement;
+    const commitTemplates = collectCommitTemplateSettings(root);
+
+    expect(commitTemplates?.commit_message_template_create).toBe('Create {file:name}');
+    expect(commitTemplates?.commit_message_template_update).toBe('Update {file:name}');
+    expect(commitTemplates?.commit_message_template_delete).toBe('Delete {file:name}');
+  });
+});
+
+describe('loadCommitSettingsIntoForm', () => {
+  it('loads commit template controls into the commit settings panel', () => {
+    document.body.innerHTML = `
+      <div>
+        <input id="set-commit-message-template-enabled" type="checkbox" />
+        <input id="set-restrict-commit-summary" type="checkbox" />
+        <input id="set-commit-message-template-create" type="text" />
+        <input id="set-commit-message-template-update" type="text" />
+        <input id="set-commit-message-template-delete" type="text" />
+      </div>
+    `;
+
+    const root = document.body.firstElementChild as HTMLElement;
+    loadCommitSettingsIntoForm(root, {
+      commit: {
+        commit_message_template_enabled: true,
+        restrict_commit_summary: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+
+    expect((root.querySelector('#set-commit-message-template-enabled') as HTMLInputElement).checked).toBe(true);
+    expect((root.querySelector('#set-restrict-commit-summary') as HTMLInputElement).checked).toBe(true);
+    expect((root.querySelector('#set-commit-message-template-create') as HTMLInputElement).value).toBe('Create {file:name}');
+    expect((root.querySelector('#set-commit-message-template-update') as HTMLInputElement).value).toBe('Update {file:name}');
+    expect((root.querySelector('#set-commit-message-template-delete') as HTMLInputElement).value).toBe('Delete {file:name}');
+  });
+
+  it('falls back to default template when config is missing', () => {
+    document.body.innerHTML = `
+      <div>
+        <input id="set-commit-message-template-enabled" type="checkbox" />
+        <input id="set-commit-message-template-create" type="text" />
+        <input id="set-commit-message-template-update" type="text" />
+        <input id="set-commit-message-template-delete" type="text" />
+      </div>
+    `;
+
+    const root = document.body.firstElementChild as HTMLElement;
+    loadCommitSettingsIntoForm(root, {} as GlobalSettings);
+
+    expect((root.querySelector('#set-commit-message-template-create') as HTMLInputElement).value).toBe(DEFAULT_COMMIT_MESSAGE_CREATE);
+    expect((root.querySelector('#set-commit-message-template-update') as HTMLInputElement).value).toBe(DEFAULT_COMMIT_MESSAGE_UPDATE);
+    expect((root.querySelector('#set-commit-message-template-delete') as HTMLInputElement).value).toBe(DEFAULT_COMMIT_MESSAGE_DELETE);
+  });
+});
diff --git a/Frontend/src/scripts/features/settingsCommit.ts b/Frontend/src/scripts/features/settingsCommit.ts
new file mode 100644
index 00000000..8a69fdc0
--- /dev/null
+++ b/Frontend/src/scripts/features/settingsCommit.ts
@@ -0,0 +1,49 @@
+// Copyright © 2025-2026 OpenVCS Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import type { GlobalSettings } from '../types';
+
+/** Default commit hint for new files. */
+export const DEFAULT_COMMIT_MESSAGE_CREATE = 'Create {file:name}';
+
+/** Default commit hint for modified files. */
+export const DEFAULT_COMMIT_MESSAGE_UPDATE = 'Update {file:name}';
+
+/** Default commit hint for deleted files. */
+export const DEFAULT_COMMIT_MESSAGE_DELETE = 'Delete {file:name}';
+
+/** Collects commit-specific settings from the settings modal. */
+export function collectCommitSettings(root: HTMLElement): GlobalSettings['commit'] {
+  const get = <T extends HTMLElement = HTMLElement>(sel: string) => root.querySelector<T>(sel);
+
+  return {
+    commit_message_template_enabled: !!get<HTMLInputElement>('#set-commit-message-template-enabled')?.checked,
+    restrict_commit_summary: !!get<HTMLInputElement>('#set-restrict-commit-summary')?.checked,
+  };
+}
+
+/** Collects commit template settings from the settings modal. */
+export function collectCommitTemplateSettings(root: HTMLElement): NonNullable<NonNullable<GlobalSettings['commit']>['commit_templates']> {
+  const get = <T extends HTMLElement = HTMLElement>(sel: string) => root.querySelector<T>(sel);
+
+  return {
+    commit_message_template_create: get<HTMLInputElement>('#set-commit-message-template-create')?.value || '',
+    commit_message_template_update: get<HTMLInputElement>('#set-commit-message-template-update')?.value || '',
+    commit_message_template_delete: get<HTMLInputElement>('#set-commit-message-template-delete')?.value || '',
+  };
+}
+
+/** Loads commit-specific settings into the settings modal form controls. */
+export function loadCommitSettingsIntoForm(root: HTMLElement, cfg: GlobalSettings): void {
+  const get = <T extends HTMLElement = HTMLElement>(sel: string) => root.querySelector<T>(sel);
+  const elEnabled = get<HTMLInputElement>('#set-commit-message-template-enabled');
+  if (elEnabled) elEnabled.checked = cfg.commit?.commit_message_template_enabled !== false;
+  const elRestrict = get<HTMLInputElement>('#set-restrict-commit-summary');
+  if (elRestrict) elRestrict.checked = cfg.commit?.restrict_commit_summary !== false;
+  const elCreate = get<HTMLInputElement>('#set-commit-message-template-create');
+  if (elCreate) elCreate.value = cfg.commit?.commit_templates?.commit_message_template_create ?? DEFAULT_COMMIT_MESSAGE_CREATE;
+  const elUpdate = get<HTMLInputElement>('#set-commit-message-template-update');
+  if (elUpdate) elUpdate.value = cfg.commit?.commit_templates?.commit_message_template_update ?? DEFAULT_COMMIT_MESSAGE_UPDATE;
+  const elDelete = get<HTMLInputElement>('#set-commit-message-template-delete');
+  if (elDelete) elDelete.value = cfg.commit?.commit_templates?.commit_message_template_delete ?? DEFAULT_COMMIT_MESSAGE_DELETE;
+}
diff --git a/Frontend/src/scripts/features/settingsGeneral.test.ts b/Frontend/src/scripts/features/settingsGeneral.test.ts
index 57d85a0c..e10ec7b1 100644
--- a/Frontend/src/scripts/features/settingsGeneral.test.ts
+++ b/Frontend/src/scripts/features/settingsGeneral.test.ts
@@ -18,14 +18,12 @@ describe('collectGeneralSettings', () => {
         <input id="set-reopen-last" type="checkbox" checked />
         <input id="set-checks-on-launch" type="checkbox" checked />
         <input id="set-crash-reports" type="checkbox" checked />
-        <input id="set-restrict-commit-summary" type="checkbox" checked />
       </div>
     `;
 
     const root = document.body.firstElementChild as HTMLElement;
     const general = collectGeneralSettings(root, {}, () => 'dark');
     expect(general?.crash_reports).toBe(true);
-    expect(general?.restrict_commit_summary).toBe(true);
     expect(general?.theme).toBe('system');
   });
 });
@@ -39,7 +37,6 @@ describe('loadGeneralSettingsIntoForm', () => {
         <input id="set-reopen-last" type="checkbox" />
         <input id="set-checks-on-launch" type="checkbox" />
         <input id="set-crash-reports" type="checkbox" />
-        <input id="set-restrict-commit-summary" type="checkbox" />
       </div>
     `;
 
@@ -52,11 +49,10 @@ describe('loadGeneralSettingsIntoForm', () => {
           language: 'system',
           update_channel: 'stable',
           reopen_last_repos: true,
-          checks_on_launch: true,
-          crash_reports: true,
-          restrict_commit_summary: true,
+            checks_on_launch: true,
+            crash_reports: true,
+          },
         },
-      },
       (value) => String(value ?? ''),
       refreshDefaultBackendOptions,
       vi.fn().mockResolvedValue(undefined),
@@ -64,7 +60,6 @@ describe('loadGeneralSettingsIntoForm', () => {
 
     expect(refreshDefaultBackendOptions).toHaveBeenCalledWith(root, expect.any(Object));
     expect((root.querySelector('#set-crash-reports') as HTMLInputElement).checked).toBe(true);
-    expect((root.querySelector('#set-restrict-commit-summary') as HTMLInputElement).checked).toBe(true);
   });
 
   it('expands the default theme id to the light built-in theme in light mode', async () => {
@@ -77,7 +72,6 @@ describe('loadGeneralSettingsIntoForm', () => {
         <input id="set-reopen-last" type="checkbox" />
         <input id="set-checks-on-launch" type="checkbox" />
         <input id="set-crash-reports" type="checkbox" />
-        <input id="set-restrict-commit-summary" type="checkbox" />
       </div>
     `;
 
@@ -96,7 +90,6 @@ describe('loadGeneralSettingsIntoForm', () => {
           reopen_last_repos: false,
           checks_on_launch: false,
           crash_reports: false,
-          restrict_commit_summary: true,
         },
       },
       (value) => String(value ?? ''),
@@ -121,7 +114,6 @@ describe('loadGeneralSettingsIntoForm', () => {
         <input id="set-reopen-last" type="checkbox" />
         <input id="set-checks-on-launch" type="checkbox" />
         <input id="set-crash-reports" type="checkbox" />
-        <input id="set-restrict-commit-summary" type="checkbox" />
       </div>
     `;
 
@@ -140,7 +132,6 @@ describe('loadGeneralSettingsIntoForm', () => {
           reopen_last_repos: false,
           checks_on_launch: false,
           crash_reports: false,
-          restrict_commit_summary: true,
         },
       },
       (value) => String(value ?? ''),
@@ -165,7 +156,6 @@ describe('loadGeneralSettingsIntoForm', () => {
         <input id="set-reopen-last" type="checkbox" />
         <input id="set-checks-on-launch" type="checkbox" />
         <input id="set-crash-reports" type="checkbox" />
-        <input id="set-restrict-commit-summary" type="checkbox" />
       </div>
     `;
 
@@ -184,7 +174,6 @@ describe('loadGeneralSettingsIntoForm', () => {
           reopen_last_repos: false,
           checks_on_launch: false,
           crash_reports: false,
-          restrict_commit_summary: true,
         },
       },
       (value) => String(value ?? ''),
diff --git a/Frontend/src/scripts/features/settingsGeneral.ts b/Frontend/src/scripts/features/settingsGeneral.ts
index ec373b12..bbde99ba 100644
--- a/Frontend/src/scripts/features/settingsGeneral.ts
+++ b/Frontend/src/scripts/features/settingsGeneral.ts
@@ -26,7 +26,6 @@ export function collectGeneralSettings(
         reopen_last_repos: !!get<HTMLInputElement>('#set-reopen-last')?.checked,
         checks_on_launch: !!get<HTMLInputElement>('#set-checks-on-launch')?.checked,
         crash_reports: !!get<HTMLInputElement>('#set-crash-reports')?.checked,
-        restrict_commit_summary: !!get<HTMLInputElement>('#set-restrict-commit-summary')?.checked,
     };
 }
 
@@ -72,8 +71,6 @@ export async function loadGeneralSettingsIntoForm(
   if (elReo) elReo.checked = !!cfg.general?.reopen_last_repos;
   const elChk = get<HTMLInputElement>('#set-checks-on-launch');
   if (elChk) elChk.checked = !!cfg.general?.checks_on_launch;
-    const elCrash = get<HTMLInputElement>('#set-crash-reports');
-    if (elCrash) elCrash.checked = !!cfg.general?.crash_reports;
-    const elRestrict = get<HTMLInputElement>('#set-restrict-commit-summary');
-    if (elRestrict) elRestrict.checked = cfg.general?.restrict_commit_summary !== false;
+  const elCrash = get<HTMLInputElement>('#set-crash-reports');
+  if (elCrash) elCrash.checked = !!cfg.general?.crash_reports;
 }
diff --git a/Frontend/src/scripts/main.ts b/Frontend/src/scripts/main.ts
index fbc3d0c3..66abe9a0 100644
--- a/Frontend/src/scripts/main.ts
+++ b/Frontend/src/scripts/main.ts
@@ -8,9 +8,9 @@ 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, resolveVcsActionLabel } from './state/state';
+import { prefs, state, hasRepo, resolveVcsActionLabel, setGlobalSettings } from './state/state';
 import {
-    bindTabs, initResizer, refreshRepoActions, setRepoHeader, resetRepoHeader, setTab, setTheme,
+    bindTabs, initResizer, refreshRepoActions, setRepoHeader, setTab, setTheme,
     bindLayoutActionState, applyCommitSummaryRestriction, applyGpuAccelerationPreference
 } from './ui/layout';
 import { clearPluginMenubarMenus, initMenubar, refreshPluginMenubarMenus } from './ui/menubar';
@@ -101,6 +101,7 @@ function forceCloseTransientUi() {
 async function boot() {
     assertDesktopRuntime();
     const cfg = await loadInitialGlobalSettings();
+    setGlobalSettings(cfg ?? null);
     await syncFrontendMonitoring(cfg);
 
     // If launched as the Output Log window, render that view and skip the main app UI.
@@ -133,7 +134,7 @@ async function boot() {
                     if (mono) root.style.setProperty('--mono', mono);
                     applyAnimationPreference(cfg?.performance?.animations);
                     applyGpuAccelerationPreference(cfg?.performance?.gpu_accel);
-                    applyCommitSummaryRestriction(cfg?.general?.restrict_commit_summary !== false);
+                    applyCommitSummaryRestriction(cfg?.commit?.restrict_commit_summary !== false);
                 } catch { /* best-effort */ }
             } catch {
                 try { await selectThemePack(DEFAULT_LIGHT_THEME_ID, { silent: true, mode: 'system' }); } catch {}
diff --git a/Frontend/src/scripts/state/state.ts b/Frontend/src/scripts/state/state.ts
index 4aa08dfd..32953f00 100644
--- a/Frontend/src/scripts/state/state.ts
+++ b/Frontend/src/scripts/state/state.ts
@@ -1,7 +1,7 @@
 // Copyright © 2025-2026 OpenVCS Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 // src/state/state.ts
-import type { AppPrefs, Branch, CommitItem, FileStatus, StashItem } from '../types';
+import type { AppPrefs, Branch, CommitItem, FileStatus, GlobalSettings, StashItem } from '../types';
 
 /** Default application preferences. */
 export const defaultPrefs: AppPrefs = {
@@ -13,6 +13,15 @@ export const defaultPrefs: AppPrefs = {
 // In-memory-only UI prefs. Persisted preferences now live in native Rust config.
 /** Current application preferences. */
 export let prefs: AppPrefs = { ...defaultPrefs };
+
+/** Latest global settings snapshot for synchronous frontend reads. */
+export let globalSettings: GlobalSettings | null = null;
+
+/** Stores latest global settings snapshot. */
+export function setGlobalSettings(cfg: GlobalSettings | null) {
+    globalSettings = cfg;
+}
+
 /**
  * Save preferences to storage.
  * @deprecated Web prefs are not persisted; native settings handle persistence
diff --git a/Frontend/src/scripts/types.d.ts b/Frontend/src/scripts/types.d.ts
index 80e877c2..03080d1d 100644
--- a/Frontend/src/scripts/types.d.ts
+++ b/Frontend/src/scripts/types.d.ts
@@ -72,7 +72,15 @@ export interface GlobalSettings {
         checks_on_launch?: boolean;
         telemetry?: boolean;
         crash_reports?: boolean;
+    };
+    commit?: {
+        commit_message_template_enabled?: boolean;
         restrict_commit_summary?: boolean;
+        commit_templates?: {
+            commit_message_template_create?: string;
+            commit_message_template_update?: string;
+            commit_message_template_delete?: string;
+        };
     };
     git?: {
         backend?: string;
diff --git a/Frontend/src/scripts/ui/layout.ts b/Frontend/src/scripts/ui/layout.ts
index 0fae345b..56704925 100644
--- a/Frontend/src/scripts/ui/layout.ts
+++ b/Frontend/src/scripts/ui/layout.ts
@@ -5,6 +5,7 @@ import { prefs, savePrefs, state, hasRepo, hasChanges, resolveVcsActionLabel } f
 import { TAURI } from '../lib/tauri';
 import { notify } from '../lib/notify';
 import { setAppearanceMode } from '../themes';
+import { updateCommitButton } from '../features/repo/commit';
 
 const workGrid = qs<HTMLElement>('.work');
 const resizer  = qs<HTMLElement>('#resizer');
@@ -190,6 +191,7 @@ export function initResizer() {
 
 /** Recomputes enablement and labels for repo-scoped UI actions. */
 export function refreshRepoActions() {
+    updateCommitButton();
     const repoOn       = hasRepo();
     const changesOn    = hasChanges();
 

From 79fb81074904ad251bf9f68cde596326d6335954 Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 17:27:09 +0100
Subject: [PATCH 2/8] Fix issues

---
 .../src/scripts/features/repo/commit.test.ts  | 22 ++++++++++++++
 Frontend/src/scripts/features/repo/commit.ts  |  6 ++--
 Frontend/src/scripts/ui/layout.test.ts        | 29 ++++++++++++++++++-
 Frontend/src/scripts/ui/layout.ts             | 10 +------
 4 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/Frontend/src/scripts/features/repo/commit.test.ts b/Frontend/src/scripts/features/repo/commit.test.ts
index de9a9dae..e88c6e0c 100644
--- a/Frontend/src/scripts/features/repo/commit.test.ts
+++ b/Frontend/src/scripts/features/repo/commit.test.ts
@@ -140,4 +140,26 @@ describe('updateCommitButton', () => {
     expect(summary.placeholder.endsWith('...')).toBe(true);
     expect(summary.placeholder.startsWith('Update test.cpp with extra detail beyond seventy two')).toBe(true);
   });
+
+  it('does not fall back to default for empty template strings', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: '',
+          commit_message_template_update: '',
+          commit_message_template_delete: '',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Summary (required)');
+  });
 });
diff --git a/Frontend/src/scripts/features/repo/commit.ts b/Frontend/src/scripts/features/repo/commit.ts
index 84781c04..03a5c73a 100644
--- a/Frontend/src/scripts/features/repo/commit.ts
+++ b/Frontend/src/scripts/features/repo/commit.ts
@@ -41,12 +41,12 @@ function selectedCommitFileStatus(filePath: string): string {
 function selectedCommitTemplate(filePath: string): string {
     const status = selectedCommitFileStatus(filePath);
     if (status === 'A' || status === '?' || status.includes('?')) {
-        return globalSettings?.commit?.commit_templates?.commit_message_template_create || DEFAULT_COMMIT_MESSAGE_CREATE;
+        return globalSettings?.commit?.commit_templates?.commit_message_template_create ?? DEFAULT_COMMIT_MESSAGE_CREATE;
     }
     if (status === 'D') {
-        return globalSettings?.commit?.commit_templates?.commit_message_template_delete || DEFAULT_COMMIT_MESSAGE_DELETE;
+        return globalSettings?.commit?.commit_templates?.commit_message_template_delete ?? DEFAULT_COMMIT_MESSAGE_DELETE;
     }
-    return globalSettings?.commit?.commit_templates?.commit_message_template_update || DEFAULT_COMMIT_MESSAGE_UPDATE;
+    return globalSettings?.commit?.commit_templates?.commit_message_template_update ?? DEFAULT_COMMIT_MESSAGE_UPDATE;
 }
 
 /** Expands commit template placeholders for one selected file. */
diff --git a/Frontend/src/scripts/ui/layout.test.ts b/Frontend/src/scripts/ui/layout.test.ts
index a274eab5..7b8a4f85 100644
--- a/Frontend/src/scripts/ui/layout.test.ts
+++ b/Frontend/src/scripts/ui/layout.test.ts
@@ -111,11 +111,12 @@ describe('refreshRepoActions', () => {
 
   it('switches the push button label between Publish and Push based on branchOnRemote', async () => {
     const { refreshRepoActions } = await import('./layout');
-    const { state } = await import('../state/state');
+    const { state, setGlobalSettings } = await import('../state/state');
     const pushBtn = document.getElementById('push-btn') as HTMLButtonElement;
     const label = pushBtn.querySelector('.btn-label') as HTMLSpanElement;
     const files: FileStatus[] = [{ path: 'keep.txt', status: 'M' }];
 
+    setGlobalSettings(null);
     state.hasRepo = true;
     state.files = files;
     state.ahead = 0;
@@ -134,4 +135,30 @@ describe('refreshRepoActions', () => {
     expect(pushBtn.title).toBe('Push');
     expect(pushBtn.getAttribute('aria-label')).toBe('Push');
   });
+
+  it('enables commit button when one-file hint is available', async () => {
+    const { refreshRepoActions } = await import('./layout');
+    const { state, setGlobalSettings } = await import('../state/state');
+    const commitBtn = document.getElementById('commit-btn') as HTMLButtonElement;
+
+    setGlobalSettings(null);
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        restrict_commit_summary: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.hasRepo = true;
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+
+    refreshRepoActions();
+
+    expect(commitBtn.disabled).toBe(false);
+  });
 });
diff --git a/Frontend/src/scripts/ui/layout.ts b/Frontend/src/scripts/ui/layout.ts
index 56704925..60d30641 100644
--- a/Frontend/src/scripts/ui/layout.ts
+++ b/Frontend/src/scripts/ui/layout.ts
@@ -232,15 +232,7 @@ export function refreshRepoActions() {
     if (summary) summary.disabled = !(repoOn && changesOn);
     if (desc)    desc.disabled    = !(repoOn && changesOn);
 
-    // Commit button requires: repo + changes + non-empty summary + explicit selection (files, hunks, or per-line)
-    const summaryFilled = (summary?.value.trim().length ?? 0) > 0;
-    // Require either selected hunks, selected lines, or selected files (commit UI selection)
-    const hunksSelected = Object.values(state.selectedHunksByFile || {})
-        .some((hunks) => Array.isArray(hunks) && hunks.length > 0);
-    const linesSelected = Object.values(state.selectedLinesByFile || {})
-        .some((hunks) => !!hunks && Object.keys(hunks).length > 0);
-    const filesSelected = state.selectedFiles.size > 0;
-    if (commit)  commit.disabled  = !(repoOn && changesOn && summaryFilled && (hunksSelected || linesSelected || filesSelected));
+    // Commit button enablement handled by updateCommitButton().
     if (commit) {
         const commitLabel = resolveVcsActionLabel('VCS.Commit', 'Commit');
         commit.textContent = commitLabel;

From c3a0d2cf3257d0e7b6735dadf1e017ccd167cb20 Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 18:57:44 +0100
Subject: [PATCH 3/8] Fix issues

---
 .../src/scripts/features/repo/commit.test.ts  | 24 +++++++++++++++++++
 Frontend/src/scripts/features/repo/commit.ts  |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Frontend/src/scripts/features/repo/commit.test.ts b/Frontend/src/scripts/features/repo/commit.test.ts
index e88c6e0c..bcf05517 100644
--- a/Frontend/src/scripts/features/repo/commit.test.ts
+++ b/Frontend/src/scripts/features/repo/commit.test.ts
@@ -162,4 +162,28 @@ describe('updateCommitButton', () => {
 
     expect(summary.placeholder).toBe('Summary (required)');
   });
+
+  it('keeps commit disabled without repo or changes', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.hasRepo = false;
+    state.files = [];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Update test.cpp');
+    expect((document.getElementById('commit-btn') as HTMLButtonElement).disabled).toBe(true);
+  });
 });
diff --git a/Frontend/src/scripts/features/repo/commit.ts b/Frontend/src/scripts/features/repo/commit.ts
index 03a5c73a..cb0a0168 100644
--- a/Frontend/src/scripts/features/repo/commit.ts
+++ b/Frontend/src/scripts/features/repo/commit.ts
@@ -79,6 +79,8 @@ export function updateCommitButton() {
     if (!btn) return;
     const summary = document.getElementById('commit-summary') as HTMLInputElement | null;
     const hint = getCommitSummaryHint();
+    const repoOn = state.hasRepo;
+    const changesOn = Array.isArray(state.files) && state.files.length > 0;
 
     if (summary) {
         summary.placeholder = hint || 'Summary (required)';
@@ -90,5 +92,5 @@ export function updateCommitButton() {
     const linesSelected = Object.keys((state as any).selectedLinesByFile || {})
         .some((k) => !!(state as any).selectedLinesByFile[k] && Object.keys((state as any).selectedLinesByFile[k] || {}).length > 0);
     const filesSelected = !!(state.selectedFiles && state.selectedFiles.size > 0);
-    btn.disabled = !(summaryFilled && (hunksSelected || linesSelected || filesSelected));
+    btn.disabled = !(repoOn && changesOn && summaryFilled && (hunksSelected || linesSelected || filesSelected));
 }

From 63d1109ac96cd8db220ec24b50a9be98c754095a Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 18:59:36 +0100
Subject: [PATCH 4/8] Update commit.test.ts

---
 .../src/scripts/features/repo/commit.test.ts  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/Frontend/src/scripts/features/repo/commit.test.ts b/Frontend/src/scripts/features/repo/commit.test.ts
index bcf05517..9f015293 100644
--- a/Frontend/src/scripts/features/repo/commit.test.ts
+++ b/Frontend/src/scripts/features/repo/commit.test.ts
@@ -163,6 +163,128 @@ describe('updateCommitButton', () => {
     expect(summary.placeholder).toBe('Summary (required)');
   });
 
+  it('suppresses hint when template feature is disabled', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: false,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Summary (required)');
+  });
+
+  it('does not truncate when commit summary restriction is disabled', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        restrict_commit_summary: false,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name} with extra detail beyond seventy two characters and more text for truncation',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Update test.cpp with extra detail beyond seventy two characters and more text for truncation');
+    expect(summary.placeholder).not.toContain('...');
+  });
+
+  it('suppresses hint when multiple files are selected', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    state.files = [
+      { path: 'src/test.cpp', status: 'M' } as FileStatus,
+      { path: 'src/other.cpp', status: 'A' } as FileStatus,
+    ];
+    state.selectedFiles = new Set(['src/test.cpp', 'src/other.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Summary (required)');
+  });
+
+  it('expands file path placeholder', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:path}',
+          commit_message_template_update: 'Update {file:path}',
+          commit_message_template_delete: 'Delete {file:path}',
+        },
+      },
+    });
+    state.files = [{ path: 'src/deep/test.cpp', status: 'M' } as FileStatus];
+    state.selectedFiles = new Set(['src/deep/test.cpp']);
+    const summary = document.getElementById('commit-summary') as HTMLInputElement;
+
+    updateCommitButton();
+
+    expect(summary.placeholder).toBe('Update src/deep/test.cpp');
+  });
+
+  it('selects templates by status branch', async () => {
+    const { updateCommitButton } = await import('./commit');
+
+    setGlobalSettings({
+      commit: {
+        commit_message_template_enabled: true,
+        commit_templates: {
+          commit_message_template_create: 'Create {file:name}',
+          commit_message_template_update: 'Update {file:name}',
+          commit_message_template_delete: 'Delete {file:name}',
+        },
+      },
+    });
+    const cases: Array<[FileStatus['status'], string]> = [
+      ['A', 'Create test.cpp'],
+      ['D', 'Delete test.cpp'],
+      ['?', 'Create test.cpp'],
+      ['??', 'Create test.cpp'],
+      ['M', 'Update test.cpp'],
+    ];
+
+    for (const [status, expected] of cases) {
+      state.files = [{ path: 'src/test.cpp', status } as FileStatus];
+      state.selectedFiles = new Set(['src/test.cpp']);
+      updateCommitButton();
+      expect((document.getElementById('commit-summary') as HTMLInputElement).placeholder).toBe(expected);
+    }
+  });
+
   it('keeps commit disabled without repo or changes', async () => {
     const { updateCommitButton } = await import('./commit');
 

From 43743f7b279a8c7c686f8efa26fcb25b19cbae94 Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 19:05:33 +0100
Subject: [PATCH 5/8] Fixed animation issue

---
 Frontend/src/scripts/features/diff.test.ts | 17 +++++++++++++++++
 Frontend/src/scripts/features/diff.ts      |  2 ++
 Frontend/src/scripts/main.ts               |  4 +++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Frontend/src/scripts/features/diff.test.ts b/Frontend/src/scripts/features/diff.test.ts
index 251f7e6f..d59c1d62 100644
--- a/Frontend/src/scripts/features/diff.test.ts
+++ b/Frontend/src/scripts/features/diff.test.ts
@@ -25,6 +25,7 @@ vi.mock('../lib/tauri', () => {
 vi.mock('./repo', () => ({
   hydrateStatus: vi.fn(async () => {}),
   hydrateCommits: vi.fn(async () => {}),
+  yieldToPaint: vi.fn(async () => {}),
 }));
 
 let state: typeof import('../state/state').state;
@@ -83,4 +84,20 @@ describe('bindCommit', () => {
       stagePaths: ['content/posts/2026/05/openvcs-announcement.md'],
     });
   });
+
+  it('yields to paint before committing', async () => {
+    const repo = await import('./repo');
+    const { bindCommit } = await import('./diff');
+    const commitSummary = document.getElementById('commit-summary') as HTMLInputElement;
+    const commitBtn = document.getElementById('commit-btn') as HTMLButtonElement;
+
+    commitSummary.value = 'Add post';
+    commitBtn.disabled = false;
+
+    bindCommit();
+    commitBtn.click();
+
+    await Promise.resolve();
+    expect(vi.mocked(repo.yieldToPaint)).toHaveBeenCalled();
+  });
 });
diff --git a/Frontend/src/scripts/features/diff.ts b/Frontend/src/scripts/features/diff.ts
index 036941e5..07b9e8b5 100644
--- a/Frontend/src/scripts/features/diff.ts
+++ b/Frontend/src/scripts/features/diff.ts
@@ -7,6 +7,7 @@ import { state } from '../state/state';
 import { hydrateStatus, hydrateCommits } from './repo';
 import { runHook } from '../plugins';
 import { getCommitSummaryHint } from './repo/commit';
+import { yieldToPaint } from './repo';
 
 export function bindCommit() {
     const commitBtn     = qs<HTMLButtonElement>('#commit-btn');
@@ -28,6 +29,7 @@ export function bindCommit() {
         };
         try {
             setBusy('Committing…');
+            await yieldToPaint();
             let description = commitDesc?.value || '';
 
             // Build a combined patch when any file has partial hunks/lines selected.
diff --git a/Frontend/src/scripts/main.ts b/Frontend/src/scripts/main.ts
index 66abe9a0..cb67aac1 100644
--- a/Frontend/src/scripts/main.ts
+++ b/Frontend/src/scripts/main.ts
@@ -350,7 +350,9 @@ async function boot() {
                 notify(pre.reason || 'Push cancelled');
                 return;
             }
-            setBusy('Pushing…'); await TAURI.invoke('vcs_push', {});
+            setBusy('Pushing…');
+            await yieldToPaint();
+            await TAURI.invoke('vcs_push', {});
             await runHook('onPush', hookData);
             notify('Pushed');
             await Promise.allSettled([hydrateStatus(), hydrateCommits()]);

From 477fec3ba543fe6c88d95f5f35f26e71b42a777a Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 19:07:14 +0100
Subject: [PATCH 6/8] Update main.ts

---
 Frontend/src/scripts/main.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Frontend/src/scripts/main.ts b/Frontend/src/scripts/main.ts
index cb67aac1..ca462d23 100644
--- a/Frontend/src/scripts/main.ts
+++ b/Frontend/src/scripts/main.ts
@@ -503,8 +503,7 @@ async function boot() {
             if (busyFrame !== null) return;
             busyFrame = window.requestAnimationFrame(() => {
                 busyFrame = null;
-                const focused = document.visibilityState === 'visible' && document.hasFocus();
-                setBusy('Working…', focused);
+                setBusy('Working…', true);
             });
         };
         TAURI.listen?.('vcs-progress', ({ payload }) => {

From a59f0ef8f0b8af85e8c73c443256204bf13f7a5f Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 19:11:41 +0100
Subject: [PATCH 7/8] Fix spinners

---
 Frontend/src/scripts/features/update.test.ts |  6 ++++++
 Frontend/src/scripts/features/update.ts      | 22 ++++++++++++++++++++
 Frontend/src/styles/modal/modal-base.css     | 18 +++++++++++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/Frontend/src/scripts/features/update.test.ts b/Frontend/src/scripts/features/update.test.ts
index 71b039e5..8aaa5a2c 100644
--- a/Frontend/src/scripts/features/update.test.ts
+++ b/Frontend/src/scripts/features/update.test.ts
@@ -63,21 +63,27 @@ describe('wireUpdate', () => {
     expect(listenCallback).toBeDefined();
 
     const button = document.getElementById('update-install') as HTMLButtonElement;
+    const status = document.getElementById('status') as HTMLDivElement;
     button.click();
 
     expect(button.textContent).toBe('Downloading…');
     expect(button.disabled).toBe(true);
+    expect(status.textContent).toBe('Downloading update…');
+    expect(status.classList.contains('busy')).toBe(true);
 
     listenCallback?.({ payload: { kind: 'progress', received: 73, total: 100 } });
     expect(button.textContent).toBe('Downloading…73%');
+    expect(status.textContent).toBe('Downloading update…');
 
     listenCallback?.({ payload: { kind: 'downloaded' } });
     expect(button.textContent).toBe('Installing');
+    expect(status.textContent).toBe('Installing update…');
 
     resolveInstall?.();
     await Promise.resolve();
 
     expect(button.textContent).toBe('Done, please restart');
     expect(button.disabled).toBe(true);
+    expect(status.classList.contains('busy')).toBe(false);
   });
 });
diff --git a/Frontend/src/scripts/features/update.ts b/Frontend/src/scripts/features/update.ts
index 0babf817..f144e512 100644
--- a/Frontend/src/scripts/features/update.ts
+++ b/Frontend/src/scripts/features/update.ts
@@ -31,6 +31,24 @@ function getUpdateInstallButton(): HTMLButtonElement | null {
   return modal?.querySelector('#update-install') as HTMLButtonElement | null;
 }
 
+/** Returns the footer status element used for global busy indication. */
+function getFooterStatus(): HTMLElement | null {
+  return document.getElementById('status') as HTMLElement | null;
+}
+
+/** Applies busy styling to the footer status bar for update activity. */
+function setUpdateBusy(text: string | null) {
+  const statusEl = getFooterStatus();
+  if (!statusEl) return;
+
+  if (text) {
+    statusEl.textContent = text;
+    statusEl.classList.add('busy');
+  } else {
+    statusEl.classList.remove('busy');
+  }
+}
+
 /** Formats the download button label for the current byte progress. */
 function formatDownloadingLabel(received?: number, total?: number): string {
   const totalBytes = Number(total ?? 0);
@@ -52,18 +70,22 @@ function setUpdateInstallPhase(phase: UpdateInstallPhase, progress?: UpdateProgr
 
   switch (phase) {
     case 'idle':
+      setUpdateBusy(null);
       installBtn.textContent = 'Install';
       installBtn.disabled = false;
       return;
     case 'downloading':
+      setUpdateBusy('Downloading update…');
       installBtn.textContent = formatDownloadingLabel(progress?.received, progress?.total);
       installBtn.disabled = true;
       return;
     case 'installing':
+      setUpdateBusy('Installing update…');
       installBtn.textContent = 'Installing';
       installBtn.disabled = true;
       return;
     case 'done':
+      setUpdateBusy(null);
       installBtn.textContent = 'Done, please restart';
       installBtn.disabled = true;
   }
diff --git a/Frontend/src/styles/modal/modal-base.css b/Frontend/src/styles/modal/modal-base.css
index cb94b36d..aa8a81b3 100644
--- a/Frontend/src/styles/modal/modal-base.css
+++ b/Frontend/src/styles/modal/modal-base.css
@@ -80,7 +80,7 @@
     box-shadow:0 0 0 2px color-mix(in oklab, var(--accent) 45%, transparent);
 }
 .modal button.icon.close:disabled{
-    opacity:.55; cursor:not-allowed; pointer-events:none; transform:none!important;
+    opacity:.55; cursor:not-allowed; pointer-events:none; transform:none;
 }
 .sheet-body{ padding:1rem; display:grid; gap:1rem; }
 .sheet-actions{
@@ -91,6 +91,22 @@
     flex-wrap:wrap;
 }
 
+#update-install[aria-busy="true"]{
+    display:inline-flex;
+    align-items:center;
+    gap:.5rem;
+}
+
+#update-install[aria-busy="true"]::after{
+    content:"";
+    width:12px;
+    height:12px;
+    border:2px solid currentColor;
+    border-top-color:transparent;
+    border-radius:50%;
+    animation:status-spin .8s linear infinite;
+}
+
 .modal-note{
     color:var(--muted);
     font-size:.95rem;

From 9ad9dc272ac41eac8c19f7ee161b1044ed6ea3d1 Mon Sep 17 00:00:00 2001
From: Jordon <jordon@bbgames.dev>
Date: Sun, 17 May 2026 19:30:42 +0100
Subject: [PATCH 8/8] Fix status issues

---
 Frontend/src/scripts/lib/notify.test.ts | 12 ++++++++++++
 Frontend/src/scripts/lib/notify.ts      |  2 +-
 Frontend/src/scripts/main.ts            |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Frontend/src/scripts/lib/notify.test.ts b/Frontend/src/scripts/lib/notify.test.ts
index 8f68a1cb..49eaa5bb 100644
--- a/Frontend/src/scripts/lib/notify.test.ts
+++ b/Frontend/src/scripts/lib/notify.test.ts
@@ -31,4 +31,16 @@ describe('notify', () => {
     vi.advanceTimersByTime(2200);
     expect(status.textContent).toBe('Ready');
   });
+
+  it('does not restore Ready while status is busy', async () => {
+    const { notify } = await import('./notify');
+    const status = document.getElementById('status') as HTMLElement;
+
+    status.classList.add('busy');
+    notify('Downloading update…');
+    expect(status.textContent).toBe('Downloading update…');
+
+    vi.advanceTimersByTime(2200);
+    expect(status.textContent).toBe('Downloading update…');
+  });
 });
diff --git a/Frontend/src/scripts/lib/notify.ts b/Frontend/src/scripts/lib/notify.ts
index d6c2e661..0e3de544 100644
--- a/Frontend/src/scripts/lib/notify.ts
+++ b/Frontend/src/scripts/lib/notify.ts
@@ -13,6 +13,6 @@ export function notify(text: string) {
     if (!statusEl) return;
     setText(statusEl, text);
     setTimeout(() => {
-        if (statusEl.textContent === text) setText(statusEl, 'Ready');
+        if (statusEl.textContent === text && !statusEl.classList.contains('busy')) setText(statusEl, 'Ready');
     }, 2200);
 }
diff --git a/Frontend/src/scripts/main.ts b/Frontend/src/scripts/main.ts
index ca462d23..bbec0a28 100644
--- a/Frontend/src/scripts/main.ts
+++ b/Frontend/src/scripts/main.ts
@@ -503,6 +503,10 @@ async function boot() {
             if (busyFrame !== null) return;
             busyFrame = window.requestAnimationFrame(() => {
                 busyFrame = null;
+                const s = document.getElementById('status');
+                if (!s) return;
+                const current = String(s.textContent || '');
+                if (s.classList.contains('busy') && !current.startsWith('Working')) return;
                 setBusy('Working…', true);
             });
         };