feat(git): add git pull with safe checkout

- Add git:pull handler with fetch + merge support
- Use safe checkout to preserve uncommitted changes
- Handle fast-forward, merge, and conflict scenarios
- Add Conflict status to FileStatus enum
- Add Pull button to ChangesPanel UI
- Show conflict files with orange "!" indicator

Author: vipmax

anycode-backend/src/handlers/git_handler.rs

@@ -10,7 +10,7 @@ use anyhow::{Context, Result};
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum FileStatus {
-    Modified, Added, Deleted, Renamed,
+    Modified, Added, Deleted, Renamed, Conflict,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -211,3 +211,124 @@ pub async fn handle_git_push(ack: AckSender, _state: State<AppState>) {
     info!("Received git:push");
     send_response(ack, git_push_impl());
 }
+
+fn git_pull_impl() -> Result<Value> {
+    let workdir = crate::utils::current_dir();
+    let repo = Repository::discover(&workdir)?;
+    
+    // Get remote and branch
+    let mut remote = repo.find_remote("origin")?;
+    let head = repo.head()?;
+    let branch_name = head.shorthand()
+        .context("Detached HEAD state")?;
+    
+    // Fetch from remote
+    let mut callbacks = git2::RemoteCallbacks::new();
+    callbacks.credentials(|_url, username_from_url, _allowed_types| {
+        git2::Cred::ssh_key_from_agent(username_from_url.unwrap_or("git"))
+    });
+    
+    let mut fetch_opts = git2::FetchOptions::new();
+    fetch_opts.remote_callbacks(callbacks);
+    
+    remote.fetch(&[branch_name], Some(&mut fetch_opts), None)?;
+    
+    // Get the fetched commit
+    let fetch_head = repo.find_reference("FETCH_HEAD")?;
+    let remote_commit = repo.reference_to_annotated_commit(&fetch_head)?;
+    
+    // Analyze what kind of merge we need
+    let (analysis, _) = repo.merge_analysis(&[&remote_commit])?;
+    
+    if analysis.is_up_to_date() {
+        info!("Git pull: already up to date");
+        return Ok(json!({ "status": "up_to_date" }));
+    }
+    
+    if analysis.is_fast_forward() {
+        // Fast-forward: just move the branch pointer
+        let refname = format!("refs/heads/{}", branch_name);
+        let mut reference = repo.find_reference(&refname)?;
+        reference.set_target(remote_commit.id(), "Fast-forward pull")?;
+        
+        // SAFE checkout - preserves uncommitted changes, fails if conflict
+        let checkout_result = repo.checkout_head(Some(
+            git2::build::CheckoutBuilder::default()
+                .safe()  // Don't overwrite uncommitted changes!
+        ));
+        
+        if let Err(e) = checkout_result {
+            // Revert the reference change
+            reference.set_target(head.target().unwrap(), "Revert failed pull")?;
+            anyhow::bail!("Pull would overwrite uncommitted changes: {}", e);
+        }
+        
+        info!("Git pull: fast-forward to {}", remote_commit.id());
+        return Ok(json!({ "status": "fast_forward" }));
+    }
+    
+    // Need to merge
+    repo.merge(&[&remote_commit], None, None)?;
+    
+    let mut index = repo.index()?;
+    
+    if index.has_conflicts() {
+        // Collect conflicting files
+        let conflicts: Vec<String> = index.conflicts()?
+            .filter_map(|c| c.ok())
+            .filter_map(|c| {
+                c.our.or(c.their).or(c.ancestor)
+            })
+            .filter_map(|entry| String::from_utf8(entry.path).ok())
+            .collect();
+        
+        // Write files with conflict markers to disk (safe - doesn't overwrite unrelated changes)
+        let checkout_result = repo.checkout_index(None, Some(
+            git2::build::CheckoutBuilder::default()
+                .allow_conflicts(true)
+                .conflict_style_merge(true)
+                .safe()  // Preserve other uncommitted changes
+        ));
+        
+        if let Err(e) = checkout_result {
+            repo.cleanup_state()?;
+            anyhow::bail!("Failed to write conflict markers: {}", e);
+        }
+        
+        info!("Git pull: conflicts in {:?}", conflicts);
+        return Ok(json!({ 
+            "status": "conflict",
+            "files": conflicts
+        }));
+    }
+    
+    // No conflicts - create merge commit
+    let tree_id = index.write_tree()?;
+    let tree = repo.find_tree(tree_id)?;
+    
+    let sig = repo.signature().or_else(|_| {
+        git2::Signature::now("Anycode User", "user@anycode.dev")
+    })?;
+    
+    let local_commit = head.peel_to_commit()?;
+    let remote_commit_obj = repo.find_commit(remote_commit.id())?;
+    
+    repo.commit(
+        Some("HEAD"),
+        &sig,
+        &sig,
+        &format!("Merge remote-tracking branch 'origin/{}'", branch_name),
+        &tree,
+        &[&local_commit, &remote_commit_obj]
+    )?;
+    
+    repo.cleanup_state()?;
+    
+    info!("Git pull: merged successfully");
+    Ok(json!({ "status": "merged" }))
+}
+
+pub async fn handle_git_pull(ack: AckSender, _state: State<AppState>) {
+    info!("Received git:pull");
+    send_response(ack, git_pull_impl());
+}

anycode-backend/src/main.rs

@@ -86,6 +86,7 @@ async fn on_connect(socket: SocketRef, state: State<AppState>) {
     socket.on("git:file-original", handle_git_file_original);
     socket.on("git:commit", handle_git_commit);
     socket.on("git:push", handle_git_push);
+    socket.on("git:pull", handle_git_pull);
 
     socket.on_disconnect(on_disconnect)
 }

anycode/App.tsx

@@ -853,6 +853,34 @@ const App: React.FC = () => {
         }
     }, [isConnected, fetchGitStatus]);
 
+    const handleGitPull = useCallback(() => {
+        console.log('handleGitPull');
+        if (wsRef.current && isConnected) {
+            wsRef.current.emit('git:pull', {}, (response: any) => {
+                if (response.success) {
+                    console.log('Pull response:', response);
+                    const status = response.status;
+                    
+                    if (status === 'up_to_date') {
+                        alert('Already up to date');
+                    } else if (status === 'fast_forward') {
+                        alert('Fast-forwarded');
+                    } else if (status === 'merged') {
+                        alert('Merged successfully');
+                    } else if (status === 'conflict') {
+                        const files = response.files || [];
+                        alert(`Merge conflicts in:\n${files.join('\n')}\n\nResolve conflicts and commit.`);
+                    }
+                    
+                    fetchGitStatus();
+                } else {
+                    alert('Pull failed: ' + response.error);
+                    console.error('Pull failed:', response.error);
+                }
+            });
+        }
+    }, [isConnected, fetchGitStatus]);
+
 
     const handleOpenFileResponse = (path: string, content: string, history: { changes: Change[], index: number }) => {
         const fileName = getFileName(path);
@@ -1780,6 +1808,7 @@ const App: React.FC = () => {
                         onRefresh={fetchGitStatus}
                         onCommit={handleGitCommit}
                         onPush={handleGitPush}
+                        onPull={handleGitPull}
                     />
                 );
             case 'files':

anycode/components/ChangesPanel.css

@@ -231,6 +231,11 @@
     color: #4285f4;
 }
 
+.status-conflict {
+    background-color: rgba(255, 152, 0, 0.25);
+    color: #ff9800;
+}
+
 .changes-file-info {
     display: flex;
     flex-direction: column;

anycode/components/ChangesPanel.tsx

@@ -3,7 +3,7 @@ import './ChangesPanel.css';
 
 export interface ChangedFile {
     path: string;
-    status: 'modified' | 'added' | 'deleted' | 'renamed';
+    status: 'modified' | 'added' | 'deleted' | 'renamed' | 'conflict';
 }
 
 interface ChangesPanelProps {
@@ -13,20 +13,23 @@ interface ChangesPanelProps {
     onRefresh: () => void;
     onCommit: (files: string[], message: string) => void;
     onPush: () => void;
+    onPull: () => void;
 }
 
 const statusIcons: Record<string, string> = {
     modified: 'M',
     added: 'A',
     deleted: 'D',
     renamed: 'R',
+    conflict: '!',
 };
 
 const statusColors: Record<string, string> = {
     modified: 'status-modified',
     added: 'status-added',
     deleted: 'status-deleted',
     renamed: 'status-renamed',
+    conflict: 'status-conflict',
 };
 
 const getFileName = (path: string): string => {
@@ -46,7 +49,8 @@ export const ChangesPanel: React.FC<ChangesPanelProps> = ({
     onFileClick,
     onRefresh,
     onCommit,
-    onPush
+    onPush,
+    onPull
 }) => {
     const [message, setMessage] = useState('');
     const [selectedFiles, setSelectedFiles] = useState<Set<string>>(new Set());
@@ -131,6 +135,9 @@ export const ChangesPanel: React.FC<ChangesPanelProps> = ({
                     >
                         Commit
                     </button>
+                    <button className="changes-action-btn" onClick={onPull} title="Pull">
+                        Pull
+                    </button>
                     <button className="changes-action-btn" onClick={onPush} title="Push">
                         Push
                     </button>