code2llm 0.5.80__tar.gz → 0.5.82__tar.gz

{code2llm-0.5.80 → code2llm-0.5.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code2llm
-Version: 0.5.80
+Version: 0.5.82
 Summary: High-performance Python code flow analysis with optimized TOON format - CFG, DFG, call graphs, and intelligent code queries
 Home-page: https://github.com/wronai/stts
 Author: STTS Project
@@ -128,7 +128,7 @@ cat analysis.toon | head -30
 grep "REFACTOR" analysis.toon
 ```
 
-### `evolution.toon` - Refactoring Queue
+### `evolution.toon.yaml` - Refactoring Queue
 **Purpose**: Step-by-step refactoring plan
 **Key sections**:
 - **NEXT**: Immediate actions to take
@@ -138,10 +138,10 @@ grep "REFACTOR" analysis.toon
 **Example usage**:
 ```bash
 # Get refactoring plan
-cat evolution.toon
+cat evolution.toon.yaml
 
 # Track progress
-grep "NEXT" evolution.toon
+grep "NEXT" evolution.toon.yaml
 ```
 
 ### `flow.toon` - Legacy Data Flow Analysis
@@ -160,34 +160,34 @@ grep "PIPELINES" flow.toon
 grep "SIDE_EFFECTS" flow.toon
 ```
 
-### `map.toon` - Structural Map + Project Header
+### `map.toon.yaml` - Structural Map + Project Header
 **Purpose**: High-level architecture overview plus compact project header
 **Key sections**:
 - **MODULES**: All modules with basic stats
 - **IMPORTS**: Dependency relationships
-- **e:** Public API exports and signatures
+- **EXPORTS**: Public API surface and signatures
 - **HEADER**: Stats, alerts, hotspots, evolution trend
 
 **Example usage**:
 ```bash
 # See project structure
-cat map.toon | head -50
+cat map.toon.yaml | head -50
 
 # Find public APIs
-grep "^    e:" map.toon
+grep "SIGNATURES" map.toon.yaml
 ```
 
-### `project.toon` - Legacy Project Logic (Deprecated)
-**Purpose**: Compact module view generated by code2logic integration
-**Status**: Deprecated — the lightweight project overview is now merged into `map.toon` header
+### `analysis_view.toon` - Compact Analysis View
+**Purpose**: Compact module view generated from project.yaml data
+**Status**: Legacy view generated on demand from unified project.yaml
 
 **Example usage**:
 ```bash
 # View compact project structure
-cat project.toon | head -30
+cat analysis_view.toon | head -30
 
 # Find largest files
-grep -E "^  .*[0-9]{3,}$" project.toon | sort -t',' -k2 -n -r | head -10
+grep -E "^  .*[0-9]{3,}$" analysis_view.toon | sort -t',' -k2 -n -r | head -10
 ```
 
 ### `prompt.txt` - Ready-to-Send LLM Prompt
@@ -256,7 +256,7 @@ cat analysis.toon | grep -E "(HEALTH|REFACTOR)"
 ```bash
 # Get refactoring queue
 code2llm ./ -f evolution
-cat evolution.toon
+cat evolution.toon.yaml
 
 # Focus on specific issues
 code2llm ./ -f toon --refactor --smell god_function
@@ -335,7 +335,7 @@ cat docs/context.md >> README.md
 ## 📚 Next Steps
 
 1. **Review `analysis.toon`** - Identify critical issues
-2. **Check `evolution.toon`** - Plan refactoring priorities
+2. **Check `evolution.toon.yaml`** - Plan refactoring priorities
 3. **Use `context.md`** - Get LLM assistance for complex changes
 4. **Reference visualizations** - Understand system architecture
 5. **Track progress** - Re-run analysis after changes
@@ -369,10 +369,10 @@ code2llm ./ -f yaml --separate-orphans
 ---
 
 **Generated by**: `code2llm ./ -f all --readme`  
-**Analysis Date**: 2026-03-25  
-**Total Functions**: 891  
+**Analysis Date**: 2026-03-26  
+**Total Functions**: 931  
 **Total Classes**: 106  
-**Modules**: 121  
+**Modules**: 122  
 
 For more information about code2llm, visit: https://github.com/tom-sapletta/code2llm
 

{code2llm-0.5.80 → code2llm-0.5.82}/README.md

@@ -78,7 +78,7 @@ cat analysis.toon | head -30
 grep "REFACTOR" analysis.toon
 ```
 
-### `evolution.toon` - Refactoring Queue
+### `evolution.toon.yaml` - Refactoring Queue
 **Purpose**: Step-by-step refactoring plan
 **Key sections**:
 - **NEXT**: Immediate actions to take
@@ -88,10 +88,10 @@ grep "REFACTOR" analysis.toon
 **Example usage**:
 ```bash
 # Get refactoring plan
-cat evolution.toon
+cat evolution.toon.yaml
 
 # Track progress
-grep "NEXT" evolution.toon
+grep "NEXT" evolution.toon.yaml
 ```
 
 ### `flow.toon` - Legacy Data Flow Analysis
@@ -110,34 +110,34 @@ grep "PIPELINES" flow.toon
 grep "SIDE_EFFECTS" flow.toon
 ```
 
-### `map.toon` - Structural Map + Project Header
+### `map.toon.yaml` - Structural Map + Project Header
 **Purpose**: High-level architecture overview plus compact project header
 **Key sections**:
 - **MODULES**: All modules with basic stats
 - **IMPORTS**: Dependency relationships
-- **e:** Public API exports and signatures
+- **EXPORTS**: Public API surface and signatures
 - **HEADER**: Stats, alerts, hotspots, evolution trend
 
 **Example usage**:
 ```bash
 # See project structure
-cat map.toon | head -50
+cat map.toon.yaml | head -50
 
 # Find public APIs
-grep "^    e:" map.toon
+grep "SIGNATURES" map.toon.yaml
 ```
 
-### `project.toon` - Legacy Project Logic (Deprecated)
-**Purpose**: Compact module view generated by code2logic integration
-**Status**: Deprecated — the lightweight project overview is now merged into `map.toon` header
+### `analysis_view.toon` - Compact Analysis View
+**Purpose**: Compact module view generated from project.yaml data
+**Status**: Legacy view generated on demand from unified project.yaml
 
 **Example usage**:
 ```bash
 # View compact project structure
-cat project.toon | head -30
+cat analysis_view.toon | head -30
 
 # Find largest files
-grep -E "^  .*[0-9]{3,}$" project.toon | sort -t',' -k2 -n -r | head -10
+grep -E "^  .*[0-9]{3,}$" analysis_view.toon | sort -t',' -k2 -n -r | head -10
 ```
 
 ### `prompt.txt` - Ready-to-Send LLM Prompt
@@ -206,7 +206,7 @@ cat analysis.toon | grep -E "(HEALTH|REFACTOR)"
 ```bash
 # Get refactoring queue
 code2llm ./ -f evolution
-cat evolution.toon
+cat evolution.toon.yaml
 
 # Focus on specific issues
 code2llm ./ -f toon --refactor --smell god_function
@@ -285,7 +285,7 @@ cat docs/context.md >> README.md
 ## 📚 Next Steps
 
 1. **Review `analysis.toon`** - Identify critical issues
-2. **Check `evolution.toon`** - Plan refactoring priorities
+2. **Check `evolution.toon.yaml`** - Plan refactoring priorities
 3. **Use `context.md`** - Get LLM assistance for complex changes
 4. **Reference visualizations** - Understand system architecture
 5. **Track progress** - Re-run analysis after changes
@@ -319,10 +319,10 @@ code2llm ./ -f yaml --separate-orphans
 ---
 
 **Generated by**: `code2llm ./ -f all --readme`  
-**Analysis Date**: 2026-03-25  
-**Total Functions**: 891  
+**Analysis Date**: 2026-03-26  
+**Total Functions**: 931  
 **Total Classes**: 106  
-**Modules**: 121  
+**Modules**: 122  
 
 For more information about code2llm, visit: https://github.com/tom-sapletta/code2llm
 

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/__init__.py

@@ -8,7 +8,7 @@ Includes NLP Processing Pipeline for query normalization, intent matching,
 and entity resolution with multilingual support.
 """
 
-__version__ = "0.5.80"
+__version__ = "0.5.82"
 __author__ = "STTS Project"
 
 # Core analysis components (lightweight, always needed)

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/cli_analysis.py

@@ -223,7 +223,7 @@ def _analyze_subproject(args, subproject, output_dir: Path):
 
         formats = [f.strip() for f in args.format.split(',')]
         if 'all' in formats:
-            formats = ['toon', 'context', 'evolution', 'code2logic']
+            formats = ['toon', 'context', 'evolution']
 
         _export_simple_formats(args, result, output_dir, formats)
 

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/cli_commands.py

@@ -21,10 +21,10 @@ def handle_special_commands() -> Optional[int]:
 
 
 def handle_report_command(args_list) -> int:
-    """Generate views from an existing project.yaml.
+    """Generate views from an existing project.yaml (legacy).
 
     Usage:
-        code2llm report --format toon    # → project.toon (legacy)
+        code2llm report --format toon    # → project.toon.yaml (legacy)
         code2llm report --format context # → context.md
         code2llm report --format article # → status.md
         code2llm report --format html    # → dashboard.html
@@ -34,12 +34,12 @@ def handle_report_command(args_list) -> int:
 
     parser = argparse.ArgumentParser(
         prog='code2llm report',
-        description='Generate views from project.yaml (single source of truth)',
+        description='Generate views from an existing project.yaml (legacy, single source of truth)',
     )
     parser.add_argument(
         '--input', '-i',
         default='./project.yaml',
-        help='Path to project.yaml (default: ./project.yaml)',
+        help='Path to legacy project.yaml (default: ./project.yaml)',
     )
     parser.add_argument(
         '--format', '-f',
@@ -63,7 +63,7 @@ def handle_report_command(args_list) -> int:
     input_path = Path(args.input)
     if not input_path.exists():
         print(f"Error: project.yaml not found: {input_path}", file=sys.stderr)
-        print("Run 'code2llm <source> -f project-yaml' first to generate it.", file=sys.stderr)
+        print("If you still need it, use the legacy 'code2llm <source> -f project-yaml' export.", file=sys.stderr)
         return 1
 
     output_dir = Path(args.output)

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/cli_exports/formats.py

@@ -80,7 +80,7 @@ def _run_report(args, project_yaml_path: str, output_dir: Path) -> None:
         report_formats = ['toon', 'context', 'article', 'html']
 
     generator_map = {
-        'toon': ('project.toon', ToonViewGenerator(), 'TOON view'),
+        'toon': ('project.toon.yaml', ToonViewGenerator(), 'TOON view'),
         'context': ('context.md', ContextViewGenerator(), 'Context view'),
         'article': ('status.md', ArticleViewGenerator(), 'Article view'),
         'html': ('dashboard.html', HTMLDashboardGenerator(), 'HTML dashboard'),
@@ -116,12 +116,12 @@ def _export_simple_formats(args, result, output_dir: Path, formats):
                 print(f"  - {label}: {filepath}")
 
     # Unified project.yaml (single source of truth)
-    if 'project-yaml' in formats or 'all' in formats:
+    if 'project-yaml' in formats:
         yaml_path = _export_project_yaml(args, result, output_dir)
         # Auto-generate all views from project.yaml
         data = load_project_yaml(str(yaml_path))
         view_map = {
-            'project.toon': ToonViewGenerator(),
+            'project.toon.yaml': ToonViewGenerator(),
             'context.md': ContextViewGenerator(),
             'dashboard.html': HTMLDashboardGenerator(),
         }

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/cli_exports/orchestrator.py

@@ -23,24 +23,35 @@ def _run_exports(args, result, output_dir: Path, source_path: Optional[Path] = N
 
     For chunked analysis, exports to subproject subdirectories.
     """
-    formats = [f.strip() for f in args.format.split(',')]
+    requested_formats = [f.strip() for f in args.format.split(',')]
+    formats = requested_formats[:]
     if 'all' in formats:
-        formats = ['toon', 'map', 'context', 'yaml', 'json', 'mermaid', 'evolution']
+        formats = ['toon', 'map', 'context', 'mermaid', 'evolution']
 
     is_chunked = args.chunk if hasattr(args, 'chunk') else False
 
     try:
         if is_chunked and source_path:
-            _export_chunked_results(args, result, output_dir, source_path, formats)
+            _export_chunked_results(args, result, output_dir, source_path, formats, requested_formats)
         else:
-            _export_single_project(args, result, output_dir, formats, source_path)
+            _export_single_project(args, result, output_dir, formats, requested_formats, source_path)
     except Exception as e:
         print(f"Error during export: {e}", file=sys.stderr)
         sys.exit(1)
 
 
-def _export_single_project(args, result, output_dir: Path, formats: list, source_path: Optional[Path] = None):
+def _export_single_project(
+    args,
+    result,
+    output_dir: Path,
+    formats: list,
+    requested_formats: Optional[list] = None,
+    source_path: Optional[Path] = None,
+):
     """Export single project results."""
+    if requested_formats is None:
+        requested_formats = formats
+
     _export_simple_formats(args, result, output_dir, formats)
 
     if 'mermaid' in formats:
@@ -52,7 +63,7 @@ def _export_single_project(args, result, output_dir: Path, formats: list, source
 
     if source_path is not None:
         _export_code2logic(args, source_path, output_dir, formats)
-        _export_prompt_txt(args, output_dir, formats, source_path)
+        _export_prompt_txt(args, output_dir, requested_formats, source_path)
 
     if hasattr(args, 'refactor') and args.refactor:
         _export_refactor_prompts(args, result, output_dir)
@@ -63,8 +74,18 @@ def _export_single_project(args, result, output_dir: Path, formats: list, source
     _export_index_html(args, output_dir)
 
 
-def _export_chunked_results(args, result, output_dir: Path, source_path: Path, formats: list):
+def _export_chunked_results(
+    args,
+    result,
+    output_dir: Path,
+    source_path: Path,
+    formats: list,
+    requested_formats: Optional[list] = None,
+):
     """Export chunked analysis results to subproject directories."""
+    if requested_formats is None:
+        requested_formats = formats
+
     subprojects = _get_filtered_subprojects(args, source_path)
 
     for sp in subprojects:
@@ -76,7 +97,7 @@ def _export_chunked_results(args, result, output_dir: Path, source_path: Path, f
 
     if source_path is not None:
         _export_code2logic(args, source_path, output_dir, formats)
-        _export_chunked_prompt_txt(args, output_dir, formats, source_path, subprojects)
+        _export_chunked_prompt_txt(args, output_dir, requested_formats, source_path, subprojects)
 
     _export_readme(args, result, output_dir)
 

{code2llm-0.5.80 → code2llm-0.5.82}/code2llm/cli_exports/prompt.py

@@ -13,6 +13,7 @@ def _export_prompt_txt(args, output_dir: Path, formats: list[str], source_path:
     project_path, output_rel_path = _get_prompt_paths(source_path, output_dir)
     lines = _build_prompt_header(project_path)
     lines.extend(_build_main_files_section(output_dir, output_rel_path))
+    lines.extend(_build_optional_files_section(output_dir, output_rel_path))
 
     missing = _get_missing_files(output_dir)
     if missing:
@@ -39,6 +40,7 @@ def _export_chunked_prompt_txt(args, output_dir: Path, formats: list[str], sourc
     project_path, output_rel_path = _get_prompt_paths(source_path, output_dir)
     lines = _build_prompt_header(project_path)
     lines.extend(_build_main_files_section(output_dir, output_rel_path))
+    lines.extend(_build_optional_files_section(output_dir, output_rel_path))
 
     if subprojects:
         lines.extend(_build_subprojects_section(subprojects, output_dir, output_rel_path))
@@ -77,11 +79,18 @@ def _get_prompt_paths(source_path: Optional[Path], output_dir: Path) -> Tuple[st
 
 
 _MAIN_FILES = [
-    ('analysis.toon', 'Health diagnostics - complexity metrics, god modules, coupling issues, refactoring priorities'),
-    ('map.toon.yaml', 'Structural map - files, sizes, imports, exports, signatures, project header'),
-    ('context.md', 'LLM narrative - architecture summary, key entry points, process flows, public API surface'),
-    ('evolution.toon.yaml', 'Refactoring queue - ranked actions by impact/effort, risks, metrics targets, history'),
-    ('README.md', 'Documentation - complete guide to all generated files, usage examples, interpretation'),
+    ('analysis.toon', 'Health diagnostics - complexity metrics, god modules, coupling issues, refactoring priorities', ('analysis.toon', 'analysis.toon.yaml')),
+    ('map.toon.yaml', 'Structural map - files, sizes, imports, exports, signatures, project header', ('map.toon.yaml',)),
+    ('evolution.toon.yaml', 'Refactoring queue - ranked actions by impact/effort, risks, metrics targets, history', ('evolution.toon.yaml',)),
+    ('context.md', 'LLM narrative - architecture summary and project context', ('context.md',)),
+    ('README.md', 'Generated documentation - overview and usage guide', ('README.md',)),
+]
+
+
+_OPTIONAL_FILES = [
+    ('project.toon', 'Project logic - compact module view from code2logic', ('project.toon', 'project/project.toon', 'project.toon.txt')),
+    ('project/validation.toon.yaml', 'Validation analysis - generated by vallm tool', ('project/validation.toon.yaml',)),
+    ('project/duplication.toon.yaml', 'Code duplication analysis - generated by redup tool', ('project/duplication.toon.yaml',)),
 ]
 
 
@@ -94,21 +103,48 @@ def _build_prompt_header(project_path: str) -> List[str]:
         f"we are in project path: {project_path}",
         "",
         "Files for analysis:",
+        "",
+        "Note: project/validation.toon.yaml and project/duplication.toon.yaml are generated by external tools (vallm and redup)",
     ]
 
 
-def _build_main_files_section(output_dir: Path, output_rel_path: str) -> List[str]:
-    """Build main files section with size metrics."""
+def _find_existing_prompt_file(output_dir: Path, candidates: tuple[str, ...]) -> Optional[str]:
+    """Return the first candidate path that exists, relative to output_dir."""
+    for candidate in candidates:
+        if (output_dir / candidate).exists():
+            return candidate
+    return None
+
+
+def _build_prompt_file_lines(output_dir: Path, output_rel_path: str, files: list) -> List[str]:
+    """Build file lines for either the required or optional prompt file sections."""
     lines = []
-    for name, desc in _MAIN_FILES:
-        file_path = output_dir / name
-        if file_path.exists():
-            size_bytes = file_path.stat().st_size
-            size_str = _format_size(size_bytes)
-            lines.append(f"- {output_rel_path}/{name}  ({desc}) [{size_str}]")
+    for _display_name, desc, candidates in files:
+        existing = _find_existing_prompt_file(output_dir, candidates)
+        if not existing:
+            continue
+
+        file_path = output_dir / existing
+        size_str = _format_size(file_path.stat().st_size)
+        lines.append(f"- {output_rel_path}/{existing}  ({desc}) [{size_str}]")
+
     return lines
 
 
+def _build_main_files_section(output_dir: Path, output_rel_path: str) -> List[str]:
+    """Build main files section with size metrics."""
+    return _build_prompt_file_lines(output_dir, output_rel_path, _MAIN_FILES)
+
+
+def _build_optional_files_section(output_dir: Path, output_rel_path: str) -> List[str]:
+    """Build optional files section with size metrics."""
+    lines = _build_prompt_file_lines(output_dir, output_rel_path, _OPTIONAL_FILES)
+    if not lines:
+        return []
+
+    return ["", "Optional files:", ""] + lines
+
+
 def _format_size(size_bytes: int) -> str:
     """Format file size in human readable format."""
     if size_bytes < 1024:
@@ -121,7 +157,11 @@ def _format_size(size_bytes: int) -> str:
 
 def _get_missing_files(output_dir: Path) -> List[str]:
     """Return names of expected main files that are missing."""
-    return [name for name, _ in _MAIN_FILES if not (output_dir / name).exists()]
+    missing = []
+    for display_name, _, candidates in _MAIN_FILES:
+        if _find_existing_prompt_file(output_dir, candidates) is None:
+            missing.append(display_name)
+    return missing
 
 
 def _build_subprojects_section(subprojects: list, output_dir: Path, output_rel_path: str) -> List[str]:
@@ -161,28 +201,57 @@ def _build_missing_files_section(output_dir: Path, output_rel_path: str) -> List
         return []
     lines = ["", "Missing files (not generated in this run):"]
     for name in missing:
-        lines.append(f"- {output_rel_path}/{name}")
+        # Special handling for validation and duplication files
+        if name in ['validation.toon.yaml', 'duplication.toon.yaml']:
+            lines.append(f"- {output_rel_path}/project/{name}")
+        else:
+            lines.append(f"- {output_rel_path}/{name}")
     return lines
 
 
 def _analyze_generated_files(output_dir: Path, subprojects: list = None) -> dict:
     """Analyze which files were generated and determine appropriate focus areas."""
+    analysis_file = _find_existing_prompt_file(output_dir, ('analysis.toon', 'analysis.toon.yaml'))
+    map_file = _find_existing_prompt_file(output_dir, ('map.toon.yaml',))
+    evolution_file = _find_existing_prompt_file(output_dir, ('evolution.toon.yaml',))
+    context_file = _find_existing_prompt_file(output_dir, ('context.md',))
+    readme_file = _find_existing_prompt_file(output_dir, ('README.md',))
+    project_logic_file = _find_existing_prompt_file(output_dir, ('project.toon', 'project/project.toon', 'project.toon.txt'))
+    validation_file = _find_existing_prompt_file(output_dir, ('project/validation.toon.yaml',))
+    duplication_file = _find_existing_prompt_file(output_dir, ('project/duplication.toon.yaml',))
+
     analysis = {
-        'has_analysis_toon': (output_dir / 'analysis.toon').exists(),
-        'has_map_toon': (output_dir / 'map.toon.yaml').exists(),
-        'has_context_md': (output_dir / 'context.md').exists(),
-        'has_evolution_toon': (output_dir / 'evolution.toon.yaml').exists(),
-        'has_readme': (output_dir / 'README.md').exists(),
-        'has_yaml': (output_dir / 'analysis.yaml').exists(),
-        'has_json': (output_dir / 'analysis.json').exists(),
-        'has_mermaid': (output_dir / 'flow.mmd').exists() or (output_dir / 'calls.mmd').exists(),
+        'has_analysis_toon': analysis_file is not None,
+        'analysis_file': analysis_file or 'analysis.toon',
+        'has_map_toon': map_file is not None,
+        'map_file': map_file or 'map.toon.yaml',
+        'has_evolution_toon': evolution_file is not None,
+        'evolution_file': evolution_file or 'evolution.toon.yaml',
+        'has_context_md': context_file is not None,
+        'context_file': context_file or 'context.md',
+        'has_readme_md': readme_file is not None,
+        'readme_file': readme_file or 'README.md',
+        'has_project_logic': project_logic_file is not None,
+        'project_logic_file': project_logic_file or 'project.toon',
+        'has_validation_toon': validation_file is not None,
+        'validation_file': validation_file or 'project/validation.toon.yaml',
+        'has_duplication_toon': duplication_file is not None,
+        'duplication_file': duplication_file or 'project/duplication.toon.yaml',
         'is_chunked': subprojects is not None and len(subprojects) > 0,
         'file_count': 0,
     }
     
     # Count total files
+    actionable_keys = {
+        'has_analysis_toon',
+        'has_map_toon',
+        'has_evolution_toon',
+        'has_project_logic',
+        'has_validation_toon',
+        'has_duplication_toon',
+    }
     for key, exists in analysis.items():
-        if key.startswith('has_') and exists:
+        if key in actionable_keys and exists:
             analysis['file_count'] += 1
     
     return analysis
@@ -191,27 +260,31 @@ def _analyze_generated_files(output_dir: Path, subprojects: list = None) -> dict
 def _build_dynamic_focus_areas(file_analysis: dict) -> List[str]:
     """Build focus areas based on generated files."""
     focus_areas = []
+
+    analysis_file = file_analysis.get('analysis_file', 'analysis.toon')
+    map_file = file_analysis.get('map_file', 'map.toon.yaml')
+    evolution_file = file_analysis.get('evolution_file', 'evolution.toon.yaml')
+    project_logic_file = file_analysis.get('project_logic_file', 'project.toon')
+    validation_file = file_analysis.get('validation_file', 'project/validation.toon.yaml')
+    duplication_file = file_analysis.get('duplication_file', 'project/duplication.toon.yaml')
     
     if file_analysis['has_analysis_toon']:
-        focus_areas.append("1. **Code Health Analysis** - Review complexity metrics, god modules, coupling issues from analysis.toon")
+        focus_areas.append(f"1. **Code Health Analysis** - Review complexity metrics, god modules, coupling issues from {analysis_file}")
 
     if file_analysis['has_map_toon']:
-        focus_areas.append("2. **Structural Map** - Use map.toon.yaml to inspect imports, exports, signatures, and the project header")
+        focus_areas.append(f"2. **Structural Map** - Use {map_file} to inspect imports, exports, signatures, and the project header")
     
     if file_analysis['has_evolution_toon']:
-        focus_areas.append("3. **Refactoring Priorities** - Examine ranked refactoring actions and risk assessment from evolution.toon.yaml")
-    
-    if file_analysis['has_context_md']:
-        focus_areas.append("4. **Architecture Overview** - Understand main flows, entry points, and public API from context.md")
-    
-    if file_analysis['has_yaml'] or file_analysis['has_json']:
-        focus_areas.append("5. **Structured Data** - Use machine-readable formats for automated analysis and metrics extraction")
+        focus_areas.append(f"3. **Refactoring Priorities** - Examine ranked refactoring actions and risk assessment from {evolution_file}")
+
+    if file_analysis.get('has_project_logic'):
+        focus_areas.append(f"4. **Project Logic** - Review the compact module overview from {project_logic_file}")
     
-    if file_analysis['has_mermaid']:
-        focus_areas.append("6. **Visual Flow** - Review control flow diagrams and call graphs for architectural insights")
+    if file_analysis['has_validation_toon']:
+        focus_areas.append(f"5. **Validation Analysis** - Review validation results and issues identified by vallm from {validation_file}")
     
-    if file_analysis['is_chunked']:
-        focus_areas.append("7. **Large Repository Patterns** - Identify cross-chunk dependencies and consolidation opportunities")
+    if file_analysis['has_duplication_toon']:
+        focus_areas.append(f"6. **Code Duplication** - Examine duplicate code patterns detected by redup from {duplication_file}")
     
     if not focus_areas:
         focus_areas.append("1. **General Code Review** - Provide overall architecture assessment and improvement recommendations")
@@ -221,6 +294,13 @@ def _build_dynamic_focus_areas(file_analysis: dict) -> List[str]:
 
 def _build_dynamic_tasks(file_analysis: dict) -> List[str]:
     """Build tasks based on available files."""
+    analysis_file = file_analysis.get('analysis_file', 'analysis.toon')
+    map_file = file_analysis.get('map_file', 'map.toon.yaml')
+    evolution_file = file_analysis.get('evolution_file', 'evolution.toon.yaml')
+    validation_file = file_analysis.get('validation_file', 'project/validation.toon.yaml')
+    duplication_file = file_analysis.get('duplication_file', 'project/duplication.toon.yaml')
+    project_logic_file = file_analysis.get('project_logic_file', 'project.toon')
+
     tasks = [
         "- Summarize the architecture, main flows, and structural dependencies.",
         "- Identify the highest-risk areas and propose a refactoring plan.",
@@ -228,19 +308,22 @@ def _build_dynamic_tasks(file_analysis: dict) -> List[str]:
     ]
     
     if file_analysis['has_analysis_toon']:
-        tasks.append("- Highlight critical functions (CC ≥ 10) and top problem areas from analysis.toon.")
+        tasks.append(f"- Highlight critical functions (CC ≥ 10) and top problem areas from {analysis_file}.")
 
     if file_analysis['has_map_toon']:
-        tasks.append("- Cross-check imports, exports, and signatures against map.toon.yaml before proposing splits.")
+        tasks.append(f"- Cross-check imports, exports, and signatures against {map_file} before proposing splits.")
     
     if file_analysis['has_evolution_toon']:
-        tasks.append("- Prioritize refactoring actions by impact/effort ratio from evolution.toon.yaml.")
-    
-    if file_analysis['has_context_md']:
-        tasks.append("- Validate entry points and public API surface match the architecture described.")
+        tasks.append(f"- Prioritize refactoring actions by impact/effort ratio from {evolution_file}.")
 
-    if file_analysis['is_chunked']:
-        tasks.append("- Analyze cross-chunk dependencies and suggest consolidation strategies.")
+    if file_analysis.get('has_project_logic'):
+        tasks.append(f"- Use {project_logic_file} to validate the compact project overview against the rest of the analysis.")
+    
+    if file_analysis['has_validation_toon']:
+        tasks.append(f"- Review validation findings from {validation_file} generated by vallm.")
+    
+    if file_analysis['has_duplication_toon']:
+        tasks.append(f"- Analyze code duplication patterns from {duplication_file} generated by redup.")
     
     return tasks
 
@@ -271,14 +354,15 @@ def _build_prompt_footer(chunked: bool = False, file_analysis: dict = None) -> L
         lines.append("")
         lines.append("Analysis Strategy:")
         if file_analysis['has_analysis_toon'] and file_analysis['has_map_toon']:
-            lines.append("- Start with analysis.toon for health metrics, then map.toon.yaml for structure and signatures")
+            lines.append(f"- Start with {file_analysis.get('analysis_file', 'analysis.toon')} for health metrics, then {file_analysis.get('map_file', 'map.toon.yaml')} for structure and signatures")
             if file_analysis['has_evolution_toon']:
-                lines.append("- Finish with evolution.toon.yaml for action priorities and next steps")
-        elif file_analysis['has_context_md']:
-            lines.append("- Use context.md as the primary reference for architectural understanding")
-        
-        if file_analysis['has_yaml']:
-            lines.append("- Reference analysis.yaml for precise metrics and programmatic data")
+                lines.append(f"- Review {file_analysis.get('evolution_file', 'evolution.toon.yaml')} for action priorities and next steps")
+        if file_analysis.get('has_project_logic'):
+            lines.append(f"- Compare the compact project overview in {file_analysis.get('project_logic_file', 'project.toon')} with the main analysis files")
+        if file_analysis['has_validation_toon']:
+            lines.append(f"- Check {file_analysis.get('validation_file', 'project/validation.toon.yaml')} for validation issues (vallm tool output)")
+        if file_analysis['has_duplication_toon']:
+            lines.append(f"- Examine {file_analysis.get('duplication_file', 'project/duplication.toon.yaml')} for duplicate code patterns (redup tool output)")
     
     # Constraints
     lines.append("")