Implement commit and diff fix for new files

Author: Jordonbc

Backend/src/tauri_commands/commit.rs

@@ -95,7 +95,7 @@ pub async fn commit_changes<R: Runtime>(
 }
 
 #[tauri::command]
-/// Commits only selected file paths.
+/// Stages and commits only selected file paths.
 ///
 /// # Parameters
 /// - `window`: Calling window handle for progress events.
@@ -147,7 +147,7 @@ pub async fn commit_selected<R: Runtime>(
         });
         let oid = repo
             .inner()
-            .commit(&message, &name, &email, &paths)
+            .commit_index(&message, &name, &email)
             .map_err(|e| {
                 error!("Commit (selected) failed: {e}");
                 e.to_string()
@@ -159,7 +159,7 @@ pub async fn commit_selected<R: Runtime>(
 }
 
 #[tauri::command]
-/// Applies a patch to the index and creates a commit from staged hunks.
+/// Applies a patch to the index, stages selected files, and commits the staged index.
 ///
 /// # Parameters
 /// - `window`: Calling window handle for progress events.
@@ -290,18 +290,15 @@ pub async fn commit_patch_and_files<R: Runtime>(
                 e.to_string()
             })?;
         }
-        let commit_paths: Vec<PathBuf> = if files.is_empty() {
-            stage_paths.clone()
-        } else {
-            files.iter().map(PathBuf::from).collect()
-        };
-        let oid = if commit_paths.is_empty() {
+        let has_selection = !patch.trim().is_empty() || !files.is_empty() || !stage_paths.is_empty();
+        if !has_selection {
             return Err("No commit paths provided".into());
-        } else {
-            repo.inner()
-                .commit(&message, &name, &email, &commit_paths)
-                .map_err(|e| e.to_string())?
-        };
+        }
+
+        let oid = repo
+            .inner()
+            .commit_index(&message, &name, &email)
+            .map_err(|e| e.to_string())?;
         on(VcsEvent::Info {
             msg: "Commit complete".into(),
         });

Frontend/src/scripts/features/diff.test.ts

@@ -0,0 +1,86 @@
+// Copyright © 2025-2026 OpenVCS Contributors
+// SPDX-License-Identifier: GPL-3.0-or-later
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('../plugins', () => ({
+  runHook: vi.fn(async () => ({ cancelled: false })),
+}));
+
+vi.mock('../lib/tauri', () => {
+  const invoke = vi.fn(async (cmd: string) => {
+    if (cmd === 'commit_patch_and_files') return 'oid-123';
+    return [];
+  });
+  return {
+    TAURI: {
+      invoke,
+      listen: vi.fn(),
+    },
+    isTauriRuntimeAvailable: () => true,
+    assertDesktopRuntime: () => {},
+    __invoke: invoke,
+  };
+});
+
+vi.mock('./repo', () => ({
+  hydrateStatus: vi.fn(async () => {}),
+  hydrateCommits: vi.fn(async () => {}),
+}));
+
+let state: typeof import('../state/state').state;
+
+/** Mounts the minimal DOM needed for commit binding. */
+function mountCommitDom() {
+  document.body.innerHTML = `
+    <div id="status"></div>
+    <input id="commit-summary" />
+    <textarea id="commit-desc"></textarea>
+    <button id="commit-btn"></button>
+  `;
+}
+
+beforeEach(async () => {
+  vi.resetModules();
+  mountCommitDom();
+  state = (await import('../state/state')).state;
+  state.files = [{ path: 'content/posts/2026/05/openvcs-announcement.md', status: '??' }] as any;
+  state.selectedFiles = new Set(['content/posts/2026/05/openvcs-announcement.md']);
+  state.selectedHunksByFile = {
+    'content/posts/2026/05/openvcs-announcement.md': [0],
+  } as any;
+  state.selectedLinesByFile = {};
+  state.selectedHunks = [];
+  state.diffSelectedFiles = new Set();
+  (state as any).branch = 'main';
+});
+
+afterEach(() => {
+  document.body.innerHTML = '';
+  vi.restoreAllMocks();
+});
+
+describe('bindCommit', () => {
+  it('keeps untracked selected files in stage_paths', async () => {
+    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();
+
+    const { __invoke: invoke } = await import('../lib/tauri') as any;
+    const call = (invoke as ReturnType<typeof vi.fn>).mock.calls.find((args: unknown[]) => args[0] === 'commit_patch_and_files');
+    expect(call).toBeTruthy();
+    expect(call?.[1]).toMatchObject({
+      summary: 'Add post',
+      patch: '',
+      files: ['content/posts/2026/05/openvcs-announcement.md'],
+      stagePaths: ['content/posts/2026/05/openvcs-announcement.md'],
+    });
+  });
+});

Frontend/src/scripts/features/diff.ts

@@ -35,8 +35,16 @@ export function bindCommit() {
                 ...Object.keys(linesMap).filter(p => linesMap[p] && Object.keys(linesMap[p] || {}).length > 0),
             ]));
 
+            const selectedUntrackedFiles = new Set(
+                (state.files || [])
+                    .filter((file: any) => String(file?.status || '').includes('?'))
+                    .map((file: any) => String(file?.path || ''))
+                    .filter(Boolean),
+            );
+
             // Full-file selections are staged directly; partial selections are staged via patch.
-            const stagePaths = selectedFiles.filter(f => !partialFiles.includes(f));
+            // Untracked files still need to be staged even if the UI has synthetic hunk state.
+            const stagePaths = selectedFiles.filter(f => !partialFiles.includes(f) || selectedUntrackedFiles.has(f));
 
             // Build patch only from hunk and line selections.
             let combinedPatch = '';