refactor: improve extraction

Author: raiderrobert

src/extract/exclude.rs

@@ -29,6 +29,8 @@ const DEFAULT_EXCLUDES: &[&str] = &[
     ".output",
     ".turbo",
     ".worktrees",
+    ".claude/worktrees",
+    ".astro",
     ".diecut-answers.toml",
 ];
 
@@ -119,6 +121,27 @@ pub fn detect_copy_without_render(
     found
 }
 
+/// Check if a file should be copied without rendering (lock files, binary-like assets).
+///
+/// These files are included in the template but should never have replacements
+/// applied during extraction — they're copied verbatim.
+pub fn is_copy_without_render(path: &Path) -> bool {
+    for pattern in DEFAULT_COPY_WITHOUT_RENDER {
+        if let Some(ext) = pattern.strip_prefix("*.") {
+            if let Some(file_ext) = path.extension() {
+                if file_ext.to_string_lossy().eq_ignore_ascii_case(ext) {
+                    return true;
+                }
+            }
+        } else if let Some(file_name) = path.file_name() {
+            if file_name.to_string_lossy() == *pattern {
+                return true;
+            }
+        }
+    }
+    false
+}
+
 /// Check if a path should be excluded based on the exclude patterns.
 pub fn should_exclude(relative_path: &Path, excludes: &[String]) -> bool {
     let path_str = relative_path.to_string_lossy();
@@ -232,6 +255,41 @@ mod tests {
         assert!(!relevant.contains(&"node_modules".to_string()));
     }
 
+    #[test]
+    fn test_should_exclude_claude_worktrees() {
+        let excludes = all_default_excludes();
+        assert!(should_exclude(
+            Path::new(".claude/worktrees/agent-abc/Cargo.toml"),
+            &excludes
+        ));
+        // .claude/settings.local.json should NOT be excluded
+        assert!(!should_exclude(
+            Path::new(".claude/settings.local.json"),
+            &excludes
+        ));
+    }
+
+    #[test]
+    fn test_should_exclude_astro() {
+        let excludes = all_default_excludes();
+        assert!(should_exclude(
+            Path::new("docs/.astro/data-store.json"),
+            &excludes
+        ));
+        assert!(should_exclude(Path::new(".astro/settings.json"), &excludes));
+    }
+
+    #[test]
+    fn test_is_copy_without_render() {
+        assert!(is_copy_without_render(Path::new("Cargo.lock")));
+        assert!(is_copy_without_render(Path::new("pnpm-lock.yaml")));
+        assert!(is_copy_without_render(Path::new("package-lock.json")));
+        assert!(is_copy_without_render(Path::new("logo.png")));
+        assert!(is_copy_without_render(Path::new("deep/nested/file.lock")));
+        assert!(!is_copy_without_render(Path::new("src/main.rs")));
+        assert!(!is_copy_without_render(Path::new("README.md")));
+    }
+
     #[test]
     fn test_detect_copy_without_render() {
         let files = vec![

src/extract/interactive.rs

@@ -6,7 +6,7 @@ use inquire::{Confirm, Select, Text};
 use crate::config::schema::DEFAULT_TEMPLATES_SUFFIX;
 use crate::error::{DicecutError, Result};
 
-use super::auto_detect::DetectedCandidate;
+use super::auto_detect::{ConfidenceTier, DetectedCandidate};
 use super::conditional::DetectedConditional;
 use super::variants::generate_variants;
 use super::{ExtractVariable, PlannedExtractFile};
@@ -194,6 +194,7 @@ pub fn resolve_candidates_yes(
     }
 
     let mut result = Vec::new();
+    let mut skipped_freq = 0;
 
     for (name, mut group) in groups {
         // Skip names already covered by explicit --var
@@ -210,6 +211,12 @@ pub fn resolve_candidates_yes(
         group.sort_by(|a, b| b.confidence.total_cmp(&a.confidence));
         let winner = group[0];
 
+        // Skip frequency-analysis candidates in -y mode — too noisy for auto-accept
+        if winner.tier == ConfidenceTier::FrequencyAnalysis {
+            skipped_freq += 1;
+            continue;
+        }
+
         eprintln!(
             "  {} {} = {:?} ({:.0}% confidence, {})",
             style("✓").green(),
@@ -231,6 +238,14 @@ pub fn resolve_candidates_yes(
         result.push((winner.suggested_name.clone(), winner.value.clone()));
     }
 
+    if skipped_freq > 0 {
+        eprintln!(
+            "  {} {} frequency-detected candidate(s) skipped (use interactive mode to review)",
+            style("·").dim(),
+            skipped_freq
+        );
+    }
+
     result
 }
 

src/extract/mod.rs

@@ -21,7 +21,10 @@ use self::conditional::{detect_conditional_files, patterns_for_variable};
 use self::config_gen::{
     generate_config_toml, ComputedVariable, ConditionalEntry, ConfigGenOptions, PromptedVariable,
 };
-use self::exclude::{all_default_excludes, detect_copy_without_render, relevant_config_excludes};
+use self::exclude::{
+    all_default_excludes, detect_copy_without_render, is_copy_without_render,
+    relevant_config_excludes,
+};
 use self::interactive::{
     confirm_auto_detected_interactive, confirm_conditionals_interactive,
     confirm_excludes_interactive, confirm_files_interactive, confirm_variants_interactive,
@@ -328,6 +331,19 @@ pub fn plan_extraction(options: &ExtractOptions) -> Result<ExtractionPlan> {
                 stubbed: false,
             });
         } else if let Some(ref content) = file.content {
+            // Lock files and other copy-without-render files: skip replacement
+            if is_copy_without_render(&file.relative_path) {
+                planned_files.push(PlannedExtractFile {
+                    template_path,
+                    content: ExtractedContent::Text {
+                        content: content.clone(),
+                        replacement_count: 0,
+                    },
+                    stubbed: false,
+                });
+                continue;
+            }
+
             let (replaced, count) = apply_replacements(content, &rules);
 
             if count > 0 {