code-puppy 0.0.158__tar.gz → 0.0.160__tar.gz

{code_puppy-0.0.158 → code_puppy-0.0.160}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.158
+Version: 0.0.160
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.158 → code_puppy-0.0.160}/code_puppy/config.py

@@ -164,7 +164,7 @@ _default_model_cache = None
 def _default_model_from_models_json():
     """Attempt to load the first model name from models.json.
 
-    Falls back to the hard-coded default (``claude-4-0-sonnet``) if the file
+    Falls back to the hard-coded default (``gpt-5``) if the file
     cannot be read for any reason or is empty.
     """
     global _default_model_cache
@@ -178,11 +178,17 @@ def _default_model_from_models_json():
         from code_puppy.model_factory import ModelFactory
 
         models_config = ModelFactory.load_config()
-        first_key = next(iter(models_config))  # Raises StopIteration if empty
-        _default_model_cache = first_key
-        return first_key
+        if models_config:
+            # Get the first key from the models config
+            first_key = next(iter(models_config))
+            _default_model_cache = first_key
+            return first_key
+        else:
+            # If models_config is empty, fall back to gpt-5
+            _default_model_cache = "gpt-5"
+            return "gpt-5"
     except Exception:
-        # Any problem (network, file missing, empty dict, etc.) => fall back
+        # Any problem (network, file missing, empty dict, etc.) => fall back to gpt-5
         _default_model_cache = "gpt-5"
         return "gpt-5"
 
@@ -198,8 +204,7 @@ def _validate_model_exists(model_name: str) -> bool:
     try:
         from code_puppy.model_factory import ModelFactory
 
-        models_config_path = os.path.join(CONFIG_DIR, "models.json")
-        models_config = ModelFactory.load_config(models_config_path)
+        models_config = ModelFactory.load_config()
         exists = model_name in models_config
 
         # Cache the result
@@ -487,4 +492,4 @@ def save_command_to_history(command: str):
         error_msg = (
             f"❌ An unexpected error occurred while saving command history: {str(e)}"
         )
-        direct_console.print(f"[bold red]{error_msg}[/bold red]")
+        direct_console.print(f"[bold red]{error_msg}[/bold red]")

{code_puppy-0.0.158 → code_puppy-0.0.160}/code_puppy/messaging/queue_console.py

@@ -58,9 +58,10 @@ class QueueConsole:
                     from rich.console import Console
 
                     string_io = StringIO()
-                    # Use markup=False to prevent interpretation of square brackets as markup
+                    # Use markup=True to properly process rich styling
+                    # Use a reasonable width to prevent wrapping issues
                     temp_console = Console(
-                        file=string_io, width=80, legacy_windows=False, markup=False
+                        file=string_io, width=80, legacy_windows=False, markup=True
                     )
                     temp_console.print(v)
                     processed_values.append(string_io.getvalue().rstrip("\n"))

{code_puppy-0.0.158 → code_puppy-0.0.160}/code_puppy/tools/file_modifications.py

@@ -525,23 +525,31 @@ def register_file_modifications_tools(agent):
         """
         # Generate group_id for edit_file tool execution
         if isinstance(payload, str):
-            # Fallback for weird models that just can't help but send json strings...
-            payload = json.loads(json_repair.repair_json(payload))
-            if "replacements" in payload:
-                payload = ReplacementsPayload(**payload)
-            elif "delete_snippet" in payload:
-                payload = DeleteSnippetPayload(**payload)
-            elif "content" in payload:
-                payload = ContentPayload(**payload)
-            else:
-                file_path = "Unknown"
-                if "file_path" in payload:
-                    file_path = payload["file_path"]
+            try:
+                # Fallback for weird models that just can't help but send json strings...
+                payload = json.loads(json_repair.repair_json(payload))
+                if "replacements" in payload:
+                    payload = ReplacementsPayload(**payload)
+                elif "delete_snippet" in payload:
+                    payload = DeleteSnippetPayload(**payload)
+                elif "content" in payload:
+                    payload = ContentPayload(**payload)
+                else:
+                    file_path = "Unknown"
+                    if "file_path" in payload:
+                        file_path = payload["file_path"]
+                    return {
+                        "success": False,
+                        "path": file_path,
+                        "message": "One of 'content', 'replacements', or 'delete_snippet' must be provided in payload.",
+                        "changed": False,
+                    }
+            except Exception as e:
                 return {
                     "success": False,
                     "path": file_path,
-                    "message": "One of 'content', 'replacements', or 'delete_snippet' must be provided in payload.",
-                    "changed": False,
+                    "message": f"edit_file call failed: {str(e)}",
+                    "changed": False
                 }
         group_id = generate_group_id("edit_file", payload.file_path)
         result = _edit_file(context, payload, group_id)

{code_puppy-0.0.158 → code_puppy-0.0.160}/code_puppy/tui/components/chat_view.py

@@ -261,8 +261,35 @@ class ChatView(VerticalScroll):
         else:
             separator = "\n"
 
-        # Update the message content
-        last_message.content += separator + message.content
+        # Handle content concatenation carefully to preserve Rich objects
+        if hasattr(last_message.content, "__rich_console__") or hasattr(message.content, "__rich_console__"):
+            # If either content is a Rich object, convert both to text and concatenate
+            from io import StringIO
+            from rich.console import Console
+            
+            # Convert existing content to string
+            if hasattr(last_message.content, "__rich_console__"):
+                string_io = StringIO()
+                temp_console = Console(file=string_io, width=80, legacy_windows=False, markup=False)
+                temp_console.print(last_message.content)
+                existing_content = string_io.getvalue().rstrip("\n")
+            else:
+                existing_content = str(last_message.content)
+            
+            # Convert new content to string
+            if hasattr(message.content, "__rich_console__"):
+                string_io = StringIO()
+                temp_console = Console(file=string_io, width=80, legacy_windows=False, markup=False)
+                temp_console.print(message.content)
+                new_content = string_io.getvalue().rstrip("\n")
+            else:
+                new_content = str(message.content)
+            
+            # Combine as plain text
+            last_message.content = existing_content + separator + new_content
+        else:
+            # Both are strings, safe to concatenate
+            last_message.content += separator + message.content
 
         # Update the widget based on message type
         if last_message.type == MessageType.AGENT_RESPONSE:
@@ -282,25 +309,15 @@ class ChatView(VerticalScroll):
                 copy_button.update_text_to_copy(last_message.content)
         else:
             # Handle other message types
-            content = last_message.content
-
-            # Apply the same rendering logic as in add_message
-            if (
-                "[" in content
-                and "]" in content
-                and (
-                    content.strip().startswith("$ ")
-                    or content.strip().startswith("git ")
-                )
-            ):
-                # Treat as literal text
-                last_widget.update(Text(content))
-            else:
-                # Try to render markup
-                try:
-                    last_widget.update(Text.from_markup(content))
-                except Exception:
-                    last_widget.update(Text(content))
+            # After the content concatenation above, content is always a string
+            # Try to parse markup when safe to do so
+            try:
+                # Try to parse as markup first - this handles rich styling correctly
+                last_widget.update(Text.from_markup(last_message.content))
+            except Exception:
+                # If markup parsing fails, fall back to plain text
+                # This handles cases where content contains literal square brackets
+                last_widget.update(Text(last_message.content))
 
         # Add the new message to our tracking lists
         self.messages.append(message)

{code_puppy-0.0.158 → code_puppy-0.0.160}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.158"
+version = "0.0.160"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.11"