feat(ui): add discard dialog for file changes

Author: jenslys

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stage-tui",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": false,
   "description": "Minimalist TUI Git client",
   "homepage": "https://github.com/jenslys/stage",

src/app.tsx

@@ -6,6 +6,7 @@ import { CommitHistoryDialog } from "./ui/components/commit-history-dialog"
 import { useGitTuiController } from "./hooks/use-git-tui-controller"
 import { CommitDialog } from "./ui/components/commit-dialog"
 import { DiffWorkspace } from "./ui/components/diff-workspace"
+import { DiscardDialog } from "./ui/components/discard-dialog"
 import { FooterBar } from "./ui/components/footer-bar"
 import { MergeConflictDialog } from "./ui/components/merge-conflict-dialog"
 import { ShortcutsDialog } from "./ui/components/shortcuts-dialog"
@@ -24,6 +25,7 @@ type ActiveScreen =
   | "history"
   | "shortcuts"
   | "sync"
+  | "discard"
   | "merge-conflict"
 
 export function App({ config }: AppProps) {
@@ -33,17 +35,19 @@ export function App({ config }: AppProps) {
   const controller = useGitTuiController(renderer, config)
   const activeScreen: ActiveScreen = controller.mergeConflictDialogOpen
     ? "merge-conflict"
-    : controller.syncDialogOpen
-      ? "sync"
-      : controller.branchDialogOpen
-        ? "branch"
-        : controller.commitDialogOpen
-          ? "commit"
-          : controller.historyDialogOpen
-            ? "history"
-            : controller.shortcutsDialogOpen
-              ? "shortcuts"
-              : "main"
+    : controller.discardDialogOpen
+      ? "discard"
+      : controller.syncDialogOpen
+        ? "sync"
+        : controller.branchDialogOpen
+          ? "branch"
+          : controller.commitDialogOpen
+            ? "commit"
+            : controller.historyDialogOpen
+              ? "history"
+              : controller.shortcutsDialogOpen
+                ? "shortcuts"
+                : "main"
   const footerHint = resolveFooterHint({
     activeScreen,
     branchDialogMode: controller.branchDialogMode,
@@ -252,6 +256,29 @@ export function App({ config }: AppProps) {
         />
       ) : null}
 
+      {activeScreen === "discard" ? (
+        <DiscardDialog
+          open={true}
+          focus={controller.focus}
+          terminalWidth={terminalWidth}
+          terminalHeight={terminalHeight}
+          path={controller.discardPath ?? ""}
+          options={controller.discardOptions}
+          optionIndex={controller.discardOptionIndex}
+          onOptionClick={(index) => {
+            controller.setDiscardSelection(index)
+          }}
+          onOptionScroll={(direction) => {
+            if (direction === "up") {
+              controller.moveDiscardSelectionUp()
+            } else {
+              controller.moveDiscardSelectionDown()
+            }
+          }}
+          theme={theme}
+        />
+      ) : null}
+
       {activeScreen === "merge-conflict" ? (
         <MergeConflictDialog
           open={true}
@@ -314,6 +341,7 @@ function resolveFooterHint({
   if (activeScreen === "commit") return "enter commit  esc cancel"
   if (activeScreen === "shortcuts") return "esc close"
   if (activeScreen === "sync") return "enter choose  esc back"
+  if (activeScreen === "discard") return "enter choose  esc back"
   if (activeScreen === "merge-conflict") return "enter open or finish  tab next panel  esc back"
   if (activeScreen === "history") {
     if (historyMode === "action") return "enter choose  esc back"

src/git/client.ts

@@ -23,6 +23,7 @@ import {
   commitChanges,
   completeMergeCommit,
   createAndCheckoutBranch,
+  discardFileChanges,
   deleteLocalBranch,
   deleteRemoteBranch,
   fetchRepo,
@@ -130,6 +131,10 @@ export class GitClient {
     await markConflictResolved(path, this.runGit)
   }
 
+  async discardFileChanges(path: string): Promise<void> {
+    await discardFileChanges(path, this.runGit)
+  }
+
   async workingTreeFileHasConflictMarkers(path: string): Promise<boolean> {
     const normalizedPath = path.trim()
     if (!normalizedPath) {

src/git/write-ops.ts

@@ -69,6 +69,25 @@ export async function markConflictResolved(path: string, runGit: RunGit): Promis
   await runGit(["add", "--", normalizedPath])
 }
 
+export async function discardFileChanges(path: string, runGit: RunGit): Promise<void> {
+  const normalizedPath = path.trim()
+  if (!normalizedPath) {
+    throw new Error("File path is required.")
+  }
+
+  const trackedCheck = await runGit(["ls-files", "--error-unmatch", "--", normalizedPath], {
+    expectedCodes: [0, 1, 128],
+  })
+  const isTracked = trackedCheck.code === 0
+
+  if (isTracked) {
+    await runGit(["restore", "--staged", "--worktree", "--", normalizedPath])
+    return
+  }
+
+  await runGit(["clean", "-f", "--", normalizedPath])
+}
+
 export async function completeMergeCommit(runGit: RunGit): Promise<void> {
   const mergeInProgress = await isMergeInProgress(runGit)
   if (!mergeInProgress) {

src/hooks/git-tui-keyboard/handle-dialog-keys.ts

@@ -21,6 +21,7 @@ export function handleDialogKeys({
     renderer,
     commitDialogOpen,
     syncDialogOpen,
+    discardDialogOpen,
     mergeConflictDialogOpen,
     branchDialogOpen,
     branchDialogMode,
@@ -29,13 +30,15 @@ export function handleDialogKeys({
     shortcutsDialogOpen,
     closeShortcutsDialog,
     closeSyncDialog,
+    closeDiscardDialog,
     closeMergeConflictDialog,
     openShortcutsDialog,
     focus,
     mergeConflictFileCount,
     setFocus,
     submitHistoryAction,
     submitSyncAction,
+    submitDiscardAction,
     submitMergeConflictAction,
     openSelectedMergeConflictFileInEditor,
     submitHistoryCommitSelection,
@@ -59,6 +62,8 @@ export function handleDialogKeys({
     moveSyncSelectionDown,
     moveMergeConflictFileUp,
     moveMergeConflictFileDown,
+    moveDiscardSelectionUp,
+    moveDiscardSelectionDown,
     moveMergeConflictActionUp,
     moveMergeConflictActionDown,
     commitChanges,
@@ -82,6 +87,7 @@ export function handleDialogKeys({
   if (
     !commitDialogOpen &&
     !syncDialogOpen &&
+    !discardDialogOpen &&
     !mergeConflictDialogOpen &&
     !branchDialogOpen &&
     !historyDialogOpen &&
@@ -127,6 +133,27 @@ export function handleDialogKeys({
     return true
   }
 
+  if (discardDialogOpen && flags.isEnter) {
+    key.preventDefault()
+    key.stopPropagation()
+    void submitDiscardAction()
+    return true
+  }
+
+  if (discardDialogOpen && focus === "discard-dialog-list" && key.name === "up") {
+    key.preventDefault()
+    key.stopPropagation()
+    moveDiscardSelectionUp()
+    return true
+  }
+
+  if (discardDialogOpen && focus === "discard-dialog-list" && key.name === "down") {
+    key.preventDefault()
+    key.stopPropagation()
+    moveDiscardSelectionDown()
+    return true
+  }
+
   if (mergeConflictDialogOpen && flags.isEnter && focus === "merge-conflict-files") {
     key.preventDefault()
     key.stopPropagation()
@@ -310,6 +337,11 @@ export function handleDialogKeys({
       return true
     }
 
+    if (discardDialogOpen) {
+      closeDiscardDialog()
+      return true
+    }
+
     if (historyDialogOpen) {
       if (historyDialogMode === "action") {
         backToHistoryCommitList()
@@ -353,6 +385,11 @@ export function handleDialogKeys({
       return true
     }
 
+    if (discardDialogOpen) {
+      setFocus("discard-dialog-list")
+      return true
+    }
+
     if (branchDialogOpen) {
       setFocus(branchDialogMode === "create" ? "branch-create" : "branch-dialog-list")
       return true

src/hooks/git-tui-keyboard/handle-main-keys.ts

@@ -23,6 +23,7 @@ export function handleMainKeys({
     moveToPreviousFile,
     moveToNextFile,
     openCommitDialog,
+    openDiscardDialog,
     openSelectedFileInEditor,
     openBranchDialog,
     openHistoryDialog,
@@ -102,6 +103,19 @@ export function handleMainKeys({
     return true
   }
 
+  if (
+    !isDialogOpen &&
+    flags.isPlainShortcutKey &&
+    focus === "files" &&
+    fileCount > 0 &&
+    (key.name === "delete" || key.name === "backspace")
+  ) {
+    key.preventDefault()
+    key.stopPropagation()
+    openDiscardDialog()
+    return true
+  }
+
   if (!isDialogOpen && key.ctrl && key.name === "r") {
     key.preventDefault()
     key.stopPropagation()

src/hooks/git-tui-keyboard/key-flags.ts

@@ -13,6 +13,7 @@ export function resolveKeyboardFlags(
   dialogs: {
     commitDialogOpen: boolean
     syncDialogOpen: boolean
+    discardDialogOpen: boolean
     mergeConflictDialogOpen: boolean
     branchDialogOpen: boolean
     historyDialogOpen: boolean
@@ -32,6 +33,7 @@ export function resolveKeyboardFlags(
   const isDialogOpen =
     dialogs.commitDialogOpen ||
     dialogs.syncDialogOpen ||
+    dialogs.discardDialogOpen ||
     dialogs.mergeConflictDialogOpen ||
     dialogs.branchDialogOpen ||
     dialogs.historyDialogOpen ||

src/hooks/git-tui-keyboard/types.ts

@@ -12,6 +12,7 @@ export type UseGitTuiKeyboardParams = {
   renderer: RendererClipboard
   commitDialogOpen: boolean
   syncDialogOpen: boolean
+  discardDialogOpen: boolean
   mergeConflictDialogOpen: boolean
   branchDialogOpen: boolean
   branchDialogMode: BranchDialogMode
@@ -28,6 +29,7 @@ export type UseGitTuiKeyboardParams = {
   openBranchDialog: () => void
   closeBranchDialog: () => void
   closeSyncDialog: () => void
+  closeDiscardDialog: () => void
   closeMergeConflictDialog: () => void
   showBranchDialogList: () => void
   submitBranchSelection: () => Promise<void>
@@ -47,6 +49,7 @@ export type UseGitTuiKeyboardParams = {
   submitHistoryCommitSelection: () => Promise<void>
   submitHistoryAction: () => Promise<void>
   submitSyncAction: () => Promise<void>
+  submitDiscardAction: () => Promise<void>
   submitMergeConflictAction: () => Promise<void>
   openSelectedMergeConflictFileInEditor: () => Promise<void>
   moveCommitSelectionUp: () => void
@@ -57,11 +60,14 @@ export type UseGitTuiKeyboardParams = {
   moveHistoryActionDown: () => void
   moveMergeConflictFileUp: () => void
   moveMergeConflictFileDown: () => void
+  moveDiscardSelectionUp: () => void
+  moveDiscardSelectionDown: () => void
   moveMergeConflictActionUp: () => void
   moveMergeConflictActionDown: () => void
   commitChanges: () => Promise<void>
   createBranchAndCheckout: () => Promise<void>
   openCommitDialog: () => void
+  openDiscardDialog: () => void
   openSelectedFileInEditor: () => Promise<void>
   openShortcutsDialog: () => void
   closeShortcutsDialog: () => void