feat: add git stash management

Add a Stashes dialog with create, apply, pop, and drop actions Include untracked files automatically when stashing Show file counts for current changes and stash entries
2026-05-05 23:39:20 +03:00
parent c80c2b62a8
commit 93267927ff
19 changed files with 754 additions and 109 deletions
@@ -54,6 +54,7 @@ import { getSessionWorktreeRepairActions, getMutationBlockingReasons } from '@/s
 import { IntegrateCommitsSection } from './git/IntegrateCommitsSection';

 import { GitHeader } from './git/GitHeader';
+import { StashesDialog } from './git/StashesDialog';
 import { ChangesSection } from './git/ChangesSection';
 import { CommitSection } from './git/CommitSection';
 import { GitEmptyState } from './git/GitEmptyState';
@@ -429,6 +430,7 @@ export const GitView: React.FC = () => {
  const [isGitmojiPickerOpen, setIsGitmojiPickerOpen] = React.useState(false);
  const actionPanelScrollRef = React.useRef<HTMLElement | null>(null);
  const [syncAction, setSyncAction] = React.useState<SyncAction>(null);
+  const [isStashesDialogOpen, setIsStashesDialogOpen] = React.useState(false);
  const [commitAction, setCommitAction] = React.useState<CommitAction>(null);
  const [logMaxCountLocal, setLogMaxCountLocal] = React.useState<number>(25);
  const [isSettingIdentity, setIsSettingIdentity] = React.useState(false);
@@ -2069,6 +2071,7 @@ export const GitView: React.FC = () => {
        isApplyingIdentity={isSettingIdentity}
        isWorktreeMode={!!worktreeMetadata}
        onOpenHistory={() => setIsHistoryDialogOpen(true)}
+        onOpenStashes={() => setIsStashesDialogOpen(true)}
      />

      {/* In-progress operation banner */}
@@ -2274,6 +2277,18 @@ export const GitView: React.FC = () => {
        </DialogContent>
      </Dialog>

+      <StashesDialog
+        open={isStashesDialogOpen}
+        onOpenChange={setIsStashesDialogOpen}
+        directory={currentDirectory}
+        hasUncommittedChanges={(status?.files?.length ?? 0) > 0}
+        uncommittedFileCount={status?.files?.length ?? 0}
+        onChanged={async () => {
+          await refreshStatusAndBranches(false);
+          await refreshLog();
+        }}
+      />
+
      <Dialog open={isGitmojiPickerOpen} onOpenChange={setIsGitmojiPickerOpen}>
        <DialogContent className="max-w-md p-0 overflow-hidden">
          <DialogHeader className="px-4 pt-4">
@@ -10,6 +10,7 @@ import {
  RiCodeLine,
  RiHeartLine,
  RiHistoryLine,
+  RiArchiveStackLine,
  RiUser3Line,
 } from '@remixicon/react';
 import { Button } from '@/components/ui/button';
@@ -48,6 +49,7 @@ interface GitHeaderProps {
  isApplyingIdentity: boolean;
  isWorktreeMode: boolean;
  onOpenHistory?: () => void;
+  onOpenStashes?: () => void;
 }

 const IDENTITY_ICON_MAP: Record<
@@ -206,6 +208,7 @@ export const GitHeader: React.FC<GitHeaderProps> = ({
  isApplyingIdentity,
  isWorktreeMode,
  onOpenHistory,
+  onOpenStashes,
 }) => {
  const { t } = useI18n();
  if (!status) {
@@ -229,6 +232,16 @@ export const GitHeader: React.FC<GitHeaderProps> = ({
          <TooltipContent sideOffset={8}>{t('gitView.history.title')}</TooltipContent>
        </Tooltip>
      ) : null}
+      {onOpenStashes ? (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button variant="ghost" size="sm" className="h-8 w-8 px-0" onClick={onOpenStashes}>
+              <RiArchiveStackLine className="size-4" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent sideOffset={8}>{t('gitView.stashes.title')}</TooltipContent>
+        </Tooltip>
+      ) : null}
    </div>
  );

@@ -0,0 +1,196 @@
+import React from 'react';
+import { RiArchiveStackLine, RiDeleteBinLine, RiInboxArchiveLine, RiInboxUnarchiveFill, RiInboxUnarchiveLine, RiLoader4Line, RiSearchLine } from '@remixicon/react';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
+import { toast } from '@/components/ui';
+import { useI18n } from '@/lib/i18n';
+import { cn } from '@/lib/utils';
+import type { GitStashEntry } from '@/lib/api/types';
+import { applyGitStash, countGitStashFiles, dropGitStash, listGitStashes, popGitStash, stashGitChanges } from '@/lib/gitApi';
+
+interface StashesDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  directory: string | null;
+  hasUncommittedChanges: boolean;
+  uncommittedFileCount: number;
+  onChanged?: () => void | Promise<void>;
+}
+
+type StashOperation = 'create' | `apply:${string}` | `pop:${string}` | `drop:${string}` | null;
+
+export const StashesDialog: React.FC<StashesDialogProps> = ({
+  open,
+  onOpenChange,
+  directory,
+  hasUncommittedChanges,
+  uncommittedFileCount,
+  onChanged,
+}) => {
+  const { t } = useI18n();
+  const [stashes, setStashes] = React.useState<GitStashEntry[]>([]);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [query, setQuery] = React.useState('');
+  const [message, setMessage] = React.useState('');
+  const [operation, setOperation] = React.useState<StashOperation>(null);
+  const [fileCounts, setFileCounts] = React.useState<Record<string, number>>({});
+
+  const load = React.useCallback(async () => {
+    if (!directory) return;
+    setIsLoading(true);
+    try {
+      const result = await listGitStashes(directory);
+      setStashes(result.stashes);
+      setFileCounts({});
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : t('gitView.stashes.toast.loadFailed'));
+    } finally {
+      setIsLoading(false);
+    }
+  }, [directory, t]);
+
+  React.useEffect(() => {
+    if (open) void load();
+  }, [load, open]);
+
+  React.useEffect(() => {
+    if (!open || !directory || stashes.length === 0) return;
+    let cancelled = false;
+    const refs = stashes.map((stash) => stash.ref);
+    void countGitStashFiles(directory, refs).then((result) => {
+      if (!cancelled) setFileCounts(result.counts);
+    }).catch(() => undefined);
+    return () => {
+      cancelled = true;
+    };
+  }, [directory, open, stashes]);
+
+  const filtered = React.useMemo(() => {
+    const normalized = query.trim().toLowerCase();
+    if (!normalized) return stashes;
+    return stashes.filter((stash) => `${stash.ref} ${stash.message} ${stash.relativeTime}`.toLowerCase().includes(normalized));
+  }, [query, stashes]);
+
+  const refreshAfterChange = React.useCallback(async () => {
+    await load();
+    await onChanged?.();
+  }, [load, onChanged]);
+
+  const handleCreate = async () => {
+    if (!directory || operation) return;
+    setOperation('create');
+    try {
+      const result = await stashGitChanges(directory, { message: message.trim() || undefined });
+      if (result.created) {
+        toast.success(t('gitView.stashes.toast.created'));
+        setMessage('');
+      } else {
+        toast.info(t('gitView.stashes.toast.noChanges'));
+      }
+      await refreshAfterChange();
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : t('gitView.stashes.toast.createFailed'));
+    } finally {
+      setOperation(null);
+    }
+  };
+
+  const runStashAction = async (stash: GitStashEntry, kind: 'apply' | 'pop' | 'drop') => {
+    if (!directory || operation) return;
+    if (kind === 'drop' && !window.confirm(t('gitView.stashes.confirm.drop', { ref: stash.ref }))) return;
+    setOperation(`${kind}:${stash.ref}`);
+    try {
+      if (kind === 'apply') await applyGitStash(directory, { ref: stash.ref });
+      if (kind === 'pop') await popGitStash(directory, { ref: stash.ref });
+      if (kind === 'drop') await dropGitStash(directory, { ref: stash.ref });
+      const successKey = kind === 'apply' ? 'gitView.stashes.toast.applySuccess' : kind === 'pop' ? 'gitView.stashes.toast.popSuccess' : 'gitView.stashes.toast.dropSuccess';
+      toast.success(t(successKey));
+      await refreshAfterChange();
+    } catch (error) {
+      const failedKey = kind === 'apply' ? 'gitView.stashes.toast.applyFailed' : kind === 'pop' ? 'gitView.stashes.toast.popFailed' : 'gitView.stashes.toast.dropFailed';
+      toast.error(error instanceof Error ? error.message : t(failedKey));
+      await refreshAfterChange();
+    } finally {
+      setOperation(null);
+    }
+  };
+
+  const isOperating = operation !== null;
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-2xl max-h-[70vh] flex flex-col">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2">
+            <RiArchiveStackLine className="h-5 w-5" />
+            {t('gitView.stashes.title')}
+          </DialogTitle>
+          <DialogDescription>{t('gitView.stashes.description')}</DialogDescription>
+        </DialogHeader>
+
+        <div className="mt-2 rounded-lg border border-border/60 bg-[var(--surface-elevated)] p-3">
+          <div className="flex flex-col gap-2 sm:flex-row">
+            <Input
+              value={message}
+              onChange={(event) => setMessage(event.target.value)}
+              placeholder={t('gitView.stashes.messagePlaceholder')}
+              disabled={isOperating || !hasUncommittedChanges}
+              className="flex-1"
+            />
+            <Button onClick={handleCreate} disabled={!hasUncommittedChanges || isOperating || !directory}>
+              {operation === 'create' ? <RiLoader4Line className="size-4 animate-spin" /> : <RiInboxArchiveLine className="size-4" />}
+              {t('gitView.stashes.actions.stashCurrentWithCount', { count: uncommittedFileCount })}
+            </Button>
+          </div>
+          <p className="typography-meta mt-2 text-muted-foreground">{t('gitView.stashes.includeUntrackedHint')}</p>
+        </div>
+
+        <div className="relative mt-2">
+          <RiSearchLine className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+          <Input value={query} onChange={(event) => setQuery(event.target.value)} placeholder={t('gitView.stashes.searchPlaceholder')} className="pl-9" />
+        </div>
+
+        <div className="flex-1 overflow-y-auto">
+          {isLoading ? (
+            <div className="flex items-center justify-center py-10 text-muted-foreground"><RiLoader4Line className="size-5 animate-spin" /></div>
+          ) : filtered.length === 0 ? (
+            <div className="py-8 text-center text-muted-foreground">{query ? t('gitView.stashes.empty.search') : t('gitView.stashes.empty.list')}</div>
+          ) : filtered.map((stash, index) => (
+            <div key={stash.ref} className="group flex items-center gap-2 rounded py-1.5 transition-colors hover:bg-interactive-hover/30">
+              <div className="min-w-0 flex-1 pl-2">
+                <p className="typography-small truncate text-foreground">{stash.message || t('gitView.stashes.untitled')}</p>
+                <p className="typography-meta truncate text-muted-foreground">
+                  <Tooltip>
+                    <TooltipTrigger asChild>
+                      <span>{index === 0 && !query.trim() ? t('gitView.stashes.latestLabel') : t('gitView.stashes.itemNumber', { number: index + 1 })}</span>
+                    </TooltipTrigger>
+                    <TooltipContent sideOffset={6}>{stash.ref}</TooltipContent>
+                  </Tooltip>
+                  {' · '}{stash.relativeTime} · {typeof fileCounts[stash.ref] === 'number' ? t('gitView.stashes.fileCount', { count: fileCounts[stash.ref] }) : t('gitView.stashes.fileCountLoading')}
+                </p>
+              </div>
+              <div className="mr-2 flex shrink-0 items-center gap-1 opacity-100 sm:opacity-0 sm:group-hover:opacity-100">
+                <StashIconButton label={t('gitView.stashes.actions.apply')} loading={operation === `apply:${stash.ref}`} onClick={() => runStashAction(stash, 'apply')} disabled={isOperating}><RiInboxUnarchiveLine className="size-4" /></StashIconButton>
+                <StashIconButton label={t('gitView.stashes.actions.pop')} loading={operation === `pop:${stash.ref}`} onClick={() => runStashAction(stash, 'pop')} disabled={isOperating}><RiInboxUnarchiveFill className="size-4" /></StashIconButton>
+                <StashIconButton label={t('gitView.stashes.actions.drop')} loading={operation === `drop:${stash.ref}`} onClick={() => runStashAction(stash, 'drop')} disabled={isOperating} destructive><RiDeleteBinLine className="size-4" /></StashIconButton>
+              </div>
+            </div>
+          ))}
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+const StashIconButton: React.FC<{ label: string; loading: boolean; disabled: boolean; destructive?: boolean; onClick: () => void; children: React.ReactNode }> = ({ label, loading, disabled, destructive, onClick, children }) => (
+  <Tooltip>
+    <TooltipTrigger asChild>
+      <button type="button" className={cn('flex h-6 w-6 items-center justify-center transition-colors disabled:opacity-50', destructive ? 'text-[var(--status-error)] hover:text-[var(--status-error)]' : 'text-muted-foreground hover:text-foreground')} onClick={onClick} disabled={disabled}>
+        {loading ? <RiLoader4Line className="size-4 animate-spin" /> : children}
+      </button>
+    </TooltipTrigger>
+    <TooltipContent sideOffset={6}>{label}</TooltipContent>
+  </Tooltip>
+);
@@ -209,6 +209,13 @@ export interface GitPullOptions {
  rebase?: boolean;
 }

+export interface GitStashEntry {
+  ref: string;
+  message: string;
+  relativeTime: string;
+  hash: string;
+}
+
 export interface GitRemote {
  name: string;
  fetchUrl: string;
@@ -429,6 +436,12 @@ export interface GitAPI {
  gitPush(directory: string, options?: { remote?: string; branch?: string; options?: string[] | Record<string, unknown> }): Promise<GitPushResult>;
  gitPull(directory: string, options?: GitPullOptions): Promise<GitPullResult>;
  gitFetch(directory: string, options?: { remote?: string; branch?: string }): Promise<{ success: boolean }>;
+  listGitStashes(directory: string): Promise<{ stashes: GitStashEntry[] }>;
+  countGitStashFiles(directory: string, refs: string[]): Promise<{ counts: Record<string, number> }>;
+  stashGitChanges(directory: string, options?: { message?: string }): Promise<{ success: boolean; created: boolean; message: string; output: string }>;
+  applyGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }>;
+  popGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }>;
+  dropGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }>;
  checkoutBranch(directory: string, branch: string): Promise<{ success: boolean; branch: string }>;
  createBranch(directory: string, name: string, startPoint?: string): Promise<{ success: boolean; branch: string }>;
  renameBranch(directory: string, oldName: string, newName: string): Promise<{ success: boolean; branch: string }>;
@@ -546,6 +546,42 @@ export async function gitFetch(
  return gitHttp.gitFetch(directory, options);
 }

+export async function listGitStashes(directory: string): Promise<{ stashes: import('./api/types').GitStashEntry[] }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.listGitStashes(directory);
+  return gitHttp.listGitStashes(directory);
+}
+
+export async function countGitStashFiles(directory: string, refs: string[]): Promise<{ counts: Record<string, number> }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.countGitStashFiles(directory, refs);
+  return gitHttp.countGitStashFiles(directory, refs);
+}
+
+export async function stashGitChanges(directory: string, options: { message?: string } = {}): Promise<{ success: boolean; created: boolean; message: string; output: string }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.stashGitChanges(directory, options);
+  return gitHttp.stashGitChanges(directory, options);
+}
+
+export async function applyGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.applyGitStash(directory, options);
+  return gitHttp.applyGitStash(directory, options);
+}
+
+export async function popGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.popGitStash(directory, options);
+  return gitHttp.popGitStash(directory, options);
+}
+
+export async function dropGitStash(directory: string, options: { ref: string }): Promise<{ success: boolean; ref: string }> {
+  const runtime = getRuntimeGit();
+  if (runtime) return runtime.dropGitStash(directory, options);
+  return gitHttp.dropGitStash(directory, options);
+}
+
 export async function checkoutBranch(directory: string, branch: string): Promise<{ success: boolean; branch: string }> {
  const runtime = getRuntimeGit();
  if (runtime) return runtime.checkoutBranch(directory, branch);
@@ -21,6 +21,7 @@ import type {
  GitPushResult,
  GitPullResult,
  GitPullOptions,
+  GitStashEntry,
  GitLogOptions,
  GitLogResponse,
  GitCommitFilesResponse,
@@ -549,6 +550,58 @@ export async function gitFetch(
  return response.json();
 }

+export async function listGitStashes(directory: string): Promise<{ stashes: GitStashEntry[] }> {
+  const response = await fetch(buildUrl(`${API_BASE}/stashes`, directory));
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(error.error || 'Failed to list stashes');
+  }
+  return response.json();
+}
+
+export async function countGitStashFiles(directory: string, refs: string[]): Promise<{ counts: Record<string, number> }> {
+  const response = await fetch(buildUrl(`${API_BASE}/stashes/file-counts`, directory), {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ refs }),
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(error.error || 'Failed to count stash files');
+  }
+  return response.json();
+}
+
+export async function stashGitChanges(directory: string, options: { message?: string } = {}): Promise<{ success: boolean; created: boolean; message: string; output: string }> {
+  const response = await fetch(buildUrl(`${API_BASE}/stash`, directory), {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(options),
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(error.error || 'Failed to stash changes');
+  }
+  return response.json();
+}
+
+const postStashRef = async (directory: string, path: string, options: { ref: string }): Promise<{ success: boolean; ref: string }> => {
+  const response = await fetch(buildUrl(`${API_BASE}/${path}`, directory), {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(options),
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({ error: response.statusText }));
+    throw new Error(error.error || `Failed to ${path}`);
+  }
+  return response.json();
+};
+
+export const applyGitStash = (directory: string, options: { ref: string }) => postStashRef(directory, 'stash/apply', options);
+export const popGitStash = (directory: string, options: { ref: string }) => postStashRef(directory, 'stash/pop', options);
+export const dropGitStash = (directory: string, options: { ref: string }) => postStashRef(directory, 'stash/drop', options);
+
 export async function checkoutBranch(directory: string, branch: string): Promise<{ success: boolean; branch: string }> {
  const response = await fetch(buildUrl(`${API_BASE}/checkout`, directory), {
    method: 'POST',
@@ -842,27 +895,13 @@ export async function stash(
  directory: string,
  options?: { message?: string; includeUntracked?: boolean }
 ): Promise<{ success: boolean }> {
-  const response = await fetch(buildUrl(`${API_BASE}/stash`, directory), {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(options || {}),
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: response.statusText }));
-    throw new Error(error.error || 'Failed to stash');
-  }
-  return response.json();
+  await stashGitChanges(directory, { message: options?.message });
+  return { success: true };
 }

 export async function stashPop(directory: string): Promise<{ success: boolean }> {
-  const response = await fetch(buildUrl(`${API_BASE}/stash/pop`, directory), {
-    method: 'POST',
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: response.statusText }));
-    throw new Error(error.error || 'Failed to pop stash');
-  }
-  return response.json();
+  await popGitStash(directory, { ref: 'stash@{0}' });
+  return { success: true };
 }

 export async function getConflictDetails(directory: string): Promise<MergeConflictDetails> {
@@ -517,6 +517,34 @@ export const dict = {
  'gitView.stash.stepStash': 'Stash your uncommitted changes',
  'gitView.stash.thisWill': 'This will:',
  'gitView.stash.title': 'Uncommitted Changes',
+  'gitView.stashes.actions.apply': 'Apply',
+  'gitView.stashes.actions.drop': 'Drop',
+  'gitView.stashes.actions.pop': 'Pop',
+  'gitView.stashes.actions.stashCurrent': 'Stash current changes',
+  'gitView.stashes.actions.stashCurrentWithCount': 'Stash {count} files',
+  'gitView.stashes.confirm.drop': 'Drop {ref}?',
+  'gitView.stashes.description': 'Save, restore, and clean up Git stashes for this repository.',
+  'gitView.stashes.empty.list': 'No stashes yet.',
+  'gitView.stashes.empty.search': 'No matching stashes.',
+  'gitView.stashes.includeUntrackedHint': 'Untracked files are included automatically.',
+  'gitView.stashes.fileCount': '{count} files',
+  'gitView.stashes.fileCountLoading': 'counting files...',
+  'gitView.stashes.itemNumber': '#{number}',
+  'gitView.stashes.latestLabel': 'Latest',
+  'gitView.stashes.messagePlaceholder': 'Stash name',
+  'gitView.stashes.searchPlaceholder': 'Search stashes',
+  'gitView.stashes.title': 'Stashes',
+  'gitView.stashes.toast.applyFailed': 'Failed to apply stash',
+  'gitView.stashes.toast.applySuccess': 'Stash applied',
+  'gitView.stashes.toast.createFailed': 'Failed to stash changes',
+  'gitView.stashes.toast.created': 'Changes stashed',
+  'gitView.stashes.toast.dropFailed': 'Failed to drop stash',
+  'gitView.stashes.toast.dropSuccess': 'Stash dropped',
+  'gitView.stashes.toast.loadFailed': 'Failed to load stashes',
+  'gitView.stashes.toast.noChanges': 'No local changes to stash',
+  'gitView.stashes.toast.popFailed': 'Failed to pop stash',
+  'gitView.stashes.toast.popSuccess': 'Stash popped',
+  'gitView.stashes.untitled': 'Untitled stash',
  'gitView.sync.fetch': 'Fetch',
  'gitView.sync.fetchFromRemote': 'Fetch from {name}',
  'gitView.sync.fetchTooltip': 'Fetch from remote',
@@ -518,6 +518,34 @@ export const dict: Record<I18nKey, string> = {
  "gitView.stash.stepStash": "Guarda tus cambios sin commit",
  "gitView.stash.thisWill": "Esto hará:",
  "gitView.stash.title": "Cambios sin commit",
+  "gitView.stashes.actions.apply": "Apply",
+  "gitView.stashes.actions.drop": "Drop",
+  "gitView.stashes.actions.pop": "Pop",
+  "gitView.stashes.actions.stashCurrent": "Stash current changes",
+  "gitView.stashes.actions.stashCurrentWithCount": "Stash {count} files",
+  "gitView.stashes.confirm.drop": "Drop {ref}?",
+  "gitView.stashes.description": "Save, restore, and clean up Git stashes for this repository.",
+  "gitView.stashes.empty.list": "No stashes yet.",
+  "gitView.stashes.empty.search": "No matching stashes.",
+  "gitView.stashes.includeUntrackedHint": "Untracked files are included automatically.",
+  "gitView.stashes.fileCount": "{count} files",
+  "gitView.stashes.fileCountLoading": "counting files...",
+  "gitView.stashes.itemNumber": "#{number}",
+  "gitView.stashes.latestLabel": "Latest",
+  "gitView.stashes.messagePlaceholder": "Stash name",
+  "gitView.stashes.searchPlaceholder": "Search stashes",
+  "gitView.stashes.title": "Stashes",
+  "gitView.stashes.toast.applyFailed": "Failed to apply stash",
+  "gitView.stashes.toast.applySuccess": "Stash applied",
+  "gitView.stashes.toast.createFailed": "Failed to stash changes",
+  "gitView.stashes.toast.created": "Changes stashed",
+  "gitView.stashes.toast.dropFailed": "Failed to drop stash",
+  "gitView.stashes.toast.dropSuccess": "Stash dropped",
+  "gitView.stashes.toast.loadFailed": "Failed to load stashes",
+  "gitView.stashes.toast.noChanges": "No local changes to stash",
+  "gitView.stashes.toast.popFailed": "Failed to pop stash",
+  "gitView.stashes.toast.popSuccess": "Stash popped",
+  "gitView.stashes.untitled": "Untitled stash",
  "gitView.sync.fetch": "Fetch",
  "gitView.sync.fetchFromRemote": "Fetch de {name}",
  "gitView.sync.fetchTooltip": "Fetch del remoto",
@@ -518,6 +518,34 @@ export const dict: Record<I18nKey, string> = {
  'gitView.stash.stepStash': '커밋하지 않은 변경 사항 stash',
  'gitView.stash.thisWill': '다음 작업을 수행합니다:',
  'gitView.stash.title': '커밋하지 않은 변경 사항',
+  'gitView.stashes.actions.apply': 'Apply',
+  'gitView.stashes.actions.drop': 'Drop',
+  'gitView.stashes.actions.pop': 'Pop',
+  'gitView.stashes.actions.stashCurrent': 'Stash current changes',
+  'gitView.stashes.actions.stashCurrentWithCount': 'Stash {count} files',
+  'gitView.stashes.confirm.drop': 'Drop {ref}?',
+  'gitView.stashes.description': 'Save, restore, and clean up Git stashes for this repository.',
+  'gitView.stashes.empty.list': 'No stashes yet.',
+  'gitView.stashes.empty.search': 'No matching stashes.',
+  'gitView.stashes.includeUntrackedHint': 'Untracked files are included automatically.',
+  'gitView.stashes.fileCount': '{count} files',
+  'gitView.stashes.fileCountLoading': 'counting files...',
+  'gitView.stashes.itemNumber': '#{number}',
+  'gitView.stashes.latestLabel': 'Latest',
+  'gitView.stashes.messagePlaceholder': 'Stash name',
+  'gitView.stashes.searchPlaceholder': 'Search stashes',
+  'gitView.stashes.title': 'Stashes',
+  'gitView.stashes.toast.applyFailed': 'Failed to apply stash',
+  'gitView.stashes.toast.applySuccess': 'Stash applied',
+  'gitView.stashes.toast.createFailed': 'Failed to stash changes',
+  'gitView.stashes.toast.created': 'Changes stashed',
+  'gitView.stashes.toast.dropFailed': 'Failed to drop stash',
+  'gitView.stashes.toast.dropSuccess': 'Stash dropped',
+  'gitView.stashes.toast.loadFailed': 'Failed to load stashes',
+  'gitView.stashes.toast.noChanges': 'No local changes to stash',
+  'gitView.stashes.toast.popFailed': 'Failed to pop stash',
+  'gitView.stashes.toast.popSuccess': 'Stash popped',
+  'gitView.stashes.untitled': 'Untitled stash',
  'gitView.sync.fetch': '가져오기',
  'gitView.sync.fetchFromRemote': '{name}에서 가져오기',
  'gitView.sync.fetchTooltip': '리모트에서 가져오기',
@@ -518,6 +518,34 @@ export const dict: Record<I18nKey, string> = {
  "gitView.stash.stepStash": "Salva suas alterações sem commit",
  "gitView.stash.thisWill": "Isso fará:",
  "gitView.stash.title": "Alterações sem commit",
+  "gitView.stashes.actions.apply": "Apply",
+  "gitView.stashes.actions.drop": "Drop",
+  "gitView.stashes.actions.pop": "Pop",
+  "gitView.stashes.actions.stashCurrent": "Stash current changes",
+  "gitView.stashes.actions.stashCurrentWithCount": "Stash {count} files",
+  "gitView.stashes.confirm.drop": "Drop {ref}?",
+  "gitView.stashes.description": "Save, restore, and clean up Git stashes for this repository.",
+  "gitView.stashes.empty.list": "No stashes yet.",
+  "gitView.stashes.empty.search": "No matching stashes.",
+  "gitView.stashes.includeUntrackedHint": "Untracked files are included automatically.",
+  "gitView.stashes.fileCount": "{count} files",
+  "gitView.stashes.fileCountLoading": "counting files...",
+  "gitView.stashes.itemNumber": "#{number}",
+  "gitView.stashes.latestLabel": "Latest",
+  "gitView.stashes.messagePlaceholder": "Stash name",
+  "gitView.stashes.searchPlaceholder": "Search stashes",
+  "gitView.stashes.title": "Stashes",
+  "gitView.stashes.toast.applyFailed": "Failed to apply stash",
+  "gitView.stashes.toast.applySuccess": "Stash applied",
+  "gitView.stashes.toast.createFailed": "Failed to stash changes",
+  "gitView.stashes.toast.created": "Changes stashed",
+  "gitView.stashes.toast.dropFailed": "Failed to drop stash",
+  "gitView.stashes.toast.dropSuccess": "Stash dropped",
+  "gitView.stashes.toast.loadFailed": "Failed to load stashes",
+  "gitView.stashes.toast.noChanges": "No local changes to stash",
+  "gitView.stashes.toast.popFailed": "Failed to pop stash",
+  "gitView.stashes.toast.popSuccess": "Stash popped",
+  "gitView.stashes.untitled": "Untitled stash",
  "gitView.sync.fetch": "Fetch",
  "gitView.sync.fetchFromRemote": "Fetch de {name}",
  "gitView.sync.fetchTooltip": "Fetch do remoto",
@@ -518,6 +518,34 @@ export const dict: Record<I18nKey, string> = {
  "gitView.stash.stepStash": "Сховати незакомічені зміни",
  "gitView.stash.thisWill": "Це:",
  "gitView.stash.title": "Незакомічені зміни",
+  "gitView.stashes.actions.apply": "Apply",
+  "gitView.stashes.actions.drop": "Drop",
+  "gitView.stashes.actions.pop": "Pop",
+  "gitView.stashes.actions.stashCurrent": "Сховати поточні зміни",
+  "gitView.stashes.actions.stashCurrentWithCount": "Сховати файлів: {count}",
+  "gitView.stashes.confirm.drop": "Видалити {ref}?",
+  "gitView.stashes.description": "Зберігайте, відновлюйте й очищайте Git stashes для цього репозиторію.",
+  "gitView.stashes.empty.list": "Stashes ще немає.",
+  "gitView.stashes.empty.search": "Збігів не знайдено.",
+  "gitView.stashes.includeUntrackedHint": "Untracked файли додаються автоматично.",
+  "gitView.stashes.fileCount": "Файлів: {count}",
+  "gitView.stashes.fileCountLoading": "рахуємо файли...",
+  "gitView.stashes.itemNumber": "#{number}",
+  "gitView.stashes.latestLabel": "Останній",
+  "gitView.stashes.messagePlaceholder": "Назва stash",
+  "gitView.stashes.searchPlaceholder": "Пошук stashes",
+  "gitView.stashes.title": "Stashes",
+  "gitView.stashes.toast.applyFailed": "Не вдалося застосувати stash",
+  "gitView.stashes.toast.applySuccess": "Stash застосовано",
+  "gitView.stashes.toast.createFailed": "Не вдалося сховати зміни",
+  "gitView.stashes.toast.created": "Зміни сховано",
+  "gitView.stashes.toast.dropFailed": "Не вдалося видалити stash",
+  "gitView.stashes.toast.dropSuccess": "Stash видалено",
+  "gitView.stashes.toast.loadFailed": "Не вдалося завантажити stashes",
+  "gitView.stashes.toast.noChanges": "Немає локальних змін для stash",
+  "gitView.stashes.toast.popFailed": "Не вдалося pop stash",
+  "gitView.stashes.toast.popSuccess": "Stash popped",
+  "gitView.stashes.untitled": "Stash без назви",
  "gitView.sync.fetch": "Fetch",
  "gitView.sync.fetchFromRemote": "Fetch з {name}",
  "gitView.sync.fetchTooltip": "Отримати з віддаленого",
@@ -518,6 +518,34 @@ export const dict: Record<I18nKey, string> = {
  'gitView.stash.stepStash': '储藏未提交的更改',
  'gitView.stash.thisWill': '这将会：',
  'gitView.stash.title': '未提交的更改',
+  'gitView.stashes.actions.apply': 'Apply',
+  'gitView.stashes.actions.drop': 'Drop',
+  'gitView.stashes.actions.pop': 'Pop',
+  'gitView.stashes.actions.stashCurrent': 'Stash current changes',
+  'gitView.stashes.actions.stashCurrentWithCount': 'Stash {count} files',
+  'gitView.stashes.confirm.drop': 'Drop {ref}?',
+  'gitView.stashes.description': 'Save, restore, and clean up Git stashes for this repository.',
+  'gitView.stashes.empty.list': 'No stashes yet.',
+  'gitView.stashes.empty.search': 'No matching stashes.',
+  'gitView.stashes.includeUntrackedHint': 'Untracked files are included automatically.',
+  'gitView.stashes.fileCount': '{count} files',
+  'gitView.stashes.fileCountLoading': 'counting files...',
+  'gitView.stashes.itemNumber': '#{number}',
+  'gitView.stashes.latestLabel': 'Latest',
+  'gitView.stashes.messagePlaceholder': 'Stash name',
+  'gitView.stashes.searchPlaceholder': 'Search stashes',
+  'gitView.stashes.title': 'Stashes',
+  'gitView.stashes.toast.applyFailed': 'Failed to apply stash',
+  'gitView.stashes.toast.applySuccess': 'Stash applied',
+  'gitView.stashes.toast.createFailed': 'Failed to stash changes',
+  'gitView.stashes.toast.created': 'Changes stashed',
+  'gitView.stashes.toast.dropFailed': 'Failed to drop stash',
+  'gitView.stashes.toast.dropSuccess': 'Stash dropped',
+  'gitView.stashes.toast.loadFailed': 'Failed to load stashes',
+  'gitView.stashes.toast.noChanges': 'No local changes to stash',
+  'gitView.stashes.toast.popFailed': 'Failed to pop stash',
+  'gitView.stashes.toast.popSuccess': 'Stash popped',
+  'gitView.stashes.untitled': 'Untitled stash',
  'gitView.sync.fetch': '获取',
  'gitView.sync.fetchFromRemote': '从 {name} 获取',
  'gitView.sync.fetchTooltip': '从远程获取',