code-puppy 0.0.287__py3-none-any.whl → 0.0.323__py3-none-any.whl

code_puppy/tools/file_operations.py

@@ -12,13 +12,14 @@ from pydantic_ai import RunContext
 # ---------------------------------------------------------------------------
 # Module-level helper functions (exposed for unit tests _and_ used as tools)
 # ---------------------------------------------------------------------------
-from code_puppy.messaging import (
-    emit_error,
-    emit_info,
-    emit_success,
-    emit_warning,
+from code_puppy.messaging import (  # New structured messaging types
+    FileContentMessage,
+    FileEntry,
+    FileListingMessage,
+    GrepMatch,
+    GrepResultMessage,
+    get_message_bus,
 )
-from code_puppy.tools.common import generate_group_id
 
 
 # Pydantic models for tool return types
@@ -49,6 +50,7 @@ class MatchInfo(BaseModel):
 
 class GrepOutput(BaseModel):
     matches: List[MatchInfo]
+    error: str | None = None
 
 
 def is_likely_home_directory(directory):
@@ -154,44 +156,24 @@ def _list_files(
     results = []
     directory = os.path.abspath(os.path.expanduser(directory))
 
-    # Build string representation
+    # Plain text output for LLM consumption
     output_lines = []
-
-    directory_listing_header = (
-        "\n[bold white on blue] DIRECTORY LISTING [/bold white on blue]"
-    )
-    output_lines.append(directory_listing_header)
-
-    directory_info = f"\U0001f4c2 [bold cyan]{directory}[/bold cyan] [dim](recursive={recursive})[/dim]\n"
-    output_lines.append(directory_info)
-
-    divider = "[dim]" + "─" * 100 + "\n" + "[/dim]"
-    output_lines.append(divider)
+    output_lines.append(f"DIRECTORY LISTING: {directory} (recursive={recursive})")
 
     if not os.path.exists(directory):
-        error_msg = (
-            f"[red bold]Error:[/red bold] Directory '{directory}' does not exist"
-        )
-        output_lines.append(error_msg)
-
-        output_lines.append(divider)
-        return ListFileOutput(content="\n".join(output_lines))
+        error_msg = f"Error: Directory '{directory}' does not exist"
+        return ListFileOutput(content=error_msg, error=error_msg)
     if not os.path.isdir(directory):
-        error_msg = f"[red bold]Error:[/red bold] '{directory}' is not a directory"
-        output_lines.append(error_msg)
-
-        output_lines.append(divider)
-        return ListFileOutput(content="\n".join(output_lines))
+        error_msg = f"Error: '{directory}' is not a directory"
+        return ListFileOutput(content=error_msg, error=error_msg)
 
     # Smart home directory detection - auto-limit recursion for performance
     # But allow recursion in tests (when context=None) or when explicitly requested
     if context is not None and is_likely_home_directory(directory) and recursive:
         if not is_project_directory(directory):
-            warning_msg = "[yellow bold]Warning:[/yellow bold] 🏠 Detected home directory - limiting to non-recursive listing for performance"
-            output_lines.append(warning_msg)
-
-            info_msg = f"[dim]💡 To force recursive listing in home directory, use list_files('{directory}', recursive=True) explicitly[/dim]"
-            output_lines.append(info_msg)
+            output_lines.append(
+                "Warning: Detected home directory - limiting to non-recursive listing for performance"
+            )
             recursive = False
 
     # Create a temporary ignore file with our ignore patterns
@@ -217,9 +199,8 @@ def _list_files(
 
         if not rg_path and recursive:
             # Only need ripgrep for recursive listings
-            error_msg = "[red bold]Error:[/red bold] ripgrep (rg) not found. Please install ripgrep to use this tool."
-            output_lines.append(error_msg)
-            return ListFileOutput(content="\n".join(output_lines))
+            error_msg = "Error: ripgrep (rg) not found. Please install ripgrep to use this tool."
+            return ListFileOutput(content=error_msg, error=error_msg)
 
         # Only use ripgrep for recursive listings
         if recursive:
@@ -371,17 +352,11 @@ def _list_files(
                 # Skip entries we can't access
                 pass
     except subprocess.TimeoutExpired:
-        error_msg = (
-            "[red bold]Error:[/red bold] List files command timed out after 30 seconds"
-        )
-        output_lines.append(error_msg)
-        return ListFileOutput(content="\n".join(output_lines))
+        error_msg = "Error: List files command timed out after 30 seconds"
+        return ListFileOutput(content=error_msg, error=error_msg)
     except Exception as e:
-        error_msg = (
-            f"[red bold]Error:[/red bold] Error during list files operation: {e}"
-        )
-        output_lines.append(error_msg)
-        return ListFileOutput(content="\n".join(output_lines))
+        error_msg = f"Error: Error during list files operation: {e}"
+        return ListFileOutput(content=error_msg, error=error_msg)
     finally:
         # Clean up the temporary ignore file
         if ignore_file and os.path.exists(ignore_file):
@@ -431,59 +406,48 @@ def _list_files(
     file_count = sum(1 for item in results if item.type == "file")
     total_size = sum(item.size for item in results if item.type == "file")
 
-    # Build the directory header section
-    dir_name = os.path.basename(directory) or directory
-    dir_header = f"\U0001f4c1 [bold blue]{dir_name}[/bold blue]"
-    output_lines.append(dir_header)
-
-    # Sort all items by path for consistent display
-    all_items = sorted(results, key=lambda x: x.path)
-
-    # Build file and directory tree representation
-    parent_dirs_with_content = set()
-    for item in all_items:
-        # Skip root directory entries with no path
+    # Build structured FileEntry objects for the UI
+    file_entries = []
+    for item in sorted(results, key=lambda x: x.path):
         if item.type == "directory" and not item.path:
             continue
+        file_entries.append(
+            FileEntry(
+                path=item.path,
+                type="dir" if item.type == "directory" else "file",
+                size=item.size,
+                depth=item.depth or 0,
+            )
+        )
 
-        # Track parent directories that contain files/dirs
-        if os.sep in item.path:
-            parent_path = os.path.dirname(item.path)
-            parent_dirs_with_content.add(parent_path)
-
-        # Calculate indentation depth based on path separators
-        depth = item.path.count(os.sep) + 1 if item.path else 0
-        prefix = ""
-        for d in range(depth):
-            if d == depth - 1:
-                prefix += "\u2514\u2500\u2500 "
-            else:
-                prefix += "    "
+    # Emit structured message for the UI
+    file_listing_msg = FileListingMessage(
+        directory=directory,
+        files=file_entries,
+        recursive=recursive,
+        total_size=total_size,
+        dir_count=dir_count,
+        file_count=file_count,
+    )
+    get_message_bus().emit(file_listing_msg)
 
-        # Get the display name (basename) of the item
+    # Build plain text output for LLM consumption
+    for item in sorted(results, key=lambda x: x.path):
+        if item.type == "directory" and not item.path:
+            continue
         name = os.path.basename(item.path) or item.path
-
-        # Add directory or file line with appropriate formatting
+        indent = "  " * (item.depth or 0)
         if item.type == "directory":
-            dir_line = f"{prefix}\U0001f4c1 [bold blue]{name}/[/bold blue]"
-            output_lines.append(dir_line)
+            output_lines.append(f"{indent}{name}/")
         else:
-            icon = get_file_icon(item.path)
             size_str = format_size(item.size)
-            file_line = f"{prefix}{icon} [green]{name}[/green] [dim]({size_str})[/dim]"
-            output_lines.append(file_line)
-
-    # Add summary information
-    summary_header = "\n[bold cyan]Summary:[/bold cyan]"
-    output_lines.append(summary_header)
+            output_lines.append(f"{indent}{name} ({size_str})")
 
-    summary_line = f"\U0001f4c1 [blue]{dir_count} directories[/blue], \U0001f4c4 [green]{file_count} files[/green] [dim]({format_size(total_size)} total)[/dim]"
-    output_lines.append(summary_line)
-
-    final_divider = "[dim]" + "─" * 100 + "\n" + "[/dim]"
-    output_lines.append(final_divider)
+    # Add summary
+    output_lines.append(
+        f"\nSummary: {dir_count} directories, {file_count} files ({format_size(total_size)} total)"
+    )
 
-    # Return the content string
     return ListFileOutput(content="\n".join(output_lines))
 
 
@@ -495,15 +459,6 @@ def _read_file(
 ) -> ReadFileOutput:
     file_path = os.path.abspath(os.path.expanduser(file_path))
 
-    # Generate group_id for this tool execution
-    group_id = generate_group_id("read_file", file_path)
-
-    # Build console message with optional parameters
-    console_msg = f"\n[bold white on blue] READ FILE [/bold white on blue] \U0001f4c2 [bold cyan]{file_path}[/bold cyan]"
-    if start_line is not None and num_lines is not None:
-        console_msg += f" [dim](lines {start_line}-{start_line + num_lines - 1})[/dim]"
-    emit_info(console_msg, message_group=group_id)
-
     if not os.path.exists(file_path):
         error_msg = f"File {file_path} does not exist"
         return ReadFileOutput(content=error_msg, num_tokens=0, error=error_msg)
@@ -552,6 +507,30 @@ def _read_file(
                     error="The file is massive, greater than 10,000 tokens which is dangerous to read entirely. Please read this file in chunks.",
                     num_tokens=0,
                 )
+
+            # Count total lines for the message
+            total_lines = content.count("\n") + (
+                1 if content and not content.endswith("\n") else 0
+            )
+
+            # Emit structured message for the UI
+            # Only include start_line/num_lines if they are valid positive integers
+            emit_start_line = (
+                start_line if start_line is not None and start_line >= 1 else None
+            )
+            emit_num_lines = (
+                num_lines if num_lines is not None and num_lines >= 1 else None
+            )
+            file_content_msg = FileContentMessage(
+                path=file_path,
+                content=content,
+                start_line=emit_start_line,
+                num_lines=emit_num_lines,
+                total_lines=total_lines,
+                num_tokens=num_tokens,
+            )
+            get_message_bus().emit(file_content_msg)
+
         return ReadFileOutput(content=content, num_tokens=num_tokens)
     except (FileNotFoundError, PermissionError):
         # For backward compatibility with tests, return "FILE NOT FOUND" for these specific errors
@@ -601,14 +580,7 @@ def _grep(context: RunContext, search_string: str, directory: str = ".") -> Grep
 
     directory = os.path.abspath(os.path.expanduser(directory))
     matches: List[MatchInfo] = []
-
-    # Generate group_id for this tool execution
-    group_id = generate_group_id("grep", f"{directory}_{search_string}")
-
-    emit_info(
-        f"\n[bold white on blue] GREP [/bold white on blue] \U0001f4c2 [bold cyan]{directory}[/bold cyan] [dim]for '{search_string}'[/dim]",
-        message_group=group_id,
-    )
+    error_message: str | None = None
 
     # Create a temporary ignore file with our ignore patterns
     ignore_file = None
@@ -640,11 +612,10 @@ def _grep(context: RunContext, search_string: str, directory: str = ".") -> Grep
                     break
 
         if not rg_path:
-            emit_error(
-                "ripgrep (rg) not found. Please install ripgrep to use this tool.",
-                message_group=group_id,
+            error_message = (
+                "ripgrep (rg) not found. Please install ripgrep to use this tool."
             )
-            return GrepOutput(matches=[])
+            return GrepOutput(matches=[], error=error_message)
 
         cmd = [
             rg_path,
@@ -712,101 +683,43 @@ def _grep(context: RunContext, search_string: str, directory: str = ".") -> Grep
                 # Skip lines that aren't valid JSON
                 continue
 
-        if not matches:
-            emit_warning(
-                f"No matches found for '{search_string}' in {directory}",
-                message_group=group_id,
-            )
-        else:
-            # Check if verbose output is enabled
-            from collections import defaultdict
-
-            from code_puppy.config import get_grep_output_verbose
-
-            matches_by_file = defaultdict(list)
-            for match in matches:
-                matches_by_file[match.file_path].append(match)
-
-            verbose = get_grep_output_verbose()
-
-            if verbose:
-                # Verbose mode: Show full output with line numbers and content
-                emit_info(
-                    "\n[bold cyan]─────────────────────────────────────────────────────[/bold cyan]",
-                    message_group=group_id,
-                )
-
-                for file_path in sorted(matches_by_file.keys()):
-                    file_matches = matches_by_file[file_path]
-                    emit_info(
-                        f"\n[bold white]📄 {file_path}[/bold white] [dim]({len(file_matches)} match{'es' if len(file_matches) != 1 else ''})[/dim]",
-                        message_group=group_id,
-                    )
-
-                    # Show each match with line number and content
-                    for match in file_matches:
-                        line = match.line_content
-                        search_term = search_string.split()[-1]
-                        if search_term.startswith("-"):
-                            search_term = (
-                                search_string.split()[0]
-                                if search_string.split()
-                                else search_string
-                            )
-
-                        # Case-insensitive highlighting
-                        import re
-
-                        highlighted_line = (
-                            re.sub(
-                                f"({re.escape(search_term)})",
-                                r"[bold yellow on black]\1[/bold yellow on black]",
-                                line,
-                                flags=re.IGNORECASE,
-                            )
-                            if search_term and not search_term.startswith("-")
-                            else line
-                        )
-
-                        emit_info(
-                            f"  [bold cyan]{match.line_number:4d}[/bold cyan] │ {highlighted_line}",
-                            message_group=group_id,
-                        )
-
-                emit_info(
-                    "\n[bold cyan]─────────────────────────────────────────────────────[/bold cyan]",
-                    message_group=group_id,
-                )
-            else:
-                # Concise mode (default): Show only file summaries
-                emit_info("", message_group=group_id)
-                for file_path in sorted(matches_by_file.keys()):
-                    file_matches = matches_by_file[file_path]
-                    emit_info(
-                        f"[dim]📄 {file_path} ({len(file_matches)} match{'es' if len(file_matches) != 1 else ''})[/dim]",
-                        message_group=group_id,
-                    )
-
-            emit_success(
-                f"✓ Found [bold]{len(matches)}[/bold] match{'es' if len(matches) != 1 else ''} across [bold]{len(matches_by_file)}[/bold] file{'s' if len(matches_by_file) != 1 else ''}",
-                message_group=group_id,
-            )
-
     except subprocess.TimeoutExpired:
-        emit_error("Grep command timed out after 30 seconds", message_group=group_id)
+        error_message = "Grep command timed out after 30 seconds"
     except FileNotFoundError:
-        emit_error(
-            "ripgrep (rg) not found. Please install ripgrep to use this tool.",
-            message_group=group_id,
+        error_message = (
+            "ripgrep (rg) not found. Please install ripgrep to use this tool."
         )
     except Exception as e:
-        emit_error(f"Error during grep operation: {e}", message_group=group_id)
+        error_message = f"Error during grep operation: {e}"
     finally:
         # Clean up the temporary ignore file
         if ignore_file and os.path.exists(ignore_file):
             os.unlink(ignore_file)
 
-    return GrepOutput(matches=matches)
+    # Build structured GrepMatch objects for the UI
+    grep_matches = [
+        GrepMatch(
+            file_path=m.file_path or "",
+            line_number=m.line_number or 1,
+            line_content=m.line_content or "",
+        )
+        for m in matches
+    ]
+
+    # Count unique files searched (approximation based on matches)
+    unique_files = len(set(m.file_path for m in matches)) if matches else 0
+
+    # Emit structured message for the UI (only once, at the end)
+    grep_result_msg = GrepResultMessage(
+        search_term=search_string,
+        directory=directory,
+        matches=grep_matches,
+        total_matches=len(matches),
+        files_searched=unique_files,
+    )
+    get_message_bus().emit(grep_result_msg)
+
+    return GrepOutput(matches=matches, error=error_message)
 
 
 def register_list_files(agent):
@@ -867,10 +780,8 @@ def register_list_files(agent):
             recursive = False
         result = _list_files(context, directory, recursive)
 
-        # Emit the content directly to ensure it's displayed to the user
-        emit_info(
-            result.content, message_group=generate_group_id("list_files", directory)
-        )
+        # The structured FileListingMessage is already emitted by _list_files
+        # No need to emit again here
         if warning:
             result.error = warning
         if (len(result.content)) > 200000:

code_puppy/version_checker.py

@@ -1,6 +1,9 @@
+"""Version checking utilities for Code Puppy."""
+
 import httpx
 
-from code_puppy.tools.common import console
+from code_puppy.messaging import emit_info, emit_success, emit_warning, get_message_bus
+from code_puppy.messaging.messages import VersionCheckMessage
 
 
 def normalize_version(version_str):
@@ -15,25 +18,37 @@ def versions_are_equal(current, latest):
 
 def fetch_latest_version(package_name):
     try:
-        response = httpx.get(f"https://pypi.org/pypi/{package_name}/json")
-        response.raise_for_status()  # Raise an error for bad responses
+        response = httpx.get(f"https://pypi.org/pypi/{package_name}/json", timeout=5.0)
+        response.raise_for_status()
         data = response.json()
         return data["info"]["version"]
     except Exception as e:
-        print(f"Error fetching version: {e}")
+        emit_warning(f"Error fetching version: {e}")
         return None
 
 
 def default_version_mismatch_behavior(current_version):
+    # Defensive: ensure current_version is never None
+    if current_version is None:
+        current_version = "0.0.0-unknown"
+        emit_warning("Could not detect current version, using fallback")
+
     latest_version = fetch_latest_version("code-puppy")
 
-    # Always print the current version
-    console.print(f"Current version: {current_version}")
+    update_available = bool(latest_version and latest_version != current_version)
+
+    # Emit structured version check message
+    version_msg = VersionCheckMessage(
+        current_version=current_version,
+        latest_version=latest_version or current_version,
+        update_available=update_available,
+    )
+    get_message_bus().emit(version_msg)
+
+    # Also emit plain text for legacy renderer
+    emit_info(f"Current version: {current_version}")
 
-    if latest_version and latest_version != current_version:
-        # Show both versions and update message when they're different
-        console.print(f"Latest version: {latest_version}")
-        console.print(
-            f"[bold yellow]A new version of code puppy is available: {latest_version}[/bold yellow]"
-        )
-        console.print("[bold green]Please consider updating![/bold green]")
+    if update_available:
+        emit_info(f"Latest version: {latest_version}")
+        emit_warning(f"A new version of code puppy is available: {latest_version}")
+        emit_success("Please consider updating!")

{code_puppy-0.0.287.data → code_puppy-0.0.323.data}/data/code_puppy/models.json

@@ -1,7 +1,7 @@
 {
-  "synthetic-GLM-4.6": {
+  "synthetic-GLM-4.7": {
     "type": "custom_openai",
-    "name": "hf:zai-org/GLM-4.6",
+    "name": "hf:zai-org/GLM-4.7",
     "custom_endpoint": {
       "url": "https://api.synthetic.new/openai/v1/",
       "api_key": "$SYN_API_KEY"
@@ -45,13 +45,15 @@
     "type": "openai",
     "name": "gpt-5.1",
     "context_length": 272000,
-    "supported_settings": ["reasoning_effort", "verbosity"]
+    "supported_settings": ["reasoning_effort", "verbosity"],
+    "supports_xhigh_reasoning": false
   },
   "gpt-5.1-codex-api": {
     "type": "openai",
     "name": "gpt-5.1-codex",
     "context_length": 272000,
-    "supported_settings": ["reasoning_effort"]
+    "supported_settings": ["reasoning_effort", "verbosity"],
+    "supports_xhigh_reasoning": true
   },
   "Cerebras-GLM-4.6": {
     "type": "cerebras",
@@ -79,7 +81,7 @@
     "type": "anthropic",
     "name": "claude-opus-4-5",
     "context_length": 200000,
-    "supported_settings": ["temperature", "extended_thinking", "budget_tokens"]
+    "supported_settings": ["temperature", "extended_thinking", "budget_tokens", "interleaved_thinking"]
   },
   "zai-glm-4.6-coding": {
     "type": "zai_coding",
@@ -92,5 +94,17 @@
     "name": "glm-4.6",
     "context_length": 200000,
     "supported_settings": ["temperature"]
+  },
+  "zai-glm-4.7-coding": {
+    "type": "zai_coding",
+    "name": "glm-4.7",
+    "context_length": 200000,
+    "supported_settings": ["temperature"]
+  },
+  "zai-glm-4.7-api": {
+    "type": "zai_api",
+    "name": "glm-4.7",
+    "context_length": 200000,
+    "supported_settings": ["temperature"]
   }
 }

{code_puppy-0.0.287.dist-info → code_puppy-0.0.323.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.287
+Version: 0.0.323
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
@@ -15,22 +15,18 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Code Generators
 Requires-Python: <3.14,>=3.11
-Requires-Dist: bs4>=0.0.2
 Requires-Dist: camoufox>=0.4.11
 Requires-Dist: dbos>=2.5.0
-Requires-Dist: fastapi>=0.110.0
-Requires-Dist: httpx-limiter>=0.3.0
+Requires-Dist: fastapi>=0.111.0
 Requires-Dist: httpx[http2]>=0.24.1
 Requires-Dist: json-repair>=0.46.2
 Requires-Dist: logfire>=0.7.1
 Requires-Dist: openai>=1.99.1
-Requires-Dist: pathspec>=0.11.0
 Requires-Dist: playwright>=1.40.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic-ai==1.25.0
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pyfiglet>=0.8.post1
-Requires-Dist: pyjwt>=2.8.0
 Requires-Dist: pytest-cov>=6.1.1
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: rapidfuzz>=3.13.0
@@ -38,8 +34,7 @@ Requires-Dist: rich>=13.4.2
 Requires-Dist: ripgrep==14.1.0
 Requires-Dist: ruff>=0.11.11
 Requires-Dist: tenacity>=8.2.0
-Requires-Dist: termcolor>=3.1.0
-Requires-Dist: uvicorn>=0.29.0
+Requires-Dist: uvicorn>=0.30.0
 Description-Content-Type: text/markdown
 
 <div align="center">