code-puppy 0.0.128__py3-none-any.whl → 0.0.130__py3-none-any.whl

code_puppy/agents/runtime_manager.py

@@ -97,14 +97,33 @@ class RuntimeAgentManager:
             except* InterruptedError as ie:
                 emit_warning(f"Interrupted: {str(ie)}")
             except* Exception as other_error:
-                def log_exceptions(exc):
+                # Filter out CancelledError from the exception group - let it propagate
+                remaining_exceptions = []
+                def collect_non_cancelled_exceptions(exc):
                     if isinstance(exc, ExceptionGroup):
                         for sub_exc in exc.exceptions:
-                            log_exceptions(sub_exc)
-                    else:
+                            collect_non_cancelled_exceptions(sub_exc)
+                    elif not isinstance(exc, asyncio.CancelledError):
+                        remaining_exceptions.append(exc)
                         emit_warning(f"Unexpected error: {str(exc)}", group_id=group_id)
                         emit_warning(f"{str(exc.args)}", group_id=group_id)
-                log_exceptions(other_error)
+                
+                collect_non_cancelled_exceptions(other_error)
+                
+                # If there are CancelledError exceptions in the group, re-raise them
+                cancelled_exceptions = []
+                def collect_cancelled_exceptions(exc):
+                    if isinstance(exc, ExceptionGroup):
+                        for sub_exc in exc.exceptions:
+                            collect_cancelled_exceptions(sub_exc)
+                    elif isinstance(exc, asyncio.CancelledError):
+                        cancelled_exceptions.append(exc)
+                
+                collect_cancelled_exceptions(other_error)
+                
+                if cancelled_exceptions:
+                    # Re-raise the first CancelledError to propagate cancellation
+                    raise cancelled_exceptions[0]
         
         # Create the task FIRST
         agent_task = asyncio.create_task(run_agent_task())

code_puppy/command_line/model_picker_completion.py

@@ -70,7 +70,7 @@ class ModelNameCompleter(Completer):
 
 
 def update_model_in_input(text: str) -> Optional[str]:
-    # If input starts with /model or /m and a model name, set model and strip it out
+    # If input starts with /model and a model name, set model and strip it out
     content = text.strip()
     
     # Check for /model command
@@ -84,17 +84,6 @@ def update_model_in_input(text: str) -> Optional[str]:
                 if idx != -1:
                     new_text = (text[:idx] + text[idx + len("/model" + model) :]).strip()
                     return new_text
-    # Also check for legacy /m command for backward compatibility
-    elif content.startswith("/m"):
-        rest = content[2:].strip()  # Remove '/m'
-        for model in load_model_names():
-            if rest == model:
-                set_active_model(model)
-                # Remove /m from the input
-                idx = text.find("/m" + model)
-                if idx != -1:
-                    new_text = (text[:idx] + text[idx + len("/m" + model) :]).strip()
-                    return new_text
     return None
 
 

code_puppy/command_line/prompt_toolkit_completion.py

@@ -163,7 +163,7 @@ async def get_input_with_combined_completion(
     completer = merge_completers(
         [
             FilePathCompleter(symbol="@"),
-            ModelNameCompleter(trigger="/m"),
+            ModelNameCompleter(trigger="/model"),
             CDCompleter(trigger="/cd"),
             SetCompleter(trigger="/set"),
             LoadContextCompleter(trigger="/load_context"),
@@ -226,7 +226,7 @@ async def get_input_with_combined_completion(
 
 
 if __name__ == "__main__":
-    print("Type '@' for path-completion or '/m' to pick a model. Ctrl+D to exit.")
+    print("Type '@' for path-completion or '/model' to pick a model. Ctrl+D to exit.")
 
     async def main():
         while True:

code_puppy/http_utils.py

@@ -90,7 +90,7 @@ def create_reopenable_async_client(
     timeout: int = 180,
     verify: Union[bool, str] = None,
     headers: Optional[Dict[str, str]] = None,
-) -> Union["ReopenableAsyncClient", httpx.AsyncClient]:
+) -> Union[ReopenableAsyncClient, httpx.AsyncClient]:
     if verify is None:
         verify = get_cert_bundle_path()
 

code_puppy/main.py

@@ -424,30 +424,76 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 from code_puppy.messaging import emit_warning
                 from code_puppy.messaging.spinner import ConsoleSpinner
 
-                # Use ConsoleSpinner for better user experience
-                try:
-                    with ConsoleSpinner(console=display_console):
-                        # The manager handles all cancellation logic internally
-                        result = await agent_manager.run_with_mcp(
+                # Create a task that mimics TUI behavior - avoid signal handler conflicts
+                current_task = None
+                signal_handled = False  # Prevent multiple signal handler calls (reset per task)
+                
+                async def run_task():
+                    # Use the simpler run() method instead of run_with_mcp() to avoid signal handler
+                    agent = agent_manager.get_agent()
+                    async with agent:
+                        return await agent.run(
                             task,
-                            message_history=get_message_history(),
+                            message_history=get_message_history(), 
                             usage_limits=get_custom_usage_limits(),
                         )
+
+                def handle_keyboard_interrupt():
+                    """Handle Ctrl+C like TUI does - kill processes but only cancel task if no processes killed"""
+                    nonlocal signal_handled
+                    if signal_handled:
+                        return
+                    signal_handled = True
+                    
+                    from code_puppy.tools.command_runner import kill_all_running_shell_processes
+                    
+                    killed = kill_all_running_shell_processes()
+                    if killed:
+                        emit_warning(f"🔥 Cancelled {killed} running shell process(es)")
+                        # Don't cancel the agent task - let it continue processing
+                        # Shell processes killed, but agent continues running
+                    else:
+                        # Only cancel the agent task if NO processes were killed  
+                        if current_task and not current_task.done():
+                            current_task.cancel()
+                            emit_warning("⚠️  Processing cancelled by user")
+
+                # Set up proper signal handling to override asyncio's default behavior
+                import signal
+                
+                def signal_handler(sig, frame):
+                    """Handle Ctrl+C by killing processes and cancelling the current task"""
+                    handle_keyboard_interrupt()
+                
+                # Replace asyncio's SIGINT handler with our own
+                original_handler = signal.signal(signal.SIGINT, signal_handler)
+
+                # Use ConsoleSpinner for better user experience
+                try:
+                    with ConsoleSpinner(console=display_console):
+                        current_task = asyncio.create_task(run_task())
+                        result = await current_task
                 except asyncio.CancelledError:
-                    # Agent was cancelled by user
+                    # Agent was cancelled by our signal handler
                     result = None
                 except KeyboardInterrupt:
-                    # Keyboard interrupt
-                    emit_warning("\n⚠️ Caught KeyboardInterrupt in main")
+                    # Fallback - handle Ctrl+C if it gets through as KeyboardInterrupt
+                    emit_warning("\n⚠️ Caught KeyboardInterrupt")
+                    handle_keyboard_interrupt()
                     result = None
                 finally:
+                    # Restore original signal handler
+                    if 'original_handler' in locals():
+                        signal.signal(signal.SIGINT, original_handler)
                     set_message_history(
                         prune_interrupted_tool_calls(get_message_history())
                     )
 
-                # Check if the task was cancelled
+                # Check if the task was cancelled (but don't show message if we just killed processes)
                 if result is None:
-                    emit_warning("\n⚠️ Processing cancelled by user (Ctrl+C)")
+                    # Only show cancellation message if we actually cancelled the agent task
+                    # If we just killed shell processes, the agent should continue normally
+                    pass  # Don't always show this message
                     # Skip the rest of this loop iteration
                     continue
                 # Get the structured response

{code_puppy-0.0.128.dist-info → code_puppy-0.0.130.dist-info}/METADATA

@@ -1,7 +1,9 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.128
+Version: 0.0.130
 Summary: Code generation agent
+Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
+Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
 Author: Michael Pfaffenberger
 License: MIT
 License-File: LICENSE

{code_puppy-0.0.128.dist-info → code_puppy-0.0.130.dist-info}/RECORD

@@ -3,8 +3,8 @@ code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
 code_puppy/agent.py,sha256=s6jQH4apmJAQOYsI_52vgQf8CsrjB6aIgXXWgpJ_8Iw,7136
 code_puppy/callbacks.py,sha256=6wYB6K_fGSCkKKEFaYOYkJT45WaV5W_NhUIzcvVH_nU,5060
 code_puppy/config.py,sha256=n0aV-kfIzFkbEbPmwi6dbRGqpfB-pahnpyVyQPIN3-E,15436
-code_puppy/http_utils.py,sha256=zN0_F8cq4agamL3GRRLLhgEjBgjKtWrgGe8thORC7YE,3434
-code_puppy/main.py,sha256=s0OShY_oVPsTIZd6Us90ju1DZhmjfqkUbNniD8cvjq0,22722
+code_puppy/http_utils.py,sha256=BAvt4hed7fVMXglA7eS9gOb08h2YTuOyai6VmQq09fg,3432
+code_puppy/main.py,sha256=7Sfsy6WA1bvp3UoACOAwxXlNtpoRe7fiQ0_Qtl0EgbM,25314
 code_puppy/message_history_processor.py,sha256=O2rKp7W6YeIg93W8b0XySTUEQgIZm0f_06--_kzHugM,16145
 code_puppy/model_factory.py,sha256=NoG9wDTosaaDrFIGtq3oq8gDe0J_7N6CUKuesXz87qM,10878
 code_puppy/models.json,sha256=GpvtWnBKERm6T7HCZJQUIVAS5256-tZ_bFuRtnKXEsY,3128
@@ -20,16 +20,16 @@ code_puppy/agents/agent_creator_agent.py,sha256=hpmr3UmTaoDfcJ0tbMdxyUyxQ941N9XX
 code_puppy/agents/agent_manager.py,sha256=2ZHIR6gqnkAffHccFYf93iBF2qwlWKm7vCGk3pnwMNE,6733
 code_puppy/agents/base_agent.py,sha256=qqwQhyCNDQSD-jf6B55Ipim5I2svB4t2v3A3E9kU7Rk,1501
 code_puppy/agents/json_agent.py,sha256=0j6_P1ppje7TsjaZIbxKn8meiuvoBngvjVLNdtCkGwc,4272
-code_puppy/agents/runtime_manager.py,sha256=M42a2kxNQlItIPtC0--VTrtm7czlXsTGVTOkbySJ6a0,7916
+code_puppy/agents/runtime_manager.py,sha256=YCex9YrxE2l16_MaaeyCQEg0hzte4dxYogRB8Lb6_SQ,8982
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
 code_puppy/command_line/command_handler.py,sha256=IhDaDa0GmpW0BCFfmkgpL_6iQBJlXEKQC9SDmpj_XeI,20730
 code_puppy/command_line/file_path_completion.py,sha256=gw8NpIxa6GOpczUJRyh7VNZwoXKKn-yvCqit7h2y6Gg,2931
 code_puppy/command_line/load_context_completion.py,sha256=6eZxV6Bs-EFwZjN93V8ZDZUC-6RaWxvtZk-04Wtikyw,2240
 code_puppy/command_line/mcp_commands.py,sha256=qqEdac7zR4Wydn0JE3lTVnLi3dh_Lc8DJmjOq8dQeJM,55379
 code_puppy/command_line/meta_command_handler.py,sha256=02NU4Lspf5qRMPTsrGiMRLSUshZhdmS0XQA26k8vUjw,5665
-code_puppy/command_line/model_picker_completion.py,sha256=zQKrlbY4dlY7k1WlPQno2U_KXwrZIBnKSRnytXvuX_c,4108
+code_puppy/command_line/model_picker_completion.py,sha256=xvwgthVmLRA9a8RJG6iFImxR2yD6rJYPJJav0YJoVCc,3599
 code_puppy/command_line/motd.py,sha256=PEdkp3ZnydVfvd7mNJylm8YyFNUKg9jmY6uwkA1em8c,2152
-code_puppy/command_line/prompt_toolkit_completion.py,sha256=dZTnOGhrBVP7Po8o_V7KWjPM5W5WqgOuSx_BGtArWEk,9044
+code_puppy/command_line/prompt_toolkit_completion.py,sha256=BKNw-DwacZPNTKjjXlxnjrd4q7UfOVynReUFQrVes_g,9052
 code_puppy/command_line/utils.py,sha256=7eyxDHjPjPB9wGDJQQcXV_zOsGdYsFgI0SGCetVmTqE,1251
 code_puppy/mcp/__init__.py,sha256=LJd9mGStskhXYBEp1UhtHlrAQ3rCHnfTa7KSmqtZe34,1143
 code_puppy/mcp/async_lifecycle.py,sha256=45tw7ZcDV6LVBrTvvNkMCDhnTapgQCYcc01W8Gp9c5A,8064
@@ -100,9 +100,9 @@ code_puppy/tui/tests/test_sidebar_history_navigation.py,sha256=JGiyua8A2B8dLfwiE
 code_puppy/tui/tests/test_status_bar.py,sha256=nYT_FZGdmqnnbn6o0ZuOkLtNUtJzLSmtX8P72liQ5Vo,1797
 code_puppy/tui/tests/test_timestamped_history.py,sha256=nVXt9hExZZ_8MFP-AZj4L4bB_1Eo_mc-ZhVICzTuw3I,1799
 code_puppy/tui/tests/test_tools.py,sha256=kgzzAkK4r0DPzQwHHD4cePpVNgrHor6cFr05Pg6DBWg,2687
-code_puppy-0.0.128.data/data/code_puppy/models.json,sha256=GpvtWnBKERm6T7HCZJQUIVAS5256-tZ_bFuRtnKXEsY,3128
-code_puppy-0.0.128.dist-info/METADATA,sha256=BVbsZj83x6XOW2FdMdzNEAWskZAUBkMNYbYs7RmFTwM,19735
-code_puppy-0.0.128.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.128.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.128.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.128.dist-info/RECORD,,
+code_puppy-0.0.130.data/data/code_puppy/models.json,sha256=GpvtWnBKERm6T7HCZJQUIVAS5256-tZ_bFuRtnKXEsY,3128
+code_puppy-0.0.130.dist-info/METADATA,sha256=4ZUO2tCKE7Iztu63OFd-FDXLU5_hTXyjyfbddKu8hbI,19873
+code_puppy-0.0.130.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.130.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.130.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.130.dist-info/RECORD,,