refactor: Improve all git operations, add stash support, add improved pull request flow, add worktree file copy options, address code review comments, add cherry pick options

apps/ui/src/components/views/settings-view/components/index.ts

@@ -1,4 +1,5 @@
 export { DeleteProjectDialog } from './delete-project-dialog';
+export { RemoveFromAutomakerDialog } from './remove-from-automaker-dialog';
 export { KeyboardMapDialog } from './keyboard-map-dialog';
 export { SettingsHeader } from './settings-header';
 export { SettingsNavigation } from './settings-navigation';

apps/ui/src/components/views/settings-view/components/remove-from-automaker-dialog.tsx

@@ -0,0 +1,49 @@
+import { Folder, LogOut } from 'lucide-react';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
+import type { Project } from '@/lib/electron';
+
+interface RemoveFromAutomakerDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  project: Project | null;
+  onConfirm: (projectId: string) => void;
+}
+
+export function RemoveFromAutomakerDialog({
+  open,
+  onOpenChange,
+  project,
+  onConfirm,
+}: RemoveFromAutomakerDialogProps) {
+  const handleConfirm = () => {
+    if (project) {
+      onConfirm(project.id);
+    }
+  };
+
+  return (
+    <ConfirmDialog
+      open={open}
+      onOpenChange={onOpenChange}
+      onConfirm={handleConfirm}
+      title="Remove from Automaker"
+      description="Remove this project from Automaker? The folder will remain on disk and can be re-added later."
+      icon={LogOut}
+      iconClassName="text-muted-foreground"
+      confirmText="Remove from Automaker"
+      confirmVariant="secondary"
+    >
+      {project && (
+        <div className="flex items-center gap-3 p-4 rounded-lg bg-sidebar-accent/10 border border-sidebar-border">
+          <div className="w-10 h-10 rounded-lg bg-sidebar-accent/20 border border-sidebar-border flex items-center justify-center shrink-0">
+            <Folder className="w-5 h-5 text-brand-500" />
+          </div>
+          <div className="min-w-0">
+            <p className="font-medium text-foreground truncate">{project.name}</p>
+            <p className="text-xs text-muted-foreground truncate">{project.path}</p>
+          </div>
+        </div>
+      )}
+    </ConfirmDialog>
+  );
+}

apps/ui/src/components/views/settings-view/danger-zone/danger-zone-section.tsx

@@ -1,14 +1,19 @@
 import { Button } from '@/components/ui/button';
-import { Trash2, Folder, AlertTriangle } from 'lucide-react';
+import { Trash2, Folder, AlertTriangle, LogOut } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import type { Project } from '../shared/types';
 
 interface DangerZoneSectionProps {
   project: Project | null;
   onDeleteClick: () => void;
+  onRemoveFromAutomakerClick?: () => void;
 }
 
-export function DangerZoneSection({ project, onDeleteClick }: DangerZoneSectionProps) {
+export function DangerZoneSection({
+  project,
+  onDeleteClick,
+  onRemoveFromAutomakerClick,
+}: DangerZoneSectionProps) {
   return (
     <div
       className={cn(
@@ -28,33 +33,57 @@ export function DangerZoneSection({ project, onDeleteClick }: DangerZoneSectionP
         <p className="text-sm text-muted-foreground/80 ml-12">Destructive project actions.</p>
       </div>
       <div className="p-6 space-y-4">
-        {/* Project Delete */}
         {project ? (
-          <div className="flex items-center justify-between gap-4 p-4 rounded-xl bg-destructive/5 border border-destructive/10">
-            <div className="flex items-center gap-3.5 min-w-0">
-              <div className="w-11 h-11 rounded-xl bg-gradient-to-br from-brand-500/15 to-brand-600/10 border border-brand-500/20 flex items-center justify-center shrink-0">
-                <Folder className="w-5 h-5 text-brand-500" />
+          <>
+            {/* Remove from Automaker */}
+            {onRemoveFromAutomakerClick && (
+              <div className="flex items-start justify-between gap-4 p-4 rounded-xl bg-muted/30 border border-border">
+                <div className="min-w-0">
+                  <p className="font-medium text-foreground">Remove from Automaker</p>
+                  <p className="text-xs text-muted-foreground mt-0.5">
+                    Remove this project from Automaker without deleting any files from disk. You can
+                    re-add it later by opening the folder.
+                  </p>
+                </div>
+                <Button
+                  variant="secondary"
+                  onClick={onRemoveFromAutomakerClick}
+                  data-testid="remove-from-automaker-button"
+                  className="shrink-0 transition-all duration-200 ease-out hover:scale-[1.02] active:scale-[0.98]"
+                >
+                  <LogOut className="w-4 h-4 mr-2" />
+                  Remove
+                </Button>
               </div>
-              <div className="min-w-0">
-                <p className="font-medium text-foreground truncate">{project.name}</p>
-                <p className="text-xs text-muted-foreground/70 truncate mt-0.5">{project.path}</p>
+            )}
+
+            {/* Project Delete / Move to Trash */}
+            <div className="flex items-center justify-between gap-4 p-4 rounded-xl bg-destructive/5 border border-destructive/10">
+              <div className="flex items-center gap-3.5 min-w-0">
+                <div className="w-11 h-11 rounded-xl bg-gradient-to-br from-brand-500/15 to-brand-600/10 border border-brand-500/20 flex items-center justify-center shrink-0">
+                  <Folder className="w-5 h-5 text-brand-500" />
+                </div>
+                <div className="min-w-0">
+                  <p className="font-medium text-foreground truncate">{project.name}</p>
+                  <p className="text-xs text-muted-foreground/70 truncate mt-0.5">{project.path}</p>
+                </div>
               </div>
+              <Button
+                variant="destructive"
+                onClick={onDeleteClick}
+                data-testid="delete-project-button"
+                className={cn(
+                  'shrink-0',
+                  'shadow-md shadow-destructive/20 hover:shadow-lg hover:shadow-destructive/25',
+                  'transition-all duration-200 ease-out',
+                  'hover:scale-[1.02] active:scale-[0.98]'
+                )}
+              >
+                <Trash2 className="w-4 h-4 mr-2" />
+                Move to Trash
+              </Button>
             </div>
-            <Button
-              variant="destructive"
-              onClick={onDeleteClick}
-              data-testid="delete-project-button"
-              className={cn(
-                'shrink-0',
-                'shadow-md shadow-destructive/20 hover:shadow-lg hover:shadow-destructive/25',
-                'transition-all duration-200 ease-out',
-                'hover:scale-[1.02] active:scale-[0.98]'
-              )}
-            >
-              <Trash2 className="w-4 h-4 mr-2" />
-              Delete Project
-            </Button>
-          </div>
+          </>
         ) : (
           <p className="text-sm text-muted-foreground/60 text-center py-4">No project selected.</p>
         )}