code-puppy 0.0.67__py3-none-any.whl → 0.0.69__py3-none-any.whl

code_puppy/command_line/meta_command_handler.py

@@ -12,14 +12,18 @@ from code_puppy.command_line.utils import make_directory_table
 META_COMMANDS_HELP = """
 [bold magenta]Meta Commands Help[/bold magenta]
 ~help, ~h             Show this help message
-~cd [dir]             Change directory or show directories
-~codemap [dir]        Show code structure for [dir]
+~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/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/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/models.json

@@ -59,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.67.data → code_puppy-0.0.69.data}/data/code_puppy/models.json

@@ -59,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.67.dist-info → code_puppy-0.0.69.dist-info}/METADATA

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

{code_puppy-0.0.67.dist-info → code_puppy-0.0.69.dist-info}/RECORD

@@ -1,15 +1,15 @@
 code_puppy/__init__.py,sha256=-ANvE6Xe5NlWDIRCIfL1x-rgtCZ6zM2Ye9NphFoULSY,82
 code_puppy/agent.py,sha256=QRBid--LcJv8fbhS9u6Foavgt3jI1B-K_1Arv-kXQsc,3420
 code_puppy/agent_prompts.py,sha256=DnPNubiFtD6Ot76cIsxedJEaEVYS5AaxR3JWJM5nXNg,6925
-code_puppy/config.py,sha256=LTcZe5eHTT0zq-YJzSeNg8LCwhHb1HGN4tOkITtb7Eo,3941
-code_puppy/main.py,sha256=qDbDB123MAv5r_kH91x1LxUROI9I28y2tvuYo2YxEbQ,10323
+code_puppy/config.py,sha256=YUzcEpR6roYnvbfdZRtw4G707sLmUuCTH2LU0qmfMvY,4316
+code_puppy/main.py,sha256=K-xK1utskaGoH1_e30GLDayLqFse0-HmbZ5wvMDXGLA,12426
 code_puppy/model_factory.py,sha256=jZH96zE5GMTK3RWjUpZB4HjbSO3fSaAzjRoQh8Y8lfg,7711
-code_puppy/models.json,sha256=tfr1nR2le7bwwW5NwUKryuB0bA9kQqJIbmpUY1BHE6Y,1447
+code_puppy/models.json,sha256=AY1dcFd3bMFaJBjU_u-PjsrnmcKbjjtGhjL3uYfqpW8,1692
 code_puppy/session_memory.py,sha256=4sgAAjbXdLSi8hETpd56tgtrG6hqMUuZWDlJOu6BQjA,2735
 code_puppy/version_checker.py,sha256=aRGulzuY4C4CdFvU1rITduyL-1xTFsn4GiD1uSfOl_Y,396
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
 code_puppy/command_line/file_path_completion.py,sha256=gw8NpIxa6GOpczUJRyh7VNZwoXKKn-yvCqit7h2y6Gg,2931
-code_puppy/command_line/meta_command_handler.py,sha256=aKSPu_aB98TAuaFwyI4HmrFd45dk6mrhnvR-WvnQuQA,5713
+code_puppy/command_line/meta_command_handler.py,sha256=kP57BU7gH23ten0CHX1XmrCbe89WFxoHzz6ddeRGrCE,6121
 code_puppy/command_line/model_picker_completion.py,sha256=NkyZZG7IhcVWSJ3ADytwCA5f8DpNeVs759Qtqs4fQtY,3733
 code_puppy/command_line/prompt_toolkit_completion.py,sha256=_gP0FIOgHDNHTTWLNL0XNzr6sO0ISe7Mec1uQNo9kcM,8337
 code_puppy/command_line/utils.py,sha256=7eyxDHjPjPB9wGDJQQcXV_zOsGdYsFgI0SGCetVmTqE,1251
@@ -20,9 +20,9 @@ code_puppy/tools/file_modifications.py,sha256=d0fC2CCnkmv0kEJ8kvKTuUMTww3S_mgF06
 code_puppy/tools/file_operations.py,sha256=xqj7MiK6sGTaC8NMrMRTybWlXG32S-DjybqJtnufRcI,11715
 code_puppy/tools/ts_code_map.py,sha256=-CXLzFxFMefoYYdWxfPwFugZhkfVxdiftGb3LZnEttk,17567
 code_puppy/tools/web_search.py,sha256=sA2ierjuuYA517-uhb5s53SgeVsyOe1nExoZsrU1Fps,1284
-code_puppy-0.0.67.data/data/code_puppy/models.json,sha256=tfr1nR2le7bwwW5NwUKryuB0bA9kQqJIbmpUY1BHE6Y,1447
-code_puppy-0.0.67.dist-info/METADATA,sha256=cVsyil3a0m9peOZU_GZVkAHFbxh9MZTFDvaDgBtdS2k,4955
-code_puppy-0.0.67.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.67.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.67.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.67.dist-info/RECORD,,
+code_puppy-0.0.69.data/data/code_puppy/models.json,sha256=AY1dcFd3bMFaJBjU_u-PjsrnmcKbjjtGhjL3uYfqpW8,1692
+code_puppy-0.0.69.dist-info/METADATA,sha256=LKOp_Y_1D5wKqK0SSYyaenHHaHfnTLg5q7fFTxuFdww,4955
+code_puppy-0.0.69.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.69.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.69.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.69.dist-info/RECORD,,