Merge origin/main into cursor/dag-execution-parallelization-429d

Author: cursoragent

src/commands/eval/command.rs

@@ -23,9 +23,12 @@ pub async fn eval_command(
     mut config: config::Config,
     fixtures_dir: PathBuf,
     output_path: Option<PathBuf>,
-    options: EvalRunOptions,
+    mut options: EvalRunOptions,
 ) -> Result<()> {
     config.verification_fail_open = true;
+    if options.trend_file.is_none() {
+        options.trend_file = Some(config.eval_trend_path.clone());
+    }
     ensure_frontier_eval_models(&config, &options)?;
     if options.repeat > 1 || !options.matrix_models.is_empty() {
         return run_eval_batch(config, &fixtures_dir, output_path.as_deref(), &options).await;

src/commands/misc/feedback/apply.rs

@@ -2,8 +2,6 @@
 mod accept;
 #[path = "apply/reject.rs"]
 mod reject;
-#[path = "apply/stats.rs"]
-mod stats;
 
 pub(super) use accept::apply_feedback_accept;
 pub(super) use reject::apply_feedback_reject;

src/commands/misc/feedback/apply/accept.rs

@@ -1,20 +1,15 @@
 use crate::core;
 use crate::review;
 
-use super::stats::record_accepted_feedback;
-
 pub(in super::super) fn apply_feedback_accept(
     store: &mut review::FeedbackStore,
     comments: &[core::Comment],
 ) -> usize {
     let mut updated = 0;
     for comment in comments {
-        let is_new = store.accept.insert(comment.id.clone());
-        if is_new {
+        if review::apply_comment_feedback_signal(store, comment, true) {
             updated += 1;
-            record_accepted_feedback(store, comment);
         }
-        store.suppress.remove(&comment.id);
     }
     updated
 }

src/commands/misc/feedback/apply/reject.rs

@@ -1,20 +1,15 @@
 use crate::core;
 use crate::review;
 
-use super::stats::record_rejected_feedback;
-
 pub(in super::super) fn apply_feedback_reject(
     store: &mut review::FeedbackStore,
     comments: &[core::Comment],
 ) -> usize {
     let mut updated = 0;
     for comment in comments {
-        let is_new = store.suppress.insert(comment.id.clone());
-        if is_new {
+        if review::apply_comment_feedback_signal(store, comment, false) {
             updated += 1;
-            record_rejected_feedback(store, comment);
         }
-        store.accept.remove(&comment.id);
     }
     updated
 }

src/commands/misc/feedback/apply/stats.rs

@@ -158,6 +158,12 @@ pub struct Config {
     #[serde(default = "default_feedback_path")]
     pub feedback_path: PathBuf,
 
+    #[serde(default = "default_eval_trend_path")]
+    pub eval_trend_path: PathBuf,
+
+    #[serde(default = "default_feedback_eval_trend_path")]
+    pub feedback_eval_trend_path: PathBuf,
+
     /// Path to the convention store file for learned review patterns.
     /// Defaults to ~/.local/share/diffscope/conventions.json if not set.
     #[serde(default)]
@@ -496,6 +502,8 @@ impl Default for Config {
             symbol_index_lsp_command: None,
             symbol_index_lsp_languages: default_symbol_index_lsp_languages(),
             feedback_path: default_feedback_path(),
+            eval_trend_path: default_eval_trend_path(),
+            feedback_eval_trend_path: default_feedback_eval_trend_path(),
             convention_store_path: None,
             system_prompt: None,
             api_key: None,
@@ -813,6 +821,15 @@ impl Config {
         } else {
             self.symbol_index_provider = provider;
         }
+        if self.feedback_path.as_os_str().is_empty() {
+            self.feedback_path = default_feedback_path();
+        }
+        if self.eval_trend_path.as_os_str().is_empty() {
+            self.eval_trend_path = default_eval_trend_path();
+        }
+        if self.feedback_eval_trend_path.as_os_str().is_empty() {
+            self.feedback_eval_trend_path = default_feedback_eval_trend_path();
+        }
 
         if let Some(command) = &self.symbol_index_lsp_command {
             if command.trim().is_empty() {
@@ -1348,6 +1365,14 @@ fn default_feedback_path() -> PathBuf {
     PathBuf::from(".diffscope.feedback.json")
 }
 
+fn default_eval_trend_path() -> PathBuf {
+    PathBuf::from(".diffscope.eval-trend.json")
+}
+
+fn default_feedback_eval_trend_path() -> PathBuf {
+    PathBuf::from(".diffscope.feedback-eval-trend.json")
+}
+
 fn default_pattern_repo_max_files() -> usize {
     8
 }

src/config.rs

@@ -21,7 +21,8 @@ mod types;
 use classify::{determine_category, determine_fix_effort, determine_severity};
 use confidence::calculate_confidence;
 use ordering::{
-    deduplicate_comments as deduplicate_comment_list, sort_by_priority as sort_comments_by_priority,
+    deduplicate_comments as deduplicate_comment_list,
+    sort_by_priority as order_comments_by_priority,
 };
 #[cfg(test)]
 use std::path::PathBuf;
@@ -98,6 +99,10 @@ impl CommentSynthesizer {
     }
 }
 
+pub fn sort_comments_by_priority(comments: &mut [Comment]) {
+    order_comments_by_priority(comments);
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/core/comment.rs

@@ -18,6 +18,11 @@ pub(super) fn sort_by_priority(comments: &mut [Comment]) {
         severity_rank(&a.severity)
             .cmp(&severity_rank(&b.severity))
             .then_with(|| category_rank(&a.category).cmp(&category_rank(&b.category)))
+            .then_with(|| {
+                b.confidence
+                    .partial_cmp(&a.confidence)
+                    .unwrap_or(std::cmp::Ordering::Equal)
+            })
             .then_with(|| a.file_path.cmp(&b.file_path))
             .then_with(|| a.line_number.cmp(&b.line_number))
     });

src/core/comment/ordering.rs

@@ -28,7 +28,7 @@ pub mod symbol_graph;
 pub mod symbol_index;
 
 pub use changelog::ChangelogGenerator;
-pub use comment::{Comment, CommentSynthesizer};
+pub use comment::{sort_comments_by_priority, Comment, CommentSynthesizer};
 pub use commit_prompt::CommitPromptBuilder;
 pub use context::{ContextFetcher, ContextType, LLMContextChunk};
 pub use context_provenance::ContextProvenance;

src/core/mod.rs

@@ -756,7 +756,7 @@ async fn main() -> Result<()> {
             commands::feedback_eval_command(
                 input,
                 output,
-                trend_file,
+                trend_file.or_else(|| Some(config.feedback_eval_trend_path.clone())),
                 confidence_threshold,
                 eval_report,
             )