feat: add HEAD reset actions

Author: cst8t

src-tauri/src/git/cli.rs

@@ -4331,6 +4331,7 @@ impl GitOperationHandler for CliGitHandler {
         let mode_flag = match request.mode {
             ResetMode::Soft => "--soft",
             ResetMode::Mixed => "--mixed",
+            ResetMode::Hard => "--hard",
         };
         Self::run_git(
             &["reset", mode_flag, request.target.trim()],
@@ -4339,6 +4340,7 @@ impl GitOperationHandler for CliGitHandler {
         let mode_label = match request.mode {
             ResetMode::Soft => "soft",
             ResetMode::Mixed => "mixed",
+            ResetMode::Hard => "hard",
         };
         Ok(OperationResult {
             message: format!("Reset ({mode_label}) to {}", request.target.trim()),
@@ -5274,6 +5276,15 @@ mod tests {
         );
     }
 
+    #[test]
+    fn reset_mode_hard_serialises_as_hard() {
+        assert_eq!(serde_json::to_string(&ResetMode::Hard).unwrap(), "\"hard\"");
+        assert_eq!(
+            serde_json::from_str::<ResetMode>("\"hard\"").unwrap(),
+            ResetMode::Hard
+        );
+    }
+
     #[test]
     fn status_line_modified_unstaged() {
         let result = CliGitHandler::parse_status_line(" M src/main.rs");

src-tauri/src/git/types.rs

@@ -1102,6 +1102,7 @@ pub struct StashPushRequest {
 pub enum ResetMode {
     Soft,
     Mixed,
+    Hard,
 }
 
 #[derive(Debug, Clone, Deserialize)]

src-tauri/tests/git.rs

@@ -10,8 +10,8 @@ use gitmun_lib::git::handler::GitOperationHandler;
 use gitmun_lib::git::types::{
     CommitDetailsRequest, CommitHistoryRequest, CommitLogScope, CommitRequest, CreateBranchRequest,
     ExportPatchFileSelection, ExportPatchRequest, ExportPatchScope, FileRequest,
-    ImportPatchRequest, PushFailureKind, PushRequest, RepoRequest, SetBranchUpstreamRequest,
-    StageFilesRequest, SubmoduleActionRequest, SubmoduleState,
+    ImportPatchRequest, PushFailureKind, PushRequest, RepoRequest, ResetMode, ResetRequest,
+    SetBranchUpstreamRequest, StageFilesRequest, SubmoduleActionRequest, SubmoduleState,
 };
 
 fn init_repo() -> TempDir {
@@ -602,6 +602,33 @@ fn unstage_file_in_repo_with_head_keeps_change_unstaged() {
     );
 }
 
+#[test]
+fn hard_reset_to_head_discards_tracked_changes_and_keeps_untracked_files() {
+    let dir = init_repo();
+    write_file(dir.path(), "tracked.txt", "v1");
+    git(dir.path(), &["add", "tracked.txt"]);
+    git(dir.path(), &["commit", "-m", "add tracked file"]);
+    write_file(dir.path(), "tracked.txt", "v2");
+    git(dir.path(), &["add", "tracked.txt"]);
+    write_file(dir.path(), "untracked.txt", "new");
+
+    let result = handler()
+        .reset(&ResetRequest {
+            repo_path: dir.path().to_str().unwrap().to_string(),
+            target: "HEAD".to_string(),
+            mode: ResetMode::Hard,
+        })
+        .expect("hard reset");
+
+    assert_eq!(result.message, "Reset (hard) to HEAD");
+    assert_eq!(read_file(dir.path(), "tracked.txt"), "v1");
+    assert_eq!(read_file(dir.path(), "untracked.txt"), "new");
+    assert_eq!(
+        git_stdout(dir.path(), &["status", "--porcelain"]),
+        "?? untracked.txt"
+    );
+}
+
 #[test]
 fn status_detects_clean_submodule() {
     let (parent, _submodule) = repo_with_submodule();

src/api/commands.ts

@@ -342,7 +342,9 @@ export function revertAbort(repoPath: string): Promise<OperationResult> {
     return invoke<OperationResult>("revert_abort", {request: {repoPath}});
 }
 
-export function resetTo(repoPath: string, target: string, mode: "soft" | "mixed"): Promise<OperationResult> {
+export type ResetMode = "soft" | "mixed" | "hard";
+
+export function resetTo(repoPath: string, target: string, mode: ResetMode): Promise<OperationResult> {
     return invoke<OperationResult>("reset", {request: {repoPath, target, mode}});
 }
 

src/components/ProjectView.tsx

@@ -40,6 +40,7 @@ import { useGitTags } from "../hooks/useGitTags";
 import { useGitRemotes } from "../hooks/useGitRemotes";
 import { useGitStashes } from "../hooks/useGitStashes";
 import * as api from "../api/commands";
+import type { ResetMode } from "../api/commands";
 import type {
   CommitLogScope,
   CommitMarkers,
@@ -1875,6 +1876,29 @@ export function ProjectView({
     }
   }, [repoPath, refreshAll, showToast, t]);
 
+  const handleResetHead = useCallback(async (mode: Extract<ResetMode, "mixed" | "hard">) => {
+    if (!repoPath) return;
+    const confirmed = await ask(
+      mode === "hard" ? t("ask.resetHead.hardMessage") : t("ask.resetHead.mixedMessage"),
+      {
+        title: mode === "hard" ? t("ask.resetHead.hardTitle") : t("ask.resetHead.mixedTitle"),
+        kind: "warning",
+        okLabel: t("actions.reset"),
+        cancelLabel: t("actions.cancel"),
+      },
+    );
+    if (!confirmed) return;
+    try {
+      const result = await api.resetTo(repoPath, "HEAD", mode);
+      showToast(result.message, "success");
+      appendResultLog("success", result.message, result.backendUsed);
+      await refreshAll();
+    } catch (e) {
+      showToast(String(e), "error");
+      appendResultLog("error", t("log.resetFailed", { message: String(e) }), "unknown");
+    }
+  }, [repoPath, refreshAll, showToast, t]);
+
   const handleMergeConfirm = useCallback(async (strategy: MergeStrategy) => {
     if (!repoPath || !mergePendingBranch) return;
     setMergePendingBranch(null);
@@ -2153,6 +2177,7 @@ export function ProjectView({
           pushDisabled={remoteActionState.disabled}
           pushTitle={remoteActionTitle}
           onStash={handleStash}
+          onReset={handleResetHead}
           onImportPatch={handleImportPatch}
           onExportPatch={handleExportPatch}
           selectedPatchExportEnabled={selectedPatchFiles.length > 0}

src/components/Titlebar.test.tsx

@@ -40,6 +40,7 @@ function renderTitlebar(
     onImportPatch?: () => void;
     onExportPatch?: (scope: "staged" | "unstaged" | "all" | "selected") => void;
     selectedPatchExportEnabled?: boolean;
+    onReset?: (mode: "mixed" | "hard") => void;
   } = {},
 ) {
   const onImportPatch = patchHandlers.onImportPatch ?? vi.fn();
@@ -70,6 +71,7 @@ function renderTitlebar(
       onPush={vi.fn()}
       pushLabel={pushLabel}
       onStash={vi.fn()}
+      onReset={patchHandlers.onReset ?? vi.fn()}
       onImportPatch={onImportPatch}
       onExportPatch={onExportPatch}
       selectedPatchExportEnabled={patchHandlers.selectedPatchExportEnabled ?? false}
@@ -190,6 +192,46 @@ describe("Titlebar", () => {
     expect(screen.getByText("Export all changes patch...")).toBeInTheDocument();
   });
 
+  it("shows reset actions when a repository is open", () => {
+    renderTitlebar([makeBranch()]);
+
+    fireEvent.click(screen.getByText("More"));
+
+    expect(screen.getByText("Reset")).toBeInTheDocument();
+    expect(screen.getByText("Unstage all changes...")).toBeInTheDocument();
+    expect(screen.getByText("Discard tracked changes...")).toBeInTheDocument();
+  });
+
+  it("calls reset with mixed mode from the more menu", () => {
+    const onReset = vi.fn();
+    renderTitlebar([makeBranch()], "Push", "/repo", vi.fn(), { onReset });
+
+    fireEvent.click(screen.getByText("More"));
+    fireEvent.click(screen.getByText("Unstage all changes..."));
+
+    expect(onReset).toHaveBeenCalledWith("mixed");
+  });
+
+  it("calls reset with hard mode from the more menu", () => {
+    const onReset = vi.fn();
+    renderTitlebar([makeBranch()], "Push", "/repo", vi.fn(), { onReset });
+
+    fireEvent.click(screen.getByText("More"));
+    fireEvent.click(screen.getByText("Discard tracked changes..."));
+
+    expect(onReset).toHaveBeenCalledWith("hard");
+  });
+
+  it("does not show reset actions when no repository is open", () => {
+    renderTitlebar([], "Push", null);
+
+    fireEvent.click(screen.getByText("More"));
+
+    expect(screen.queryByText("Reset")).not.toBeInTheDocument();
+    expect(screen.queryByText("Unstage all changes...")).not.toBeInTheDocument();
+    expect(screen.queryByText("Discard tracked changes...")).not.toBeInTheDocument();
+  });
+
   it("disables selected patch export until files are checked", () => {
     renderTitlebar([makeBranch()]);
 

src/components/Titlebar.tsx

@@ -6,6 +6,7 @@ import {
   MoreIcon,
 } from "./icons";
 import * as api from "../api/commands";
+import type { ResetMode } from "../api/commands";
 import type { PlatformType } from "../hooks/usePlatform";
 import type { BranchInfo, RepoOpenLocation, RepoOpenLocationKind } from "../types";
 import "./Titlebar.css";
@@ -38,6 +39,7 @@ type TitlebarProps = {
   pushDisabled?: boolean;
   pushTitle?: string;
   onStash: () => void;
+  onReset: (mode: Extract<ResetMode, "mixed" | "hard">) => void;
   onImportPatch: () => void;
   onExportPatch: (scope: "staged" | "unstaged" | "all" | "selected") => void;
   selectedPatchExportEnabled: boolean;
@@ -63,7 +65,7 @@ export function Titlebar({
   identityInitials, identityAvatarUrl, recentRepos, searchQuery, searchInputRef,
   onSearchChange, onAboutClick, onSettingsClick, onIdentityClick, onCloneClick, onInitRepoClick, onOpenExistingClick,
   onRepoSelect, onOpenRepoLocation, onFetch, onPull, onPush, pushLabel, pushDisabled = false, pushTitle, onStash,
-  onImportPatch, onExportPatch, selectedPatchExportEnabled,
+  onReset, onImportPatch, onExportPatch, selectedPatchExportEnabled,
   identityOpen, remoteOp,
 }: TitlebarProps) {
   const { t } = useTranslation("titlebar");
@@ -159,6 +161,7 @@ export function Titlebar({
         <ActionBtn icon={<StashIcon size={18} className="titlebar__toolbar-icon" />} label={t("actions.stash")} onClick={onStash} disabled={!repoPath} />
         <MoreDropdown
           repoPath={repoPath}
+          onReset={onReset}
           onImportPatch={onImportPatch}
           onExportPatch={onExportPatch}
           selectedPatchExportEnabled={selectedPatchExportEnabled}
@@ -231,8 +234,9 @@ export function Titlebar({
   );
 }
 
-function MoreDropdown({ repoPath, onImportPatch, onExportPatch, selectedPatchExportEnabled }: {
+function MoreDropdown({ repoPath, onReset, onImportPatch, onExportPatch, selectedPatchExportEnabled }: {
   repoPath: string | null;
+  onReset: (mode: Extract<ResetMode, "mixed" | "hard">) => void;
   onImportPatch: () => void;
   onExportPatch: (scope: "staged" | "unstaged" | "all" | "selected") => void;
   selectedPatchExportEnabled: boolean;
@@ -304,6 +308,13 @@ function MoreDropdown({ repoPath, onImportPatch, onExportPatch, selectedPatchExp
               </div>
             </div>
           </div>
+          <div className="titlebar__open-menu-heading">{t("reset.heading")}</div>
+          <div className="titlebar__open-menu-item" onClick={() => run(() => onReset("mixed"))}>
+            <span>{t("reset.mixed")}</span>
+          </div>
+          <div className="titlebar__open-menu-item" onClick={() => run(() => onReset("hard"))}>
+            <span>{t("reset.hard")}</span>
+          </div>
         </div>
       )}
     </div>

src/i18n/locales/en/projectView.json

@@ -80,6 +80,12 @@
       "softMode": "Soft",
       "title": "{{mode}} Reset"
     },
+    "resetHead": {
+      "hardMessage": "Discard all tracked working tree changes and staged changes? Untracked files will be kept. This cannot be undone from Gitmun.",
+      "hardTitle": "Discard Tracked Changes",
+      "mixedMessage": "Unstage all staged changes? Working tree files will be kept.",
+      "mixedTitle": "Unstage All Changes"
+    },
     "startRebase": {
       "message": "Rebase \"{{branch}}\" onto \"{{onto}}\"?",
       "title": "Start Rebase"

src/i18n/locales/en/titlebar.json

@@ -32,5 +32,10 @@
     "exportUnstaged": "Export unstaged patch...",
     "heading": "Patch files",
     "import": "Import patch..."
+  },
+  "reset": {
+    "hard": "Discard tracked changes...",
+    "heading": "Reset",
+    "mixed": "Unstage all changes..."
   }
 }