feat: optimize pr ux

ObservedObserver · ObservedObserver · commit 9b2575dc585c · 2025-06-10T01:09:00.000+08:00
diff --git a/async-code-web/app/layout.tsx b/async-code-web/app/layout.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 import { AuthProvider } from "@/contexts/auth-context";
+import { Toaster } from "@/components/ui/sonner";
 import "./globals.css";
 
 const geistSans = Geist({
@@ -30,6 +31,7 @@ export default function RootLayout({
             >
                 <AuthProvider>
                     {children}
+                    <Toaster />
                 </AuthProvider>
             </body>
         </html>
diff --git a/async-code-web/app/tasks/[id]/page.tsx b/async-code-web/app/tasks/[id]/page.tsx
@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from "react";
 import { useParams } from "next/navigation";
-import { ArrowLeft, Github, Clock, CheckCircle, XCircle, AlertCircle, GitCommit, FileText, ExternalLink, MessageSquare, Plus, Copy } from "lucide-react";
+import { ArrowLeft, Github, Clock, CheckCircle, XCircle, AlertCircle, GitCommit, FileText, ExternalLink, MessageSquare, Plus, Copy, Loader2 } from "lucide-react";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -16,6 +16,7 @@ import { ApiService } from "@/lib/api-service";
 import { Task, Project, ChatMessage } from "@/types";
 import { formatDiff, parseDiffStats } from "@/lib/utils";
 import { DiffViewer } from "@/components/diff-viewer";
+import { toast } from "sonner";
 
 interface TaskWithProject extends Task {
     project?: Project
@@ -32,6 +33,7 @@ export default function TaskDetailPage() {
     const [diffStats, setDiffStats] = useState({ additions: 0, deletions: 0, files: 0 });
     const [newMessage, setNewMessage] = useState("");
     const [githubToken, setGithubToken] = useState("");
+    const [creatingPR, setCreatingPR] = useState(false);
 
     useEffect(() => {
         if (typeof window !== 'undefined') {
@@ -111,30 +113,44 @@ export default function TaskDetailPage() {
                 content: newMessage.trim()
             });
             setNewMessage("");
+            toast.success("Message added successfully");
             loadTask(); // Reload to get updated messages
         } catch (error) {
             console.error('Error adding message:', error);
-            alert('Error adding message');
+            toast.error('Failed to add message');
         }
     };
 
     const handleCreatePR = async () => {
         if (!task || task.status !== "completed" || !user?.id) return;
 
+        setCreatingPR(true);
+        
         try {
             const prompt = (task.chat_messages as unknown as ChatMessage[])?.[0]?.content || '';
             const modelName = task.agent === 'codex' ? 'Codex' : 'Claude Code';
             
+            toast.loading("Creating pull request...");
+            
             const response = await ApiService.createPullRequest(user.id, task.id, {
                 title: `${modelName}: ${prompt.substring(0, 50)}...`,
                 body: `Automated changes generated by ${modelName}.\n\nPrompt: ${prompt}`,
                 github_token: githubToken
             });
 
-            alert(`Pull request created successfully! #${response.pr_number}`);
+            toast.dismiss();
+            toast.success(`Pull request #${response.pr_number} created successfully!`);
+            
+            // Refresh task data to show the new PR info
+            await loadTask();
+            
+            // Open the PR in a new tab
             window.open(response.pr_url, '_blank');
         } catch (error) {
-            alert(`Error creating PR: ${error}`);
+            toast.dismiss();
+            toast.error(`Failed to create PR: ${error}`);
+        } finally {
+            setCreatingPR(false);
         }
     };
 
@@ -216,10 +232,23 @@ export default function TaskDetailPage() {
                                 </div>
                             </div>
                             {task.status === "completed" && (
-                                <Button onClick={handleCreatePR} className="gap-2">
-                                    <ExternalLink className="w-4 h-4" />
-                                    Create PR
-                                </Button>
+                                task.pr_url ? (
+                                    <Button asChild variant="outline" className="gap-2">
+                                        <a href={task.pr_url} target="_blank" rel="noopener noreferrer">
+                                            <ExternalLink className="w-4 h-4" />
+                                            View PR #{task.pr_number}
+                                        </a>
+                                    </Button>
+                                ) : (
+                                    <Button onClick={handleCreatePR} disabled={creatingPR} className="gap-2">
+                                        {creatingPR ? (
+                                            <Loader2 className="w-4 h-4 animate-spin" />
+                                        ) : (
+                                            <ExternalLink className="w-4 h-4" />
+                                        )}
+                                        {creatingPR ? "Creating PR..." : "Create PR"}
+                                    </Button>
+                                )
                             )}
                         </div>
                     </div>
diff --git a/async-code-web/components/ui/sonner.tsx b/async-code-web/components/ui/sonner.tsx
@@ -0,0 +1,25 @@
+"use client"
+
+import { useTheme } from "next-themes"
+import { Toaster as Sonner, ToasterProps } from "sonner"
+
+const Toaster = ({ ...props }: ToasterProps) => {
+  const { theme = "system" } = useTheme()
+
+  return (
+    <Sonner
+      theme={theme as ToasterProps["theme"]}
+      className="toaster group"
+      style={
+        {
+          "--normal-bg": "var(--popover)",
+          "--normal-text": "var(--popover-foreground)",
+          "--normal-border": "var(--border)",
+        } as React.CSSProperties
+      }
+      {...props}
+    />
+  )
+}
+
+export { Toaster }
diff --git a/async-code-web/package.json b/async-code-web/package.json
@@ -34,8 +34,10 @@
     "codemirror": "^6.0.1",
     "lucide-react": "^0.513.0",
     "next": "15.3.3",
+    "next-themes": "^0.4.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
+    "sonner": "^2.0.5",
     "tailwind-merge": "^3.3.0"
   },
   "devDependencies": {
diff --git a/async-code-web/yarn.lock b/async-code-web/yarn.lock
@@ -2887,6 +2887,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+next-themes@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.4.6.tgz#8d7e92d03b8fea6582892a50a928c9b23502e8b6"
+  integrity sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==
+
 next@15.3.3:
   version "15.3.3"
   resolved "https://registry.npmjs.org/next/-/next-15.3.3.tgz"
@@ -3391,6 +3396,11 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+sonner@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/sonner/-/sonner-2.0.5.tgz#ffb70a6ffe3207c4302cffd3ee46a25242953477"
+  integrity sha512-YwbHQO6cSso3HBXlbCkgrgzDNIhws14r4MO87Ofy+cV2X7ES4pOoAK3+veSmVTvqNx1BWUxlhPmZzP00Crk2aQ==
+
 source-map-js@^1.0.2, source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"
diff --git a/server/tasks.py b/server/tasks.py
@@ -567,7 +567,11 @@ def apply_patch_to_github_repo(repo, branch, patch_content, task):
                     i = j
             i += 1
         
-        # Now update all the files via GitHub API
+        # Create a single commit with all file changes using GitHub's Tree API
+        if not files_to_update:
+            logger.warning("⚠️ No files to update")
+            return []
+        
         updated_files = []
         commit_message = f"Claude Code: {task.get('prompt', 'Automated changes')[:100]}"
         
@@ -578,34 +582,77 @@ def apply_patch_to_github_repo(repo, branch, patch_content, task):
                     commit_message = f"Claude Code: {msg.get('content', '')[:100]}"
                     break
         
-        for file_path, new_content in files_to_update.items():
-            try:
-                # Check if file exists
-                try:
-                    file_obj = repo.get_contents(file_path, ref=branch)
-                    # Update existing file
-                    repo.update_file(
-                        path=file_path,
-                        message=commit_message,
-                        content=new_content,
-                        sha=file_obj.sha,
-                        branch=branch
-                    )
-                    logger.info(f"📝 Updated existing file: {file_path}")
-                except:
-                    # Create new file
-                    repo.create_file(
-                        path=file_path,
-                        message=commit_message,
-                        content=new_content,
-                        branch=branch
-                    )
-                    logger.info(f"🆕 Created new file: {file_path}")
+        try:
+            # Get the current commit to build upon
+            current_commit = repo.get_commit(branch)
+            
+            # Create tree elements for all changed files
+            tree_elements = []
+            
+            for file_path, new_content in files_to_update.items():
+                # Create a blob for the file content
+                blob = repo.create_git_blob(new_content, "utf-8")
                 
-                updated_files.append(file_path)
+                # Add to tree elements
+                tree_elements.append({
+                    "path": file_path,
+                    "mode": "100644",  # Normal file mode
+                    "type": "blob",
+                    "sha": blob.sha
+                })
                 
-            except Exception as file_error:
-                logger.error(f"❌ Failed to update {file_path}: {file_error}")
+                logger.info(f"📝 Prepared blob for {file_path}")
+                updated_files.append(file_path)
+            
+            # Create a new tree with all the changes
+            new_tree = repo.create_git_tree(tree_elements, base_tree=current_commit.commit.tree)
+            
+            # Create a single commit with all the changes
+            new_commit = repo.create_git_commit(
+                message=commit_message,
+                tree=new_tree,
+                parents=[current_commit.commit]
+            )
+            
+            # Update the branch to point to the new commit
+            ref = repo.get_git_ref(f"heads/{branch}")
+            ref.edit(new_commit.sha)
+            
+            logger.info(f"✅ Created single commit {new_commit.sha[:8]} with {len(updated_files)} files")
+            
+        except Exception as commit_error:
+            logger.error(f"❌ Failed to create single commit: {commit_error}")
+            # Fallback to individual file updates if tree method fails
+            logger.info("🔄 Falling back to individual file updates...")
+            
+            for file_path, new_content in files_to_update.items():
+                try:
+                    # Check if file exists
+                    try:
+                        file_obj = repo.get_contents(file_path, ref=branch)
+                        # Update existing file
+                        repo.update_file(
+                            path=file_path,
+                            message=commit_message,
+                            content=new_content,
+                            sha=file_obj.sha,
+                            branch=branch
+                        )
+                        logger.info(f"📝 Updated existing file: {file_path}")
+                    except:
+                        # Create new file
+                        repo.create_file(
+                            path=file_path,
+                            message=commit_message,
+                            content=new_content,
+                            branch=branch
+                        )
+                        logger.info(f"🆕 Created new file: {file_path}")
+                    
+                    updated_files.append(file_path)
+                    
+                except Exception as file_error:
+                    logger.error(f"❌ Failed to update {file_path}: {file_error}")
         
         return updated_files
         
