Optimize search and git change updates

Author: vipmax

anycode-backend/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.0.18"
 edition = "2024"
 
 [profile.release]
-opt-level = 3
-strip = true
-lto = true
-codegen-units = 1
-panic = 'abort'
+# opt-level = 3
+# strip = true
+# lto = true
+# codegen-units = 1
+# panic = 'abort'
 
 [dependencies]
 openssl = { version = "0.10", features = ["vendored"] }

anycode-backend/src/app_state.rs

@@ -4,6 +4,7 @@ use crate::code::Code;
 use crate::config::Config;
 use crate::git::GitManager;
 use crate::lsp::LspManager;
+use crate::search::FileSearchResult;
 use crate::terminal::Terminal;
 use anyhow::{Result, anyhow};
 use lsp_types::PublishDiagnosticsParams;
@@ -31,6 +32,7 @@ pub struct SocketData {
     pub opened_dirs: HashSet<String>,
     pub search_cancel: Option<CancellationToken>,
     pub search_pattern: Option<String>,
+    pub search_last_file_result: Option<FileSearchResult>,
 }
 
 #[derive(Clone)]

anycode-backend/src/git.rs

@@ -1406,6 +1406,10 @@ impl GitManager {
             }
         };
 
+        if !has_staged_changes && !is_conflicted && added == 0 && removed == 0 {
+            return Ok(None);
+        }
+
         Ok(Some(GitFileStatus {
             path: abs_path.to_string_lossy().to_string(),
             status: file_status,

anycode-backend/src/handlers/search_handler.rs

@@ -4,14 +4,22 @@ use serde::{Deserialize, Serialize};
 use serde_json::{self, json};
 use socketioxide::extract::{Data, SocketRef, State};
 use tokio::sync::mpsc;
+use tokio::time::{self, Duration, MissedTickBehavior};
 use tokio_util::sync::CancellationToken;
 use tracing::info;
 
+const SEARCH_RESULT_BATCH_INTERVAL: Duration = Duration::from_millis(200);
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct SearchRequest {
     pub pattern: String,
 }
 
+#[derive(Debug, Serialize)]
+struct SearchResultsBatch {
+    results: Vec<FileSearchResult>,
+}
+
 pub async fn handle_search(
     socket: SocketRef,
     Data(search_request): Data<SearchRequest>,
@@ -37,6 +45,7 @@ pub async fn handle_search(
     // Save the cancel in the socket data
     data.search_cancel = Some(cancel.clone());
     data.search_pattern = Some(search_request.pattern.clone());
+    data.search_last_file_result = None;
 
     // Prepare search, get the current directory and create channel to collect results
     let current_dir = std::env::current_dir().unwrap();
@@ -63,10 +72,35 @@ pub async fn handle_search(
     // Collect results and send them to the socket
     tokio::spawn(async move {
         let mut matches = 0;
+        let mut batch = Vec::new();
+        let mut batch_interval = time::interval(SEARCH_RESULT_BATCH_INTERVAL);
+        batch_interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+        batch_interval.tick().await;
+
         // In cancel case, the loop will be ended automatically
-        while let Some(file_result) = result_rx.recv().await {
-            let _ = socket.emit("search:result", &file_result);
-            matches += file_result.matches.len();
+        loop {
+            tokio::select! {
+                maybe_file_result = result_rx.recv() => {
+                    match maybe_file_result {
+                        Some(file_result) => {
+                            matches += file_result.matches.len();
+                            batch.push(file_result);
+                        }
+                        None => break,
+                    }
+                }
+                _ = batch_interval.tick() => {
+                    if !batch.is_empty() {
+                        let results = std::mem::take(&mut batch);
+                        let _ = socket.emit("search:results", &SearchResultsBatch { results });
+                    }
+                }
+            }
+        }
+
+        if !batch.is_empty() {
+            let results = std::mem::take(&mut batch);
+            let _ = socket.emit("search:results", &SearchResultsBatch { results });
         }
 
         let _ = socket.emit(
@@ -95,5 +129,6 @@ pub async fn handle_search_cancel(socket: SocketRef, state: State<AppState>) {
         // Clear the cancel token
         data.search_cancel = None;
         data.search_pattern = None;
+        data.search_last_file_result = None;
     }
 }

anycode-backend/src/handlers/watch_handler.rs

@@ -268,7 +268,11 @@ async fn handle_search_update(
                 if pattern.trim().is_empty() {
                     return None;
                 }
-                Some((sid.clone(), pattern.clone()))
+                Some((
+                    sid.clone(),
+                    pattern.clone(),
+                    data.search_last_file_result.clone(),
+                ))
             })
             .collect::<Vec<_>>()
     };
@@ -277,10 +281,23 @@ async fn handle_search_update(
         return;
     }
 
-    for (_, pattern) in searches {
+    for (sid, pattern, last_file_result) in searches {
         let cancel = CancellationToken::new();
         if let Some(file_result) = search_file_result(path, &pattern, cancel).await {
-            let _ = socket.emit("search:result", &file_result).await;
+            if last_file_result.as_ref() == Some(&file_result) {
+                continue;
+            }
+
+            {
+                let mut sockets_data = socket2data.lock().await;
+                if let Some(data) = sockets_data.get_mut(&sid) {
+                    data.search_last_file_result = Some(file_result.clone());
+                }
+            }
+
+            let _ = socket
+                .emit("search:results", &json!({ "results": [file_result] }))
+                .await;
         }
     }
 }

anycode-backend/src/search.rs

@@ -121,7 +121,7 @@ pub fn multiline_search(content: &str, pattern: &str) -> Vec<SearchResult> {
     results
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct SearchResult {
     pub line: usize,
     pub column: usize,
@@ -189,7 +189,7 @@ pub async fn file_search(
     Ok(results)
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct FileSearchResult {
     pub file_path: String,
     pub display_path: String,
@@ -236,17 +236,7 @@ pub async fn global_search(
     cancel: CancellationToken,
     result_tx: mpsc::Sender<FileSearchResult>,
 ) -> Result<()> {
-    let mut files = collect_files_recursively(dir_path)?;
-
-    // Sort files by depth
-    files.sort_by(|a, b| {
-        let depth_a = a.components().count();
-        let depth_b = b.components().count();
-        match depth_a.cmp(&depth_b) {
-            std::cmp::Ordering::Equal => a.cmp(b),
-            other => other,
-        }
-    });
+    let files = collect_files_recursively(dir_path)?;
 
     let semaphore = Arc::new(Semaphore::new(8));
     let mut handles = Vec::new();

anycode-base/src/editor.ts

@@ -1064,7 +1064,7 @@ export class AnycodeEditor {
             return;
         }
 
-        if (event.metaKey && event.key === "f" || this.search.isFocused()) {
+        if ((event.metaKey && !event.shiftKey && event.key.toLowerCase() === "f") || this.search.isFocused()) {
             event.preventDefault();
             this.handleSearchKey(event);
             return;
@@ -1466,7 +1466,7 @@ export class AnycodeEditor {
         const { key, altKey, ctrlKey, metaKey, shiftKey } = event;
         let isSearch = false;
 
-        if (metaKey && key.toLowerCase() == 'f') {
+        if (metaKey && !shiftKey && key.toLowerCase() == 'f') {
             this.renderer.removeAllHighlights(this.search);
 
             this.search.setActive(true);
@@ -1521,7 +1521,7 @@ export class AnycodeEditor {
         const patternLines = pattern.split(/\r?\n/);
         const isMultiline = patternLines.length > 1;
 
-        if (event.metaKey && event.key === 'f') {
+        if (event.metaKey && !event.shiftKey && event.key.toLowerCase() === 'f') {
             event.preventDefault();
             event.stopPropagation();
             // ignore search  

anycode/App.tsx

@@ -66,7 +66,7 @@ const App: React.FC = () => {
             ['git:update', editors.handleGitUpdate],
             ['acp:message', agents.handleAcpMessage],
             ['acp:history', agents.handleAcpHistory],
-            ['search:result', search.handleSearchResult],
+            ['search:results', search.handleSearchResults],
             ['search:end', search.handleSearchEnd],
         ] as const;
 
@@ -85,7 +85,7 @@ const App: React.FC = () => {
         git.handleGitStatusUpdate,
         agents.handleAcpMessage,
         agents.handleAcpHistory,
-        search.handleSearchResult,
+        search.handleSearchResults,
         search.handleSearchEnd,
     ]);
 
@@ -228,7 +228,7 @@ const App: React.FC = () => {
                 return;
             }
 
-            if (e.metaKey && e.key === 'f') {
+            if (e.metaKey && !e.shiftKey && e.key.toLowerCase() === 'f') {
                 e.preventDefault();
             }