Merge develop into main: Rich tree output and ignore pattern updates - feat(tree): Enable Rich formatting for both console and file output - fix(bundler): Generate clean plain text tree output for LLM consumption - chore: Update .gitignore and .llmignore with htmlcov/, site/, coverage.xml - test: Update tree generator tests for Rich formatting - docs: Update POA.md to reflect Rich file output capability

Author: Shorzinator

.gitignore

@@ -13,3 +13,4 @@ __pycache__/
 .venv
 /site/
 coverage.xml
+htmlcov/

.llmignore

@@ -35,3 +35,6 @@ coverage.xml
 .coverage.*.*.*.*.*
 .coverage.*.*.*.*.*.*
 .coverage.*.*.*.*.*.*.*
+
+htmlcov/
+site/

POA.md

@@ -64,7 +64,7 @@ To provide developers with a simple, extensible, and portable Python CLI toolkit
 3.  **Tool 1: Directory Tree Generator (`tree` command) (Status: ✅ COMPLETE)**
     *   Logic implemented in `src/contextcraft/tools/tree_generator.py`.
     *   Handles `root_dir`, `--output`, and CLI `--ignore` options.
-    *   Uses `rich.tree.Tree` for console output, plain text for file.
+    *   Uses `rich.tree.Tree` for both console and file output with beautiful formatting.
     *   Production-level docstrings and comments.
     *   ✅ **COMPLETED:** Comprehensive unit and integration tests (165 total tests passing).
     *   ✅ **COMPLETED:** Full integration with `.llmignore` system and config management.

src/contextcraft/tools/bundler.py

@@ -44,29 +44,23 @@ def generate_tree_content(
         Formatted tree content as string, or error message if generation fails
     """
     try:
-        # We need to capture the tree output as a string rather than printing it
-        # The tree_generator currently outputs to file or console, we need string output
-        # Let's use a temporary approach by redirecting to a temporary file-like object
-        import sys
-        from io import StringIO
-
-        # Temporarily redirect stdout to capture tree output
-        old_stdout = sys.stdout
-        string_buffer = StringIO()
-        sys.stdout = string_buffer
-
-        try:
-            tree_generator.generate_and_output_tree(
-                root_dir=project_root,
-                output_file_path=None,  # This will print to stdout (our captured buffer)
-                ignore_list=[],
-                config_global_excludes=config_global_excludes,
-            )
-        finally:
-            sys.stdout = old_stdout
+        # Import the internal tree generation function to get plain text output
+        from ..utils import ignore_handler
+
+        # Load ignore patterns
+        llmignore_spec = ignore_handler.load_ignore_patterns(project_root)
+
+        # Generate plain text tree lines directly for bundle (clean text output)
+        tree_lines = tree_generator._generate_tree_lines_recursive(
+            current_dir=project_root,
+            root_dir_for_ignores=project_root,
+            llmignore_spec=llmignore_spec,
+            cli_ignores=[],
+            config_global_excludes=config_global_excludes,
+            tool_specific_fallback_exclusions=tree_generator.DEFAULT_EXCLUDED_ITEMS_TOOL_SPECIFIC.copy(),
+        )
 
-        tree_content = string_buffer.getvalue()
-        return tree_content.strip() if tree_content else "No tree content generated"
+        return "\n".join(tree_lines) if tree_lines else "No tree content generated"
 
     except Exception as e:
         return f"Error generating directory tree: {e}"

src/contextcraft/tools/tree_generator.py

@@ -304,18 +304,36 @@ def generate_and_output_tree(
     current_tool_specific_exclusions = DEFAULT_EXCLUDED_ITEMS_TOOL_SPECIFIC.copy()
 
     if output_file_path:
-        tree_lines = _generate_tree_lines_recursive(
-            current_dir=root_dir,
+        # Create Rich tree for file output (same as console display)
+        rich_tree_root_label = f"📁 [link file://{root_dir.resolve()}]{root_dir.name}"
+        rich_tree_root = RichTree(
+            rich_tree_root_label,
+            guide_style="bold bright_blue",
+        )
+        _add_nodes_to_rich_tree_recursive(
+            rich_tree_node=rich_tree_root,
+            current_path_obj=root_dir,
             root_dir_for_ignores=root_dir,
             llmignore_spec=llmignore_spec,
             cli_ignores=effective_cli_ignores,
-            config_global_excludes=config_global_excludes,  # <--- PASS
+            config_global_excludes=config_global_excludes,
             tool_specific_fallback_exclusions=current_tool_specific_exclusions,
         )
+
+        # Render Rich tree to string for file output
+        from io import StringIO
+
+        from rich.console import Console as RichConsole
+
+        string_buffer = StringIO()
+        file_console = RichConsole(file=string_buffer, width=120, legacy_windows=False)
+        file_console.print(rich_tree_root)
+        rich_output = string_buffer.getvalue()
+
         try:
             output_file_path.parent.mkdir(parents=True, exist_ok=True)
             with output_file_path.open(mode="w", encoding="utf-8") as f:
-                f.write("\n".join(tree_lines))
+                f.write(rich_output)
             console.print(
                 f"Directory tree saved to [cyan]{output_file_path.resolve()}[/cyan]"
             )

tests/tools/test_bundler.py

@@ -9,21 +9,35 @@ class TestBundlerHelperFunctions:
     """Test cases for the bundler helper functions."""
 
     @patch("contextcraft.tools.bundler.tree_generator")
-    def test_generate_tree_content_success(self, mock_tree_generator, tmp_path):
+    @patch("contextcraft.utils.ignore_handler")
+    def test_generate_tree_content_success(
+        self, mock_ignore_handler, mock_tree_generator, tmp_path
+    ):
         """Test successful tree content generation."""
-        # Mock StringIO to return our expected content
-        with patch("io.StringIO") as mock_stringio:
-            mock_buffer = mock_stringio.return_value
-            mock_buffer.getvalue.return_value = "mock tree output"
+        # Mock the ignore handler
+        mock_ignore_handler.load_ignore_patterns.return_value = None
 
-            result = bundler.generate_tree_content(tmp_path, [])
+        # Mock the tree generation function to return expected lines
+        mock_tree_generator._generate_tree_lines_recursive.return_value = [
+            "ContextCraft/",
+            "├── file1.py",
+            "└── file2.py",
+        ]
+        mock_tree_generator.DEFAULT_EXCLUDED_ITEMS_TOOL_SPECIFIC = set()
 
-            assert "mock tree output" in result
+        result = bundler.generate_tree_content(tmp_path, [])
+
+        assert "ContextCraft/" in result
+        assert "├── file1.py" in result
+        assert "└── file2.py" in result
 
     @patch("contextcraft.tools.bundler.tree_generator")
-    def test_generate_tree_content_error(self, mock_tree_generator, tmp_path):
+    @patch("contextcraft.utils.ignore_handler")
+    def test_generate_tree_content_error(
+        self, mock_ignore_handler, mock_tree_generator, tmp_path
+    ):
         """Test tree content generation with error."""
-        mock_tree_generator.generate_and_output_tree.side_effect = Exception(
+        mock_ignore_handler.load_ignore_patterns.side_effect = Exception(
             "Tree generation failed"
         )
 

tests/tools/test_tree_generator.py

@@ -54,8 +54,11 @@ def test_tree_output_to_file_basic(create_project_structure_for_tree):
     assert "file3.txt" in generated_tree_content
     assert "empty_dir" in generated_tree_content
 
-    # Check for tree structure characters (basic tree formatting)
-    assert "├──" in generated_tree_content or "└──" in generated_tree_content
+    # Check for tree structure characters (Rich tree formatting)
+    assert "┣━━" in generated_tree_content or "┗━━" in generated_tree_content
+    # Check for Rich formatting elements
+    assert "📁" in generated_tree_content  # Directory icon
+    assert "📄" in generated_tree_content  # File icon
 
 
 def test_tree_with_llmignore(create_project_structure_for_tree):