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

code_puppy/tools/common.py

@@ -29,7 +29,13 @@ except ImportError:
 
 # Import our queue-based console system
 try:
-    from code_puppy.messaging import get_queue_console
+    from code_puppy.messaging import (
+        emit_error,
+        emit_info,
+        emit_success,
+        emit_warning,
+        get_queue_console,
+    )
 
     # Use queue console by default, but allow fallback
     NO_COLOR = bool(int(os.environ.get("CODE_PUPPY_NO_COLOR", "0")))
@@ -42,6 +48,19 @@ except ImportError:
     NO_COLOR = bool(int(os.environ.get("CODE_PUPPY_NO_COLOR", "0")))
     console = Console(no_color=NO_COLOR)
 
+    # Provide fallback emit functions
+    def emit_error(msg: str) -> None:
+        console.print(f"[bold red]{msg}[/bold red]")
+
+    def emit_info(msg: str) -> None:
+        console.print(msg)
+
+    def emit_success(msg: str) -> None:
+        console.print(f"[bold green]{msg}[/bold green]")
+
+    def emit_warning(msg: str) -> None:
+        console.print(f"[bold yellow]{msg}[/bold yellow]")
+
 
 def should_suppress_browser() -> bool:
     """Check if browsers should be suppressed (headless mode).
@@ -782,9 +801,7 @@ def format_diff_with_colors(diff_text: str) -> Text:
 
     # Always use beautiful syntax highlighting!
     if not PYGMENTS_AVAILABLE:
-        console.print(
-            "[yellow]Warning: Pygments not available, diffs will look plain[/yellow]"
-        )
+        emit_warning("Pygments not available, diffs will look plain")
         # Return plain text as fallback
         return Text(diff_text)
 
@@ -1088,10 +1105,10 @@ def get_user_approval(
     time.sleep(0.3)  # Let spinners fully stop
 
     # Display panel
-    console = Console()
-    console.print()
-    console.print(panel)
-    console.print()
+    local_console = Console()
+    emit_info("")
+    local_console.print(panel)
+    emit_info("")
 
     # Flush and buffer before selector
     sys.stdout.flush()
@@ -1122,8 +1139,8 @@ def get_user_approval(
         else:
             # User wants to provide feedback
             confirmed = False
-            console.print()
-            console.print(f"[bold cyan]Tell {puppy_name} what to change:[/bold cyan]")
+            emit_info("")
+            emit_info(f"Tell {puppy_name} what to change:")
             user_feedback = Prompt.ask(
                 "[bold green]➤[/bold green]",
                 default="",
@@ -1133,7 +1150,7 @@ def get_user_approval(
                 user_feedback = None
 
     except (KeyboardInterrupt, EOFError):
-        console.print("\n[bold red]⊗ Cancelled by user[/bold red]")
+        emit_error("Cancelled by user")
         confirmed = False
 
     finally:
@@ -1142,9 +1159,9 @@ def get_user_approval(
         # Force Rich console to reset display state to prevent artifacts
         try:
             # Clear Rich's internal display state to prevent artifacts
-            console.file.write("\r")  # Return to start of line
-            console.file.write("\x1b[K")  # Clear current line
-            console.file.flush()
+            local_console.file.write("\r")  # Return to start of line
+            local_console.file.write("\x1b[K")  # Clear current line
+            local_console.file.flush()
         except Exception:
             pass
 
@@ -1153,17 +1170,15 @@ def get_user_approval(
         sys.stderr.flush()
 
     # Show result BEFORE resuming spinners (no puppy litter!)
-    console.print()
+    emit_info("")
     if not confirmed:
         if user_feedback:
-            console.print("[bold red]✗ Rejected with feedback![/bold red]")
-            console.print(
-                f'[bold yellow]📝 Telling {puppy_name}: "{user_feedback}"[/bold yellow]'
-            )
+            emit_error("Rejected with feedback!")
+            emit_warning(f'Telling {puppy_name}: "{user_feedback}"')
         else:
-            console.print("[bold red]✗ Rejected.[/bold red]")
+            emit_error("Rejected.")
     else:
-        console.print("[bold green]✓ Approved![/bold green]")
+        emit_success("Approved!")
 
     # NOW resume spinners after showing the result
     try:
@@ -1258,10 +1273,10 @@ async def get_user_approval_async(
     await asyncio.sleep(0.3)  # Let spinners fully stop
 
     # Display panel
-    console = Console()
-    console.print()
-    console.print(panel)
-    console.print()
+    local_console = Console()
+    emit_info("")
+    local_console.print(panel)
+    emit_info("")
 
     # Flush and buffer before selector
     sys.stdout.flush()
@@ -1292,8 +1307,8 @@ async def get_user_approval_async(
         else:
             # User wants to provide feedback
             confirmed = False
-            console.print()
-            console.print(f"[bold cyan]Tell {puppy_name} what to change:[/bold cyan]")
+            emit_info("")
+            emit_info(f"Tell {puppy_name} what to change:")
             user_feedback = Prompt.ask(
                 "[bold green]➤[/bold green]",
                 default="",
@@ -1303,7 +1318,7 @@ async def get_user_approval_async(
                 user_feedback = None
 
     except (KeyboardInterrupt, EOFError):
-        console.print("\n[bold red]⊗ Cancelled by user[/bold red]")
+        emit_error("Cancelled by user")
         confirmed = False
 
     finally:
@@ -1312,9 +1327,9 @@ async def get_user_approval_async(
         # Force Rich console to reset display state to prevent artifacts
         try:
             # Clear Rich's internal display state to prevent artifacts
-            console.file.write("\r")  # Return to start of line
-            console.file.write("\x1b[K")  # Clear current line
-            console.file.flush()
+            local_console.file.write("\r")  # Return to start of line
+            local_console.file.write("\x1b[K")  # Clear current line
+            local_console.file.flush()
         except Exception:
             pass
 
@@ -1323,17 +1338,15 @@ async def get_user_approval_async(
         sys.stderr.flush()
 
     # Show result BEFORE resuming spinners (no puppy litter!)
-    console.print()
+    emit_info("")
     if not confirmed:
         if user_feedback:
-            console.print("[bold red]✗ Rejected with feedback![/bold red]")
-            console.print(
-                f'[bold yellow]📝 Telling {puppy_name}: "{user_feedback}"[/bold yellow]'
-            )
+            emit_error("Rejected with feedback!")
+            emit_warning(f'Telling {puppy_name}: "{user_feedback}"')
         else:
-            console.print("[bold red]✗ Rejected.[/bold red]")
+            emit_error("Rejected.")
     else:
-        console.print("[bold green]✓ Approved![/bold green]")
+        emit_success("Approved!")
 
     # NOW resume spinners after showing the result
     try:

code_puppy/tools/file_modifications.py

@@ -21,9 +21,14 @@ from pydantic import BaseModel
 from pydantic_ai import RunContext
 
 from code_puppy.callbacks import on_delete_file, on_edit_file
-from code_puppy.messaging import emit_error, emit_info, emit_warning
+from code_puppy.messaging import (  # Structured messaging types
+    DiffLine,
+    DiffMessage,
+    emit_error,
+    emit_warning,
+    get_message_bus,
+)
 from code_puppy.tools.common import _find_best_window, generate_group_id
-from code_puppy.tools.common import format_diff_with_colors as _colorize_diff
 
 
 def _create_rejection_response(file_path: str) -> Dict[str, Any]:
@@ -91,10 +96,78 @@ class ContentPayload(BaseModel):
 EditFilePayload = Union[DeleteSnippetPayload, ReplacementsPayload, ContentPayload]
 
 
-def _print_diff(diff_text: str, message_group: str | None = None) -> None:
-    """Pretty-print *diff_text* with colour-coding.
+def _parse_diff_lines(diff_text: str) -> List[DiffLine]:
+    """Parse unified diff text into structured DiffLine objects.
 
-    Skips printing if the diff was already shown during permission approval.
+    Args:
+        diff_text: Raw unified diff text
+
+    Returns:
+        List of DiffLine objects with line numbers and types
+    """
+    if not diff_text or not diff_text.strip():
+        return []
+
+    diff_lines = []
+    line_number = 0
+
+    for line in diff_text.splitlines():
+        # Determine line type based on diff markers
+        if line.startswith("+") and not line.startswith("+++"):
+            line_type = "add"
+            line_number += 1
+            content = line[1:]  # Remove the + prefix
+        elif line.startswith("-") and not line.startswith("---"):
+            line_type = "remove"
+            line_number += 1
+            content = line[1:]  # Remove the - prefix
+        elif line.startswith("@@"):
+            # Parse hunk header to get line number
+            # Format: @@ -start,count +start,count @@
+            import re
+
+            match = re.search(r"@@ -\d+(?:,\d+)? \+(\d+)", line)
+            if match:
+                line_number = (
+                    int(match.group(1)) - 1
+                )  # Will be incremented on next line
+            line_type = "context"
+            content = line
+        elif line.startswith("---") or line.startswith("+++"):
+            # File headers - treat as context
+            line_type = "context"
+            content = line
+        else:
+            line_type = "context"
+            line_number += 1
+            content = line
+
+        diff_lines.append(
+            DiffLine(
+                line_number=max(1, line_number),
+                type=line_type,
+                content=content,
+            )
+        )
+
+    return diff_lines
+
+
+def _emit_diff_message(
+    file_path: str,
+    operation: str,
+    diff_text: str,
+    old_content: str | None = None,
+    new_content: str | None = None,
+) -> None:
+    """Emit a structured DiffMessage for UI display.
+
+    Args:
+        file_path: Path to the file being modified
+        operation: One of 'create', 'modify', 'delete'
+        diff_text: Raw unified diff text
+        old_content: Original file content (optional)
+        new_content: New file content (optional)
     """
     # Check if diff was already shown during permission prompt
     try:
@@ -108,22 +181,21 @@ def _print_diff(diff_text: str, message_group: str | None = None) -> None:
             clear_diff_shown_flag()
             return
     except ImportError:
-        pass  # Permission handler not available, show diff anyway
-
-    emit_info(
-        "[bold cyan]\n── DIFF ────────────────────────────────────────────────[/bold cyan]",
-        message_group=message_group,
-    )
+        pass  # Permission handler not available, emit anyway
 
-    # Apply color formatting to diff lines
-    formatted_diff = _colorize_diff(diff_text)
+    if not diff_text or not diff_text.strip():
+        return
 
-    emit_info(formatted_diff, highlight=False, message_group=message_group)
+    diff_lines = _parse_diff_lines(diff_text)
 
-    emit_info(
-        "[bold cyan]───────────────────────────────────────────────────────[/bold cyan]",
-        message_group=message_group,
+    diff_msg = DiffMessage(
+        path=file_path,
+        operation=operation,
+        old_content=old_content,
+        new_content=new_content,
+        diff_lines=diff_lines,
     )
+    get_message_bus().emit(diff_msg)
 
 
 def _log_error(
@@ -339,7 +411,7 @@ def delete_snippet_from_file(
     )
     diff = res.get("diff", "")
     if diff:
-        _print_diff(diff, message_group=message_group)
+        _emit_diff_message(file_path, "modify", diff)
     return res
 
 
@@ -369,7 +441,9 @@ def write_to_file(
     )
     diff = res.get("diff", "")
     if diff:
-        _print_diff(diff, message_group=message_group)
+        # Determine operation type based on whether file existed
+        operation = "modify" if overwrite else "create"
+        _emit_diff_message(path, operation, diff, new_content=content)
     return res
 
 
@@ -396,7 +470,7 @@ def replace_in_file(
     res = _replace_in_file(context, path, replacements, message_group=message_group)
     diff = res.get("diff", "")
     if diff:
-        _print_diff(diff, message_group=message_group)
+        _emit_diff_message(path, "modify", diff)
     return res
 
 
@@ -440,9 +514,6 @@ def _edit_file(
     if group_id is None:
         group_id = generate_group_id("edit_file", file_path)
 
-    emit_info(
-        "\n[bold white on blue] EDIT FILE [/bold white on blue]", message_group=group_id
-    )
     try:
         if isinstance(payload, DeleteSnippetPayload):
             return delete_snippet_from_file(
@@ -548,7 +619,10 @@ def _delete_file(
     except Exception as exc:
         _log_error("Unhandled exception in delete_file", exc)
         res = {"error": str(exc), "diff": ""}
-    _print_diff(res.get("diff", ""), message_group=message_group)
+
+    diff = res.get("diff", "")
+    if diff:
+        _emit_diff_message(file_path, "delete", diff)
     return res