code-puppy 0.0.66__tar.gz → 0.0.68__tar.gz

{code_puppy-0.0.66 → code_puppy-0.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.66
+Version: 0.0.68
 Summary: Code generation agent
 Author: Michael Pfaffenberger
 License: MIT

{code_puppy-0.0.66 → code_puppy-0.0.68}/code_puppy/command_line/meta_command_handler.py

@@ -15,11 +15,15 @@ META_COMMANDS_HELP = """
 ~cd [dir]             Change directory or show directories
 ~codemap [dir]        Show code structure for [dir]
 ~m <model>            Set active model
-~show                 Show puppy status info
+~motd                 Show the latest message of the day (MOTD)
+~show                 Show puppy config key-values
+~set                  Set puppy config key-values
 ~<unknown>            Show unknown meta command warning
 """
 
 
+from code_puppy.command_line.motd import print_motd
+
 def handle_meta_command(command: str, console: Console) -> bool:
     """
     Handle meta/config commands prefixed with '~'.
@@ -27,6 +31,10 @@ def handle_meta_command(command: str, console: Console) -> bool:
     """
     command = command.strip()
 
+    if command.strip().startswith("~motd"):
+        print_motd(console, force=True)
+        return True
+
     # ~codemap (code structure visualization)
     if command.startswith("~codemap"):
         from code_puppy.tools.ts_code_map import make_code_map
@@ -67,20 +75,20 @@ def handle_meta_command(command: str, console: Console) -> bool:
 
     if command.strip().startswith("~show"):
         from code_puppy.command_line.model_picker_completion import get_active_model
-        from code_puppy.config import get_owner_name, get_puppy_name
-
+        from code_puppy.config import get_owner_name, get_puppy_name, get_yolo_mode, get_message_history_limit
         puppy_name = get_puppy_name()
         owner_name = get_owner_name()
         model = get_active_model()
-        from code_puppy.config import get_yolo_mode
-
         yolo_mode = get_yolo_mode()
-        console.print(f"""[bold magenta]🐶 Puppy Status[/bold magenta]
- \n[bold]puppy_name:[/bold]     [cyan]{puppy_name}[/cyan]
+        msg_limit = get_message_history_limit()
+        console.print(f'''[bold magenta]🐶 Puppy Status[/bold magenta]
+
+[bold]puppy_name:[/bold]     [cyan]{puppy_name}[/cyan]
 [bold]owner_name:[/bold]     [cyan]{owner_name}[/cyan]
 [bold]model:[/bold]          [green]{model}[/green]
-[bold]YOLO_MODE:[/bold]      {"[red]ON[/red]" if yolo_mode else "[yellow]off[/yellow]"}
-""")
+[bold]YOLO_MODE:[/bold]      {'[red]ON[/red]' if yolo_mode else '[yellow]off[/yellow]'}
+[bold]message_history_limit:[/bold]   Keeping last [cyan]{msg_limit}[/cyan] messages in context
+''')
         return True
 
     if command.startswith("~set"):

{code_puppy-0.0.66 → code_puppy-0.0.68}/code_puppy/config.py

@@ -57,6 +57,18 @@ def get_owner_name():
     return get_value("owner_name") or "Master"
 
 
+def get_message_history_limit():
+    """
+    Returns the user-configured message truncation limit (for remembering context),
+    or 40 if unset or misconfigured.
+    Configurable by 'message_history_limit' key.
+    """
+    val = get_value("message_history_limit")
+    try:
+        return max(1, int(val)) if val else 40
+    except (ValueError, TypeError):
+        return 40
+
 # --- CONFIG SETTER STARTS HERE ---
 def get_config_keys():
     """

{code_puppy-0.0.66 → code_puppy-0.0.68}/code_puppy/main.py

@@ -4,6 +4,7 @@ import os
 import sys
 
 from dotenv import load_dotenv
+from pydantic_ai.messages import ToolCallPart, ToolReturnPart
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.markdown import CodeBlock, Markdown
 from rich.syntax import Syntax
@@ -111,6 +112,12 @@ async def interactive_mode(history_file_path: str) -> None:
     from code_puppy.command_line.meta_command_handler import META_COMMANDS_HELP
 
     console.print(META_COMMANDS_HELP)
+    # Show MOTD if user hasn't seen it after an update
+    try:
+        from code_puppy.command_line.motd import print_motd
+        print_motd(console, force=False)
+    except Exception as e:
+        console.print(f'[yellow]MOTD error: {e}[/yellow]')
 
     # Check if prompt_toolkit is installed
     try:
@@ -224,10 +231,44 @@ async def interactive_mode(history_file_path: str) -> None:
                     for m in new_msgs
                     if not (isinstance(m, dict) and m.get("role") == "system")
                 ]
-                # 2. Append to existing history and keep only the most recent 40
+                # 2. Append to existing history and keep only the most recent set by config
+                from code_puppy.config import get_message_history_limit
                 message_history.extend(filtered)
-                if len(message_history) > 40:
-                    message_history = message_history[-40:]
+
+                # --- BEGIN GROUP-AWARE TRUNCATION LOGIC ---
+                limit = get_message_history_limit()
+                if len(message_history) > limit:
+                    def group_by_tool_call_id(msgs):
+                        grouped = {}
+                        no_group = []
+                        for m in msgs:
+                            # Find all tool_call_id in message parts
+                            tool_call_ids = set()
+                            for part in getattr(m, 'parts', []):
+                                if hasattr(part, 'tool_call_id') and part.tool_call_id:
+                                    tool_call_ids.add(part.tool_call_id)
+                            if tool_call_ids:
+                                for tcid in tool_call_ids:
+                                    grouped.setdefault(tcid, []).append(m)
+                            else:
+                                no_group.append(m)
+                        return grouped, no_group
+
+                    grouped, no_group = group_by_tool_call_id(message_history)
+                    # Flatten into groups or singletons
+                    grouped_msgs = list(grouped.values()) + [[m] for m in no_group]
+                    # Flattened history (latest groups/singletons last, trunc to N messages total),
+                    # but always keep complete tool_call_id groups together
+                    truncated = []
+                    count = 0
+                    for group in reversed(grouped_msgs):
+                        if count + len(group) > limit:
+                            break
+                        truncated[:0] = group  # insert at front
+                        count += len(group)
+                    message_history = truncated
+                # --- END GROUP-AWARE TRUNCATION LOGIC ---
+
 
                 if agent_response and agent_response.awaiting_user_input:
                     console.print(

{code_puppy-0.0.66 → code_puppy-0.0.68}/code_puppy/models.json

@@ -15,6 +15,10 @@
     "type": "openai",
     "name": "gpt-4.1-nano"
   },
+  "o3": {
+    "type": "openai",
+    "name": "o3"
+  },
   "gpt-4.1-custom": {
     "type": "custom_openai",
     "name": "gpt-4.1-custom",
@@ -55,5 +59,12 @@
     "api_version": "2024-12-01-preview",
     "api_key": "$AZURE_OPENAI_API_KEY",
     "azure_endpoint": "$AZURE_OPENAI_ENDPOINT"
+  },
+  "Llama-4-Scout-17B-16E-Instruct": {
+    "type": "azure_openai",
+    "name": "Llama-4-Scout-17B-16E-Instruct",
+    "api_version": "2024-12-01-preview",
+    "api_key": "$AZURE_OPENAI_API_KEY",
+    "azure_endpoint": "$AZURE_OPENAI_ENDPOINT"
   }
 }

{code_puppy-0.0.66 → code_puppy-0.0.68}/code_puppy/tools/ts_code_map.py

@@ -266,6 +266,19 @@ LANGS = {
             "struct_definition": partial(_f("struct {name}"), style="magenta"),
         },
     },
+    # ────────  markup / style  ─────────────────────────────────────────
+    ".html": {
+        "lang": "html",
+        "name_field": None,
+        "nodes": {
+            # rely on parser presence; generic element handling not needed for tests
+        },
+    },
+    ".css": {
+        "lang": "css",
+        "name_field": None,
+        "nodes": {},
+    },
     # ─────────  scripting (shell / infra)  ─────────────────────────────
     ".sh": {
         "lang": "bash",
@@ -281,7 +294,37 @@ LANGS = {
     },
 }
 
-# Cache parsers so we don’t re-create them file-after-file
+# ---------------------------------------------------------------------------
+# Emoji helpers (cute! 🐶)
+# ---------------------------------------------------------------------------
+
+_NODE_EMOJIS = {
+    "function": "🦴",
+    "class": "🏠",
+    "struct": "🏗️",
+    "interface": "🎛️",
+    "trait": "💎",
+    "type": "🧩",
+    "object": "📦",
+    "export": "📤",
+}
+
+_FILE_EMOJIS = {
+    ".py": "🐍",
+    ".js": "✨",
+    ".jsx": "✨",
+    ".ts": "🌀",
+    ".tsx": "🌀",
+    ".rb": "💎",
+    ".go": "🐹",
+    ".rs": "🦀",
+    ".java": "☕️",
+    ".c": "🔧",
+    ".cpp": "➕",
+    ".hpp": "➕",
+    ".swift": "🕊️",
+    ".kt": "🤖",
+}
 _PARSER_CACHE = {}
 
 
@@ -313,6 +356,55 @@ def _span(node):
     return Text(f"  [{start_line}:{end_line}]", style="bold white")
 
 
+def _emoji_for_node_type(ts_type: str) -> str:
+    """Return a cute emoji for a given Tree-sitter node type (best-effort)."""
+    # naive mapping based on substrings – keeps it simple
+    if "function" in ts_type or "method" in ts_type or ts_type.startswith("fn_"):
+        return _NODE_EMOJIS["function"]
+    if "class" in ts_type:
+        return _NODE_EMOJIS["class"]
+    if "struct" in ts_type:
+        return _NODE_EMOJIS["struct"]
+    if "interface" in ts_type:
+        return _NODE_EMOJIS["interface"]
+    if "trait" in ts_type:
+        return _NODE_EMOJIS["trait"]
+    if "type_spec" in ts_type or "type_declaration" in ts_type:
+        return _NODE_EMOJIS["type"]
+    if "object" in ts_type:
+        return _NODE_EMOJIS["object"]
+    if ts_type.startswith("export"):
+        return _NODE_EMOJIS["export"]
+    return ""
+
+
+# ----------------------------------------------------------------------
+# traversal (clean)
+# ----------------------------------------------------------------------
+
+
+def _walk_fix(ts_node, rich_parent, info):
+    """Recursive traversal adding child nodes with emoji labels."""
+    nodes_cfg = info["nodes"]
+    name_field = info["name_field"]
+
+    for child in ts_node.children:
+        n_type = child.type
+        if n_type in nodes_cfg:
+            style = nodes_cfg[n_type].keywords["style"]
+            ident = child.child_by_field_name(name_field) if name_field else _first_identifier(child)
+            label_text = ident.text.decode() if ident else "<anon>"
+            label = nodes_cfg[n_type].func(label_text)
+            emoji = _emoji_for_node_type(n_type)
+            if emoji:
+                label = f"{emoji} {label}"
+            branch = rich_parent.add(Text(label, style=style) + _span(child))
+            _walk_fix(child, branch, info)
+        else:
+            _walk_fix(child, rich_parent, info)
+# ----------------------------------------------------------------------
+
+
 def _walk(ts_node, rich_parent, info):
     nodes_cfg = info["nodes"]
     name_field = info["name_field"]
@@ -329,6 +421,9 @@ def _walk(ts_node, rich_parent, info):
 
             label_text = ident.text.decode() if ident else "<anon>"
             label = nodes_cfg[t].func(label_text)
+            emoji = _emoji_for_node_type(t)
+            if emoji:
+                label = f"{emoji} {label}"
             branch = rich_parent.add(Text(label, style=style) + _span(child))
             _walk(child, branch, info)
         else:
@@ -345,35 +440,68 @@ def map_code_file(filepath):
     parser = parser_for(info["lang"])
     tree = parser.parse(code)
 
-    root_label = Path(filepath).name
+    file_emoji = _FILE_EMOJIS.get(ext, "📄")
+    root_label = f"{file_emoji} {Path(filepath).name}"
     base = RichTree(Text(root_label, style="bold cyan"))
 
     if tree.root_node.has_error:
         base.add(Text("⚠️  syntax error", style="bold red"))
 
-    _walk(tree.root_node, base, info)
+    _walk_fix(tree.root_node, base, info)
     return base
 
 
 def make_code_map(directory: str, ignore_tests: bool = True) -> str:
+    """Generate a Rich-rendered code map including directory hierarchy.
+
+    Args:
+        directory: Root directory to scan.
+        ignore_tests: Whether to skip files with 'test' in the name.
+
+    Returns:
+        Plain-text rendering of the generated Rich tree (last 1k chars).
+    """
+    # Create root of tree representing starting directory
     base_tree = RichTree(Text(Path(directory).name, style="bold magenta"))
 
+    # Cache to ensure we reuse RichTree nodes per directory path
+    dir_nodes: dict[str, RichTree] = {Path(directory).resolve(): base_tree}  # key=abs path
+
     for root, dirs, files in os.walk(directory):
+        # ignore dot-folders early
         dirs[:] = [d for d in dirs if not d.startswith(".")]
+
+        abs_root = Path(root).resolve()
+
+        # Ensure current directory has a node; create if coming from parent
+        if abs_root not in dir_nodes and abs_root != Path(directory).resolve():
+            rel_parts = abs_root.relative_to(directory).parts
+            parent_path = Path(directory).resolve()
+            for part in rel_parts:  # walk down creating nodes as needed
+                parent_node = dir_nodes[parent_path]
+                current_path = parent_path / part
+                if current_path not in dir_nodes:
+                    dir_label = Text(part, style="bold magenta")
+                    dir_node = parent_node.add(dir_label)
+                    dir_nodes[current_path] = dir_node
+                parent_path = current_path
+
+        current_node = dir_nodes.get(abs_root, base_tree)
+
         for f in files:
-            if (
-                should_ignore_path(os.path.join(root, f))
-                or ignore_tests
-                and "test" in f
-            ):
+            file_path = os.path.join(root, f)
+            if should_ignore_path(file_path):
+                continue
+            if ignore_tests and "test" in f:
                 continue
             try:
-                file_tree = map_code_file(os.path.join(root, f))
+                file_tree = map_code_file(file_path)
                 if file_tree is not None:
-                    base_tree.add(file_tree)
+                    current_node.add(file_tree)
             except Exception:
-                base_tree.add(Text(f"[error reading {f}]", style="bold red"))
+                current_node.add(Text(f"[error reading {f}]", style="bold red"))
 
+    # Render and return last 1000 characters
     buf = Console(record=True, width=120)
     buf.print(base_tree)
     return buf.export_text()[-1000:]

{code_puppy-0.0.66 → code_puppy-0.0.68}/pyproject.toml

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