code-puppy 0.0.54__tar.gz → 0.0.56__tar.gz

{code_puppy-0.0.54 → code_puppy-0.0.56}/.gitignore

@@ -18,3 +18,5 @@ wheels/
 .pytest_cache/
 
 dummy_path
+
+.idea/

{code_puppy-0.0.54 → code_puppy-0.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.54
+Version: 0.0.56
 Summary: Code generation agent
 Author: Michael Pfaffenberger
 License: MIT
@@ -16,6 +16,7 @@ Requires-Python: >=3.10
 Requires-Dist: bs4>=0.0.2
 Requires-Dist: httpx-limiter>=0.3.0
 Requires-Dist: httpx>=0.24.1
+Requires-Dist: json-repair>=0.46.2
 Requires-Dist: logfire>=0.7.1
 Requires-Dist: pathspec>=0.11.0
 Requires-Dist: prompt-toolkit>=3.0.38
@@ -23,6 +24,7 @@ Requires-Dist: pydantic-ai>=0.1.0
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pytest-cov>=6.1.1
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: rapidfuzz>=3.13.0
 Requires-Dist: rich>=13.4.2
 Requires-Dist: ruff>=0.11.11
 Description-Content-Type: text/markdown

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/agent.py

@@ -1,13 +1,14 @@
 import os
-import pydantic
 from pathlib import Path
+
+import pydantic
 from pydantic_ai import Agent
 
 from code_puppy.agent_prompts import get_system_prompt
 from code_puppy.model_factory import ModelFactory
-from code_puppy.tools.common import console
-from code_puppy.tools import register_all_tools
 from code_puppy.session_memory import SessionMemory
+from code_puppy.tools import register_all_tools
+from code_puppy.tools.common import console
 
 # Environment variables used in this module:
 # - MODELS_JSON_PATH: Optional path to a custom models.json configuration file.

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/agent_prompts.py

@@ -1,4 +1,4 @@
-from code_puppy.config import get_puppy_name, get_owner_name
+from code_puppy.config import get_owner_name, get_puppy_name
 
 SYSTEM_PROMPT_TEMPLATE = """
 You are {puppy_name}, the most loyal digital puppy, helping your owner {owner_name} get coding stuff done! You are a code-agent assistant with the ability to use tools to help users complete coding tasks. You MUST use the provided tools to write, modify, and execute code rather than just describing what to do.

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/command_line/file_path_completion.py

@@ -1,6 +1,7 @@
-import os
 import glob
+import os
 from typing import Iterable
+
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.document import Document
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/command_line/meta_command_handler.py

@@ -1,5 +1,7 @@
 import os
+
 from rich.console import Console
+
 from code_puppy.command_line.model_picker_completion import (
     load_model_names,
     update_model_in_input,

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/command_line/model_picker_completion.py

@@ -1,10 +1,12 @@
-import os
 import json
-from typing import Optional, Iterable
+import os
+from typing import Iterable, Optional
+
+from prompt_toolkit import PromptSession
 from prompt_toolkit.completion import Completer, Completion
-from prompt_toolkit.history import FileHistory
 from prompt_toolkit.document import Document
-from prompt_toolkit import PromptSession
+from prompt_toolkit.history import FileHistory
+
 from code_puppy.config import get_model_name, set_model_name
 
 MODELS_JSON_PATH = os.environ.get("MODELS_JSON_PATH")

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/command_line/prompt_toolkit_completion.py

@@ -1,7 +1,3 @@
-import os
-from code_puppy.command_line.utils import list_directory
-from code_puppy.config import get_puppy_name, get_config_keys, get_value
-
 # ANSI color codes are no longer necessary because prompt_toolkit handles
 # styling via the `Style` class. We keep them here commented-out in case
 # someone needs raw ANSI later, but they are unused in the current code.
@@ -11,23 +7,25 @@ from code_puppy.config import get_puppy_name, get_config_keys, get_value
 # YELLOW = '\033[1;33m'
 # BOLD = '\033[1m'
 import asyncio
+import os
 from typing import Optional
+
 from prompt_toolkit import PromptSession
+from prompt_toolkit.completion import Completer, Completion, merge_completers
 from prompt_toolkit.formatted_text import FormattedText
-from prompt_toolkit.completion import merge_completers
 from prompt_toolkit.history import FileHistory
-from prompt_toolkit.styles import Style
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.keys import Keys
+from prompt_toolkit.styles import Style
 
+from code_puppy.command_line.file_path_completion import FilePathCompleter
 from code_puppy.command_line.model_picker_completion import (
     ModelNameCompleter,
     get_active_model,
     update_model_in_input,
 )
-from code_puppy.command_line.file_path_completion import FilePathCompleter
-
-from prompt_toolkit.completion import Completer, Completion
+from code_puppy.command_line.utils import list_directory
+from code_puppy.config import get_config_keys, get_puppy_name, get_value
 
 
 class SetCompleter(Completer):

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/command_line/utils.py

@@ -1,5 +1,6 @@
 import os
-from typing import Tuple, List
+from typing import List, Tuple
+
 from rich.table import Table
 
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/main.py

@@ -1,25 +1,25 @@
-import asyncio
 import argparse
+import asyncio
 import os
-from code_puppy.version_checker import fetch_latest_version
-from code_puppy import __version__
 import sys
+
 from dotenv import load_dotenv
-from code_puppy.config import ensure_config_exists
-from rich.console import Console
-from rich.markdown import Markdown
-from rich.console import ConsoleOptions, RenderResult
-from rich.markdown import CodeBlock
-from rich.text import Text
+from rich.console import Console, ConsoleOptions, RenderResult
+from rich.markdown import CodeBlock, Markdown
 from rich.syntax import Syntax
+from rich.text import Text
+
+from code_puppy import __version__
+from code_puppy.agent import get_code_generation_agent, session_memory
 from code_puppy.command_line.prompt_toolkit_completion import (
     get_input_with_combined_completion,
     get_prompt_with_active_model,
 )
+from code_puppy.config import ensure_config_exists
 
 # Initialize rich console for pretty output
 from code_puppy.tools.common import console
-from code_puppy.agent import get_code_generation_agent, session_memory
+from code_puppy.version_checker import fetch_latest_version
 
 # from code_puppy.tools import *  # noqa: F403
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/model_factory.py

@@ -1,20 +1,21 @@
-import os
-import json
 import asyncio
+import json
+import os
+import threading
 import time
-from typing import Dict, Any
+from collections import deque
+from typing import Any, Dict
+
+import httpx
+from anthropic import AsyncAnthropic
+from httpx import Response
+from openai import AsyncAzureOpenAI  # For Azure OpenAI client
+from pydantic_ai.models.anthropic import AnthropicModel
 from pydantic_ai.models.gemini import GeminiModel
 from pydantic_ai.models.openai import OpenAIModel
-from pydantic_ai.models.anthropic import AnthropicModel
+from pydantic_ai.providers.anthropic import AnthropicProvider
 from pydantic_ai.providers.google_gla import GoogleGLAProvider
 from pydantic_ai.providers.openai import OpenAIProvider
-from pydantic_ai.providers.anthropic import AnthropicProvider
-from anthropic import AsyncAnthropic
-from openai import AsyncAzureOpenAI  # For Azure OpenAI client
-import httpx
-from httpx import Response
-import threading
-from collections import deque
 
 # Environment variables used in this module:
 # - GEMINI_API_KEY: API key for Google's Gemini models. Required when using Gemini models.

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/session_memory.py

@@ -1,7 +1,7 @@
 import json
-from pathlib import Path
 from datetime import datetime, timedelta
-from typing import Any, List, Dict, Optional
+from pathlib import Path
+from typing import Any, Dict, List, Optional
 
 DEFAULT_MEMORY_PATH = Path(".puppy_session_memory.json")
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/tools/code_map.py

@@ -1,8 +1,9 @@
-import os
 import ast
-from rich.tree import Tree
-from rich.text import Text
+import os
+
 import pathspec
+from rich.text import Text
+from rich.tree import Tree
 
 
 def summarize_node(node: ast.AST) -> str:

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/tools/command_runner.py

@@ -1,11 +1,13 @@
 import subprocess
 import time
-from typing import Dict, Any
-from code_puppy.tools.common import console
+from typing import Any, Dict
+
 from pydantic_ai import RunContext
 from rich.markdown import Markdown
 from rich.syntax import Syntax
 
+from code_puppy.tools.common import console
+
 
 def run_shell_command(
     context: RunContext, command: str, cwd: str = None, timeout: int = 60
@@ -138,8 +140,8 @@ def run_shell_command(
             "success": False,
             "command": command,
             "error": f"Error executing command: {str(e)}",
-            "stdout": "",
-            "stderr": "",
+            "stdout": stdout[-1000:],
+            "stderr": stderr[-1000:],
             "exit_code": -1,
             "timeout": False,
         }

code_puppy-0.0.56/code_puppy/tools/common.py

@@ -0,0 +1,41 @@
+import os
+
+from typing import Optional, Tuple
+
+from rapidfuzz.distance import JaroWinkler
+from rich.console import Console
+
+NO_COLOR = bool(int(os.environ.get("CODE_PUPPY_NO_COLOR", "0")))
+console = Console(no_color=NO_COLOR)
+
+JW_THRESHOLD = 0.95
+
+
+def _find_best_window(
+    haystack_lines: list[str],
+    needle: str,
+) -> Tuple[Optional[Tuple[int, int]], float]:
+    """
+    Return (start, end) indices of the window with the highest
+    Jaro-Winkler similarity to `needle`, along with that score.
+    If nothing clears JW_THRESHOLD, return (None, score).
+    """
+    needle = needle.rstrip("\n")
+    needle_lines = needle.splitlines()
+    win_size = len(needle_lines)
+    best_score = 0.0
+    best_span: Optional[Tuple[int, int]] = None
+    best_window = ""
+    # Pre-join the needle once; join windows on the fly
+    for i in range(len(haystack_lines) - win_size + 1):
+        window = "\n".join(haystack_lines[i : i + win_size])
+        score = JaroWinkler.normalized_similarity(window, needle)
+        if score > best_score:
+            best_score = score
+            best_span = (i, i + win_size)
+            best_window = window
+
+    console.log(f"Best span: {best_span}")
+    console.log(f"Best window: {best_window}")
+    console.log(f"Best score: {best_score}")
+    return (best_span, best_score)

code_puppy-0.0.56/code_puppy/tools/file_modifications.py

@@ -0,0 +1,346 @@
+"""Robust, always-diff-logging file-modification helpers + agent tools.
+
+Key guarantees
+--------------
+1. **A diff is printed _inline_ on every path** (success, no-op, or error) – no decorator magic.
+2. **Full traceback logging** for unexpected errors via `_log_error`.
+3. Helper functions stay print-free and return a `diff` key, while agent-tool wrappers handle
+   all console output.
+"""
+
+from __future__ import annotations
+
+import difflib
+import json
+import os
+import traceback
+from typing import Any, Dict, List
+
+from json_repair import repair_json
+from pydantic_ai import RunContext
+
+from code_puppy.tools.common import _find_best_window, console
+
+
+def _print_diff(diff_text: str) -> None:
+    """Pretty-print *diff_text* with colour-coding (always runs)."""
+    console.print(
+        "[bold cyan]\n── DIFF ────────────────────────────────────────────────[/bold cyan]"
+    )
+    if diff_text and diff_text.strip():
+        for line in diff_text.splitlines():
+            if line.startswith("+") and not line.startswith("+++"):
+                console.print(f"[bold green]{line}[/bold green]", highlight=False)
+            elif line.startswith("-") and not line.startswith("---"):
+                console.print(f"[bold red]{line}[/bold red]", highlight=False)
+            elif line.startswith("@"):
+                console.print(f"[bold cyan]{line}[/bold cyan]", highlight=False)
+            else:
+                console.print(line, highlight=False)
+    else:
+        console.print("[dim]-- no diff available --[/dim]")
+    console.print(
+        "[bold cyan]───────────────────────────────────────────────────────[/bold cyan]"
+    )
+
+
+def _log_error(msg: str, exc: Exception | None = None) -> None:
+    console.print(f"[bold red]Error:[/bold red] {msg}")
+    if exc is not None:
+        console.print(traceback.format_exc(), highlight=False)
+
+
+def _delete_snippet_from_file(
+    context: RunContext | None, file_path: str, snippet: str
+) -> Dict[str, Any]:
+    file_path = os.path.abspath(file_path)
+    diff_text = ""
+    try:
+        if not os.path.exists(file_path) or not os.path.isfile(file_path):
+            return {"error": f"File '{file_path}' does not exist.", "diff": diff_text}
+        with open(file_path, "r", encoding="utf-8") as f:
+            original = f.read()
+        if snippet not in original:
+            return {
+                "error": f"Snippet not found in file '{file_path}'.",
+                "diff": diff_text,
+            }
+        modified = original.replace(snippet, "")
+        diff_text = "".join(
+            difflib.unified_diff(
+                original.splitlines(keepends=True),
+                modified.splitlines(keepends=True),
+                fromfile=f"a/{os.path.basename(file_path)}",
+                tofile=f"b/{os.path.basename(file_path)}",
+                n=3,
+            )
+        )
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(modified)
+        return {
+            "success": True,
+            "path": file_path,
+            "message": "Snippet deleted from file.",
+            "changed": True,
+            "diff": diff_text,
+        }
+    except Exception as exc:  # noqa: BLE001
+        _log_error("Unhandled exception in delete_snippet_from_file", exc)
+        return {"error": str(exc), "diff": diff_text}
+
+
+def _replace_in_file(
+    context: RunContext | None, path: str, replacements: List[Dict[str, str]]
+) -> Dict[str, Any]:
+    """Robust replacement engine with explicit edge‑case reporting."""
+    file_path = os.path.abspath(path)
+
+    with open(file_path, "r", encoding="utf-8") as f:
+        original = f.read()
+
+    modified = original
+    for rep in replacements:
+        old_snippet = rep.get("old_str", "")
+        new_snippet = rep.get("new_str", "")
+
+        if old_snippet and old_snippet in modified:
+            modified = modified.replace(old_snippet, new_snippet)
+            continue
+
+        orig_lines = modified.splitlines()
+        loc, score = _find_best_window(orig_lines, old_snippet)
+
+        if loc is None:
+            return {
+                "error": "No suitable match in file (JW < 0.95)",
+                "jw_score": score,
+                "received": old_snippet,
+                "diff": "",
+            }
+
+        start, end = loc
+        modified = (
+            "\n".join(orig_lines[:start])
+            + "\n"
+            + new_snippet.rstrip("\n")
+            + "\n"
+            + "\n".join(orig_lines[end:])
+        )
+
+    if modified == original:
+        console.print(
+            "[bold yellow]No changes to apply – proposed content is identical.[/bold yellow]"
+        )
+        return {
+            "success": False,
+            "path": file_path,
+            "message": "No changes to apply.",
+            "changed": False,
+            "diff": "",
+        }
+
+    diff_text = "".join(
+        difflib.unified_diff(
+            original.splitlines(keepends=True),
+            modified.splitlines(keepends=True),
+            fromfile=f"a/{os.path.basename(file_path)}",
+            tofile=f"b/{os.path.basename(file_path)}",
+            n=3,
+        )
+    )
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write(modified)
+    return {
+        "success": True,
+        "path": file_path,
+        "message": "Replacements applied.",
+        "changed": True,
+        "diff": diff_text,
+    }
+
+
+def _write_to_file(
+    context: RunContext | None,
+    path: str,
+    content: str,
+    overwrite: bool = False,
+) -> Dict[str, Any]:
+    file_path = os.path.abspath(path)
+
+    try:
+        exists = os.path.exists(file_path)
+        if exists and not overwrite:
+            return {
+                "success": False,
+                "path": file_path,
+                "message": f"Cowardly refusing to overwrite existing file: {file_path}",
+                "changed": False,
+                "diff": "",
+            }
+
+        diff_lines = difflib.unified_diff(
+            [] if not exists else [""],
+            content.splitlines(keepends=True),
+            fromfile="/dev/null" if not exists else f"a/{os.path.basename(file_path)}",
+            tofile=f"b/{os.path.basename(file_path)}",
+            n=3,
+        )
+        diff_text = "".join(diff_lines)
+
+        os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
+        with open(file_path, "w", encoding="utf-8") as f:
+            f.write(content)
+
+        action = "overwritten" if exists else "created"
+        return {
+            "success": True,
+            "path": file_path,
+            "message": f"File '{file_path}' {action} successfully.",
+            "changed": True,
+            "diff": diff_text,
+        }
+
+    except Exception as exc:
+        _log_error("Unhandled exception in write_to_file", exc)
+        return {"error": str(exc), "diff": ""}
+
+
+def register_file_modifications_tools(agent):
+    """Attach file-editing tools to *agent* with mandatory diff rendering."""
+
+    def delete_snippet_from_file(
+        context: RunContext, file_path: str, snippet: str
+    ) -> Dict[str, Any]:
+        console.log(f"🗑️ Deleting snippet from file [bold red]{file_path}[/bold red]")
+        res = _delete_snippet_from_file(context, file_path, snippet)
+        diff = res.get("diff", "")
+        if diff:
+            _print_diff(diff)
+        return res
+
+    def write_to_file(
+        context: RunContext, path: str, content: str, overwrite: bool
+    ) -> Dict[str, Any]:
+        console.log(f"✏️ Writing file [bold blue]{path}[/bold blue]")
+        res = _write_to_file(context, path, content, overwrite=overwrite)
+        diff = res.get("diff", "")
+        if diff:
+            _print_diff(diff)
+        return res
+
+    def replace_in_file(
+        context: RunContext, path: str, replacements: List[Dict[str, str]]
+    ) -> Dict[str, Any]:
+        console.log(f"♻️ Replacing text in [bold yellow]{path}[/bold yellow]")
+        res = _replace_in_file(context, path, replacements)
+        diff = res.get("diff", "")
+        if diff:
+            _print_diff(diff)
+        return res
+
+    @agent.tool(retries=5)
+    def edit_file(context: RunContext, path: str, diff: str) -> Dict[str, Any]:
+        """
+        Unified file editing tool that can:
+        - Create/write a new file when the target does not exist (using raw content or a JSON payload with a "content" key)
+        - Replace text within an existing file via a JSON payload with "replacements" (delegates to internal replace logic)
+        - Delete a snippet from an existing file via a JSON payload with "delete_snippet"
+        Parameters
+        ----------
+        path : str
+            Path to the target file (relative or absolute)
+        diff : str
+            Either:
+              * Raw file content (for file creation)
+              * A JSON string with one of the following shapes:
+                  {"content": "full file contents", "overwrite": true}
+                  {"replacements": [ {"old_str": "foo", "new_str": "bar"}, ... ] }
+                  {"delete_snippet": "text to remove"}
+        The function auto-detects the payload type and routes to the appropriate internal helper.
+        """
+        console.print("\n[bold white on blue] EDIT FILE [/bold white on blue]")
+        file_path = os.path.abspath(path)
+        try:
+            parsed_payload = json.loads(diff)
+        except json.JSONDecodeError:
+            try:
+                console.print(
+                    "[bold yellow] JSON Parsing Failed! TRYING TO REPAIR! [/bold yellow]"
+                )
+                parsed_payload = json.loads(repair_json(diff))
+                console.print(
+                    "[bold green on cyan] SUCCESS - WOOF! [/bold green on cyan]"
+                )
+            except Exception as e:
+                console.print(
+                    f"[bold red] Unable to parse diff [/bold red] -- {str(e)}"
+                )
+                return {
+                    "success": False,
+                    "path": file_path,
+                    "message": f"Unable to parse diff JSON -- {str(e)}",
+                    "changed": False,
+                    "diff": "",
+                }
+        if isinstance(parsed_payload, dict):
+            if "delete_snippet" in parsed_payload:
+                snippet = parsed_payload["delete_snippet"]
+                return delete_snippet_from_file(context, file_path, snippet)
+            if "replacements" in parsed_payload:
+                replacements = parsed_payload["replacements"]
+                return replace_in_file(context, file_path, replacements)
+            if "content" in parsed_payload:
+                content = parsed_payload["content"]
+                overwrite = bool(parsed_payload.get("overwrite", False))
+                file_exists = os.path.exists(file_path)
+                if file_exists and not overwrite:
+                    return {
+                        "success": False,
+                        "path": file_path,
+                        "message": f"File '{file_path}' exists. Set 'overwrite': true to replace.",
+                        "changed": False,
+                    }
+                return write_to_file(context, file_path, content, overwrite)
+        console.print(
+            "[bold red] Unable to route file modification tool call to sub-tool [/bold red]"
+        )
+        console.print("Inputs: ", path, diff)
+        return {
+            "success": False,
+            "path": file_path,
+            "message": "Wasn't able to route file modification to the right sub-tool!",
+            "changed": False,
+        }
+
+    @agent.tool
+    def delete_file(context: RunContext, file_path: str) -> Dict[str, Any]:
+        console.log(f"🗑️ Deleting file [bold red]{file_path}[/bold red]")
+        file_path = os.path.abspath(file_path)
+        try:
+            if not os.path.exists(file_path) or not os.path.isfile(file_path):
+                res = {"error": f"File '{file_path}' does not exist.", "diff": ""}
+            else:
+                with open(file_path, "r", encoding="utf-8") as f:
+                    original = f.read()
+                diff_text = "".join(
+                    difflib.unified_diff(
+                        original.splitlines(keepends=True),
+                        [],
+                        fromfile=f"a/{os.path.basename(file_path)}",
+                        tofile=f"b/{os.path.basename(file_path)}",
+                        n=3,
+                    )
+                )
+                os.remove(file_path)
+                res = {
+                    "success": True,
+                    "path": file_path,
+                    "message": f"File '{file_path}' deleted successfully.",
+                    "changed": True,
+                    "diff": diff_text,
+                }
+        except Exception as exc:
+            _log_error("Unhandled exception in delete_file", exc)
+            res = {"error": str(exc), "diff": ""}
+        _print_diff(res.get("diff", ""))
+        return res

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/tools/file_operations.py

@@ -1,10 +1,12 @@
 # file_operations.py
-import os
 import fnmatch
-from typing import List, Dict, Any
-from code_puppy.tools.common import console
+import os
+from typing import Any, Dict, List
+
 from pydantic_ai import RunContext
 
+from code_puppy.tools.common import console
+
 # ---------------------------------------------------------------------------
 # Module-level helper functions (exposed for unit tests _and_ used as tools)
 # ---------------------------------------------------------------------------
@@ -40,29 +42,148 @@ def should_ignore_path(path: str) -> bool:
 def _list_files(
     context: RunContext, directory: str = ".", recursive: bool = True
 ) -> List[Dict[str, Any]]:
-    """Light-weight `list_files` implementation sufficient for unit-tests and agent tooling."""
+    results = []
+    directory = os.path.abspath(directory)
+    console.print("\n[bold white on blue] DIRECTORY LISTING [/bold white on blue]")
     console.print(
-        f"\n[bold white on blue] LIST FILES [/bold white on blue] \U0001f4c2 [bold cyan]{directory}[/bold cyan]"
+        f"\U0001f4c2 [bold cyan]{directory}[/bold cyan] [dim](recursive={recursive})[/dim]"
     )
     console.print("[dim]" + "-" * 60 + "[/dim]")
-    directory = os.path.abspath(directory)
-    results: List[Dict[str, Any]] = []
-    if not os.path.exists(directory) or not os.path.isdir(directory):
+    if not os.path.exists(directory):
         console.print(
-            f"[bold red]Directory '{directory}' does not exist or is not a directory[/bold red]"
+            f"[bold red]Error:[/bold red] Directory '{directory}' does not exist"
         )
-        return [
-            {"error": f"Directory '{directory}' does not exist or is not a directory"}
-        ]
+        console.print("[dim]" + "-" * 60 + "[/dim]\n")
+        return [{"error": f"Directory '{directory}' does not exist"}]
+    if not os.path.isdir(directory):
+        console.print(f"[bold red]Error:[/bold red] '{directory}' is not a directory")
+        console.print("[dim]" + "-" * 60 + "[/dim]\n")
+        return [{"error": f"'{directory}' is not a directory"}]
+    folder_structure = {}
+    file_list = []
     for root, dirs, files in os.walk(directory):
-        rel_root = os.path.relpath(root, directory)
-        if rel_root == ".":
-            rel_root = ""
-        for f in files:
-            fp = os.path.join(rel_root, f) if rel_root else f
-            results.append({"path": fp, "type": "file"})
+        dirs[:] = [d for d in dirs if not should_ignore_path(os.path.join(root, d))]
+        rel_path = os.path.relpath(root, directory)
+        depth = 0 if rel_path == "." else rel_path.count(os.sep) + 1
+        if rel_path == ".":
+            rel_path = ""
+        if rel_path:
+            dir_path = os.path.join(directory, rel_path)
+            results.append(
+                {
+                    "path": rel_path,
+                    "type": "directory",
+                    "size": 0,
+                    "full_path": dir_path,
+                    "depth": depth,
+                }
+            )
+            folder_structure[rel_path] = {
+                "path": rel_path,
+                "depth": depth,
+                "full_path": dir_path,
+            }
+        for file in files:
+            file_path = os.path.join(root, file)
+            if should_ignore_path(file_path):
+                continue
+            rel_file_path = os.path.join(rel_path, file) if rel_path else file
+            try:
+                size = os.path.getsize(file_path)
+                file_info = {
+                    "path": rel_file_path,
+                    "type": "file",
+                    "size": size,
+                    "full_path": file_path,
+                    "depth": depth,
+                }
+                results.append(file_info)
+                file_list.append(file_info)
+            except (FileNotFoundError, PermissionError):
+                continue
         if not recursive:
             break
+
+    def format_size(size_bytes):
+        if size_bytes < 1024:
+            return f"{size_bytes} B"
+        elif size_bytes < 1024 * 1024:
+            return f"{size_bytes / 1024:.1f} KB"
+        elif size_bytes < 1024 * 1024 * 1024:
+            return f"{size_bytes / (1024 * 1024):.1f} MB"
+        else:
+            return f"{size_bytes / (1024 * 1024 * 1024):.1f} GB"
+
+    def get_file_icon(file_path):
+        ext = os.path.splitext(file_path)[1].lower()
+        if ext in [".py", ".pyw"]:
+            return "\U0001f40d"
+        elif ext in [".js", ".jsx", ".ts", ".tsx"]:
+            return "\U0001f4dc"
+        elif ext in [".html", ".htm", ".xml"]:
+            return "\U0001f310"
+        elif ext in [".css", ".scss", ".sass"]:
+            return "\U0001f3a8"
+        elif ext in [".md", ".markdown", ".rst"]:
+            return "\U0001f4dd"
+        elif ext in [".json", ".yaml", ".yml", ".toml"]:
+            return "\u2699\ufe0f"
+        elif ext in [".jpg", ".jpeg", ".png", ".gif", ".svg", ".webp"]:
+            return "\U0001f5bc\ufe0f"
+        elif ext in [".mp3", ".wav", ".ogg", ".flac"]:
+            return "\U0001f3b5"
+        elif ext in [".mp4", ".avi", ".mov", ".webm"]:
+            return "\U0001f3ac"
+        elif ext in [".pdf", ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx"]:
+            return "\U0001f4c4"
+        elif ext in [".zip", ".tar", ".gz", ".rar", ".7z"]:
+            return "\U0001f4e6"
+        elif ext in [".exe", ".dll", ".so", ".dylib"]:
+            return "\u26a1"
+        else:
+            return "\U0001f4c4"
+
+    if results:
+        files = sorted(
+            [f for f in results if f["type"] == "file"], key=lambda x: x["path"]
+        )
+        console.print(
+            f"\U0001f4c1 [bold blue]{os.path.basename(directory) or directory}[/bold blue]"
+        )
+    all_items = sorted(results, key=lambda x: x["path"])
+    parent_dirs_with_content = set()
+    for i, item in enumerate(all_items):
+        if item["type"] == "directory" and not item["path"]:
+            continue
+        if os.sep in item["path"]:
+            parent_path = os.path.dirname(item["path"])
+            parent_dirs_with_content.add(parent_path)
+        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 += "    "
+        name = os.path.basename(item["path"]) or item["path"]
+        if item["type"] == "directory":
+            console.print(f"{prefix}\U0001f4c1 [bold blue]{name}/[/bold blue]")
+        else:
+            icon = get_file_icon(item["path"])
+            size_str = format_size(item["size"])
+            console.print(
+                f"{prefix}{icon} [green]{name}[/green] [dim]({size_str})[/dim]"
+            )
+    else:
+        console.print("[yellow]Directory is empty[/yellow]")
+    dir_count = sum(1 for item in results if item["type"] == "directory")
+    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")
+    console.print("\n[bold cyan]Summary:[/bold cyan]")
+    console.print(
+        f"\U0001f4c1 [blue]{dir_count} directories[/blue], \U0001f4c4 [green]{file_count} files[/green] [dim]({format_size(total_size)} total)[/dim]"
+    )
+    console.print("[dim]" + "-" * 60 + "[/dim]\n")
     return results
 
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/tools/web_search.py

@@ -1,4 +1,5 @@
 from typing import Dict
+
 import requests
 from pydantic_ai import RunContext
 

{code_puppy-0.0.54 → code_puppy-0.0.56}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.54"
+version = "0.0.56"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -21,6 +21,8 @@ dependencies = [
     "httpx-limiter>=0.3.0",
     "prompt-toolkit>=3.0.38",
     "pathspec>=0.11.0",
+    "rapidfuzz>=3.13.0",
+    "json-repair>=0.46.2",
 ]
 authors = [
     {name = "Michael Pfaffenberger"}

code_puppy-0.0.54/code_puppy/tools/common.py

@@ -1,5 +0,0 @@
-import os
-from rich.console import Console
-
-NO_COLOR = bool(int(os.environ.get("CODE_PUPPY_NO_COLOR", "0")))
-console = Console(no_color=NO_COLOR)

code_puppy-0.0.54/code_puppy/tools/file_modifications.py

@@ -1,410 +0,0 @@
-# file_modifications.py
-"""Robust, always-diff-logging file-modification helpers + agent tools.
-
-Key guarantees
---------------
-1. **A diff is printed _inline_ on every path** (success, no-op, or error) – no decorator magic.
-2. **Full traceback logging** for unexpected errors via `_log_error`.
-3. Helper functions stay print-free and return a `diff` key, while agent-tool wrappers handle
-   all console output.
-"""
-
-from __future__ import annotations
-
-import ast
-import difflib
-import json
-import os
-import traceback
-from typing import Any, Dict, List
-
-from code_puppy.tools.common import console
-from pydantic_ai import RunContext
-
-# ---------------------------------------------------------------------------
-# Console helpers – shared across tools
-# ---------------------------------------------------------------------------
-
-
-def _print_diff(diff_text: str) -> None:
-    """Pretty-print *diff_text* with colour-coding (always runs)."""
-    console.print(
-        "[bold cyan]\n── DIFF ────────────────────────────────────────────────[/bold cyan]"
-    )
-    if diff_text and diff_text.strip():
-        for line in diff_text.splitlines():
-            if line.startswith("+") and not line.startswith("+++"):
-                console.print(f"[bold green]{line}[/bold green]", highlight=False)
-            elif line.startswith("-") and not line.startswith("---"):
-                console.print(f"[bold red]{line}[/bold red]", highlight=False)
-            elif line.startswith("@"):
-                console.print(f"[bold cyan]{line}[/bold cyan]", highlight=False)
-            else:
-                console.print(line, highlight=False)
-    else:
-        console.print("[dim]-- no diff available --[/dim]")
-    console.print(
-        "[bold cyan]───────────────────────────────────────────────────────[/bold cyan]"
-    )
-
-
-def _log_error(msg: str, exc: Exception | None = None) -> None:
-    console.print(f"[bold red]Error:[/bold red] {msg}")
-    if exc is not None:
-        console.print(traceback.format_exc(), highlight=False)
-
-
-# ---------------------------------------------------------------------------
-# Pure helpers – no console output
-# ---------------------------------------------------------------------------
-
-
-def _delete_snippet_from_file(
-    context: RunContext | None, file_path: str, snippet: str
-) -> Dict[str, Any]:
-    file_path = os.path.abspath(file_path)
-    diff_text = ""
-    try:
-        if not os.path.exists(file_path) or not os.path.isfile(file_path):
-            return {"error": f"File '{file_path}' does not exist.", "diff": diff_text}
-        with open(file_path, "r", encoding="utf-8") as f:
-            original = f.read()
-        if snippet not in original:
-            return {
-                "error": f"Snippet not found in file '{file_path}'.",
-                "diff": diff_text,
-            }
-        modified = original.replace(snippet, "")
-        diff_text = "".join(
-            difflib.unified_diff(
-                original.splitlines(keepends=True),
-                modified.splitlines(keepends=True),
-                fromfile=f"a/{os.path.basename(file_path)}",
-                tofile=f"b/{os.path.basename(file_path)}",
-                n=3,
-            )
-        )
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(modified)
-        return {
-            "success": True,
-            "path": file_path,
-            "message": "Snippet deleted from file.",
-            "changed": True,
-            "diff": diff_text,
-        }
-    except Exception as exc:  # noqa: BLE001
-        _log_error("Unhandled exception in delete_snippet_from_file", exc)
-        return {"error": str(exc), "diff": diff_text}
-
-
-def _replace_in_file(
-    context: RunContext | None, path: str, diff: str
-) -> Dict[str, Any]:
-    """Robust replacement engine with explicit edge‑case reporting."""
-    file_path = os.path.abspath(path)
-    preview = (diff[:400] + "…") if len(diff) > 400 else diff  # for logs / errors
-    diff_text = ""
-    try:
-        if not os.path.exists(file_path):
-            return {"error": f"File '{file_path}' does not exist", "diff": preview}
-
-        # ── Parse diff payload (tolerate single quotes) ──────────────────
-        try:
-            payload = json.loads(diff)
-        except json.JSONDecodeError:
-            try:
-                payload = json.loads(diff.replace("'", '"'))
-            except Exception as exc:
-                return {
-                    "error": "Could not parse diff as JSON.",
-                    "reason": str(exc),
-                    "received": preview,
-                    "diff": preview,
-                }
-        if not isinstance(payload, dict):
-            try:
-                payload = ast.literal_eval(diff)
-            except Exception as exc:
-                return {
-                    "error": "Diff is neither valid JSON nor Python literal.",
-                    "reason": str(exc),
-                    "received": preview,
-                    "diff": preview,
-                }
-
-        replacements: List[Dict[str, str]] = payload.get("replacements", [])
-        if not replacements:
-            return {
-                "error": "No valid replacements found in diff.",
-                "received": preview,
-                "diff": preview,
-            }
-
-        with open(file_path, "r", encoding="utf-8") as f:
-            original = f.read()
-
-        modified = original
-        for rep in replacements:
-            modified = modified.replace(rep.get("old_str", ""), rep.get("new_str", ""))
-
-        if modified == original:
-            # ── Explicit no‑op edge case ────────────────────────────────
-            console.print(
-                "[bold yellow]No changes to apply – proposed content is identical.[/bold yellow]"
-            )
-            return {
-                "success": False,
-                "path": file_path,
-                "message": "No changes to apply.",
-                "changed": False,
-                "diff": "",  # empty so _print_diff prints placeholder
-            }
-
-        diff_text = "".join(
-            difflib.unified_diff(
-                original.splitlines(keepends=True),
-                modified.splitlines(keepends=True),
-                fromfile=f"a/{os.path.basename(file_path)}",
-                tofile=f"b/{os.path.basename(file_path)}",
-                n=3,
-            )
-        )
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(modified)
-        return {
-            "success": True,
-            "path": file_path,
-            "message": "Replacements applied.",
-            "changed": True,
-            "diff": diff_text,
-        }
-
-    except Exception as exc:  # noqa: BLE001
-        # ── Explicit error edge case ────────────────────────────────────
-        _log_error("Unhandled exception in replace_in_file", exc)
-        return {
-            "error": str(exc),
-            "path": file_path,
-            "diff": preview,  # show the exact diff input that blew up
-        }
-
-
-def _write_to_file(
-    context: RunContext | None,
-    path: str,
-    content: str,
-    overwrite: bool = False,
-) -> Dict[str, Any]:
-    file_path = os.path.abspath(path)
-
-    try:
-        exists = os.path.exists(file_path)
-        if exists and not overwrite:
-            return {
-                "success": False,
-                "path": file_path,
-                "message": f"Cowardly refusing to overwrite existing file: {file_path}",
-                "changed": False,
-                "diff": "",
-            }
-
-        # --- NEW: build diff before writing ---
-        diff_lines = difflib.unified_diff(
-            [] if not exists else [""],  # empty “old” file
-            content.splitlines(keepends=True),  # new file lines
-            fromfile="/dev/null" if not exists else f"a/{os.path.basename(file_path)}",
-            tofile=f"b/{os.path.basename(file_path)}",
-            n=3,
-        )
-        diff_text = "".join(diff_lines)
-
-        os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(content)
-
-        action = "overwritten" if exists else "created"
-        return {
-            "success": True,
-            "path": file_path,
-            "message": f"File '{file_path}' {action} successfully.",
-            "changed": True,
-            "diff": diff_text,
-        }
-
-    except Exception as exc:  # noqa: BLE001
-        _log_error("Unhandled exception in write_to_file", exc)
-        return {"error": str(exc), "diff": ""}
-
-
-def _replace_in_file(
-    context: RunContext | None, path: str, diff: str
-) -> Dict[str, Any]:
-    """Robust replacement engine with explicit edge‑case reporting."""
-    file_path = os.path.abspath(path)
-    preview = (diff[:400] + "…") if len(diff) > 400 else diff  # for logs / errors
-    diff_text = ""
-    try:
-        if not os.path.exists(file_path):
-            return {"error": f"File '{file_path}' does not exist", "diff": preview}
-
-        # ── Parse diff payload (tolerate single quotes) ──────────────────
-        try:
-            payload = json.loads(diff)
-        except json.JSONDecodeError:
-            try:
-                payload = json.loads(diff.replace("'", '"'))
-            except Exception as exc:
-                return {
-                    "error": "Could not parse diff as JSON.",
-                    "reason": str(exc),
-                    "received": preview,
-                    "diff": preview,
-                }
-        if not isinstance(payload, dict):
-            try:
-                payload = ast.literal_eval(diff)
-            except Exception as exc:
-                return {
-                    "error": "Diff is neither valid JSON nor Python literal.",
-                    "reason": str(exc),
-                    "received": preview,
-                    "diff": preview,
-                }
-
-        replacements: List[Dict[str, str]] = payload.get("replacements", [])
-        if not replacements:
-            return {
-                "error": "No valid replacements found in diff.",
-                "received": preview,
-                "diff": preview,
-            }
-
-        with open(file_path, "r", encoding="utf-8") as f:
-            original = f.read()
-
-        modified = original
-        for rep in replacements:
-            modified = modified.replace(rep.get("old_str", ""), rep.get("new_str", ""))
-
-        if modified == original:
-            # ── Explicit no‑op edge case ────────────────────────────────
-            console.print(
-                "[bold yellow]No changes to apply – proposed content is identical.[/bold yellow]"
-            )
-            return {
-                "success": False,
-                "path": file_path,
-                "message": "No changes to apply.",
-                "changed": False,
-                "diff": "",  # empty so _print_diff prints placeholder
-            }
-
-        diff_text = "".join(
-            difflib.unified_diff(
-                original.splitlines(keepends=True),
-                modified.splitlines(keepends=True),
-                fromfile=f"a/{os.path.basename(file_path)}",
-                tofile=f"b/{os.path.basename(file_path)}",
-                n=3,
-            )
-        )
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(modified)
-        return {
-            "success": True,
-            "path": file_path,
-            "message": "Replacements applied.",
-            "changed": True,
-            "diff": diff_text,
-        }
-
-    except Exception as exc:  # noqa: BLE001
-        # ── Explicit error edge case ────────────────────────────────────
-        _log_error("Unhandled exception in replace_in_file", exc)
-        return {
-            "error": str(exc),
-            "path": file_path,
-            "diff": preview,  # show the exact diff input that blew up
-        }
-
-
-# ---------------------------------------------------------------------------
-# Agent-tool registration
-# ---------------------------------------------------------------------------
-
-
-def register_file_modifications_tools(agent):  # noqa: C901 – a bit long but clear
-    """Attach file-editing tools to *agent* with mandatory diff rendering."""
-
-    # ------------------------------------------------------------------
-    # Delete snippet
-    # ------------------------------------------------------------------
-    @agent.tool
-    def delete_snippet_from_file(
-        context: RunContext, file_path: str, snippet: str
-    ) -> Dict[str, Any]:
-        console.log(f"🗑️ Deleting snippet from file [bold red]{file_path}[/bold red]")
-        res = _delete_snippet_from_file(context, file_path, snippet)
-        _print_diff(res.get("diff", ""))
-        return res
-
-    # ------------------------------------------------------------------
-    # Write / create file
-    # ------------------------------------------------------------------
-    @agent.tool
-    def write_to_file(context: RunContext, path: str, content: str) -> Dict[str, Any]:
-        console.log(f"✏️ Writing file [bold blue]{path}[/bold blue]")
-        res = _write_to_file(context, path, content, overwrite=False)
-        _print_diff(res.get("diff", content))
-        return res
-
-    # ------------------------------------------------------------------
-    # Replace text in file
-    # ------------------------------------------------------------------
-    @agent.tool
-    def replace_in_file(context: RunContext, path: str, diff: str) -> Dict[str, Any]:
-        console.log(f"♻️ Replacing text in [bold yellow]{path}[/bold yellow]")
-        res = _replace_in_file(context, path, diff)
-        _print_diff(res.get("diff", diff))
-        return res
-
-    # ------------------------------------------------------------------
-    # Delete entire file
-    # ------------------------------------------------------------------
-    # ------------------------------------------------------------------
-    # Delete entire file (with full diff)
-    # ------------------------------------------------------------------
-    @agent.tool
-    def delete_file(context: RunContext, file_path: str) -> Dict[str, Any]:
-        console.log(f"🗑️ Deleting file [bold red]{file_path}[/bold red]")
-        file_path = os.path.abspath(file_path)
-        try:
-            if not os.path.exists(file_path) or not os.path.isfile(file_path):
-                res = {"error": f"File '{file_path}' does not exist.", "diff": ""}
-            else:
-                with open(file_path, "r", encoding="utf-8") as f:
-                    original = f.read()
-                # Diff: original lines → empty file
-                diff_text = "".join(
-                    difflib.unified_diff(
-                        original.splitlines(keepends=True),
-                        [],
-                        fromfile=f"a/{os.path.basename(file_path)}",
-                        tofile=f"b/{os.path.basename(file_path)}",
-                        n=3,
-                    )
-                )
-                os.remove(file_path)
-                res = {
-                    "success": True,
-                    "path": file_path,
-                    "message": f"File '{file_path}' deleted successfully.",
-                    "changed": True,
-                    "diff": diff_text,
-                }
-        except Exception as exc:  # noqa: BLE001
-            _log_error("Unhandled exception in delete_file", exc)
-            res = {"error": str(exc), "diff": ""}
-        _print_diff(res.get("diff", ""))
-        return res

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/config.py

@@ -1,5 +1,5 @@
-import os
 import configparser
+import os
 
 CONFIG_DIR = os.path.join(os.path.expanduser("~"), ".code_puppy")
 CONFIG_FILE = os.path.join(CONFIG_DIR, "puppy.cfg")

{code_puppy-0.0.54 → code_puppy-0.0.56}/code_puppy/tools/__init__.py

@@ -1,6 +1,6 @@
-from code_puppy.tools.file_operations import register_file_operations_tools
-from code_puppy.tools.file_modifications import register_file_modifications_tools
 from code_puppy.tools.command_runner import register_command_runner_tools
+from code_puppy.tools.file_modifications import register_file_modifications_tools
+from code_puppy.tools.file_operations import register_file_operations_tools
 from code_puppy.tools.web_search import register_web_search_tools