code-puppy 0.0.332__py3-none-any.whl → 0.0.334__py3-none-any.whl

code_puppy/agents/base_agent.py

@@ -75,8 +75,6 @@ from code_puppy.model_factory import ModelFactory, make_model_settings
 from code_puppy.summarization_agent import run_summarization_sync
 from code_puppy.tools.agent_tools import _active_subagent_tasks
 from code_puppy.tools.command_runner import (
-    _add_windows_ctrl_handler,
-    _remove_windows_ctrl_handler,
     is_awaiting_user_input,
 )
 
@@ -1384,15 +1382,14 @@ class BaseAgent(ABC):
         def _print_thinking_banner() -> None:
             """Print the THINKING banner with spinner pause and line clear."""
             nonlocal did_stream_anything
-            import sys
             import time
 
             from code_puppy.config import get_banner_color
 
             pause_all_spinners()
             time.sleep(0.1)  # Delay to let spinner fully clear
-            sys.stdout.write("\r\x1b[K")  # Clear line
-            sys.stdout.flush()
+            # Clear line and print newline before banner
+            console.print(" " * 50, end="\r")
             console.print()  # Newline before banner
             # Bold banner with configurable color and lightning bolt
             thinking_color = get_banner_color("thinking")
@@ -1402,21 +1399,19 @@ class BaseAgent(ABC):
                 ),
                 end="",
             )
-            sys.stdout.flush()
             did_stream_anything = True
 
         def _print_response_banner() -> None:
             """Print the AGENT RESPONSE banner with spinner pause and line clear."""
             nonlocal did_stream_anything
-            import sys
             import time
 
             from code_puppy.config import get_banner_color
 
             pause_all_spinners()
             time.sleep(0.1)  # Delay to let spinner fully clear
-            sys.stdout.write("\r\x1b[K")  # Clear line
-            sys.stdout.flush()
+            # Clear line and print newline before banner
+            console.print(" " * 50, end="\r")
             console.print()  # Newline before banner
             response_color = get_banner_color("agent_response")
             console.print(
@@ -1424,7 +1419,6 @@ class BaseAgent(ABC):
                     f"[bold white on {response_color}] AGENT RESPONSE [/bold white on {response_color}]"
                 )
             )
-            sys.stdout.flush()
             did_stream_anything = True
 
         async for event in events:
@@ -1448,8 +1442,8 @@ class BaseAgent(ABC):
                     # Buffer initial content if present
                     if part.content and part.content.strip():
                         text_buffer[event.index].append(part.content)
-                        # Use len(content) / 3 for token estimation (more accurate than chunk counting)
-                        token_count[event.index] += len(part.content) // 3
+                        # Count chunks (each part counts as 1)
+                        token_count[event.index] += 1
                 elif isinstance(part, ToolCallPart):
                     streaming_parts.add(event.index)
                     tool_parts.add(event.index)
@@ -1467,24 +1461,20 @@ class BaseAgent(ABC):
                         if delta.content_delta:
                             # For text parts, show token counter then render at end
                             if event.index in text_parts:
-                                import sys
-
                                 # Print banner on first content
                                 if event.index not in banner_printed:
                                     _print_response_banner()
                                     banner_printed.add(event.index)
                                 # Accumulate text for final markdown render
                                 text_buffer[event.index].append(delta.content_delta)
-                                # Use len(content) / 3 for token estimation
-                                token_count[event.index] += (
-                                    len(delta.content_delta) // 3
-                                )
-                                # Update token counter in place (single line)
+                                # Count chunks received
+                                token_count[event.index] += 1
+                                # Update chunk counter in place (single line)
                                 count = token_count[event.index]
-                                sys.stdout.write(
-                                    f"\r\x1b[K  ⏳ Receiving... {count} tokens"
+                                console.print(
+                                    f"  ⏳ Receiving... {count} chunks   ",
+                                    end="\r",
                                 )
-                                sys.stdout.flush()
                             else:
                                 # For thinking parts, stream immediately (dim)
                                 if event.index not in banner_printed:
@@ -1493,34 +1483,30 @@ class BaseAgent(ABC):
                                 escaped = escape(delta.content_delta)
                                 console.print(f"[dim]{escaped}[/dim]", end="")
                     elif isinstance(delta, ToolCallPartDelta):
-                        import sys
-
-                        # For tool calls, show token counter (use string repr for estimation)
-                        token_count[event.index] += len(str(delta)) // 3
+                        # For tool calls, count chunks received
+                        token_count[event.index] += 1
                         # Get tool name if available
                         tool_name = getattr(delta, "tool_name_delta", "")
                         count = token_count[event.index]
                         # Display with tool wrench icon and tool name
                         if tool_name:
-                            sys.stdout.write(
-                                f"\r\x1b[K  🔧 Calling {tool_name}... {count} tokens"
+                            console.print(
+                                f"  🔧 Calling {tool_name}... {count} chunks   ",
+                                end="\r",
                             )
                         else:
-                            sys.stdout.write(
-                                f"\r\x1b[K  🔧 Calling tool... {count} tokens"
+                            console.print(
+                                f"  🔧 Calling tool... {count} chunks   ",
+                                end="\r",
                             )
-                        sys.stdout.flush()
 
             # PartEndEvent - finish the streaming with a newline
             elif isinstance(event, PartEndEvent):
                 if event.index in streaming_parts:
-                    import sys
-
                     # For text parts, clear counter line and render markdown
                     if event.index in text_parts:
-                        # Clear the token counter line
-                        sys.stdout.write("\r\x1b[K")
-                        sys.stdout.flush()
+                        # Clear the chunk counter line by printing spaces and returning
+                        console.print(" " * 50, end="\r")
                         # Render the final markdown nicely
                         if event.index in text_buffer:
                             try:
@@ -1530,11 +1516,10 @@ class BaseAgent(ABC):
                             except Exception:
                                 pass
                             del text_buffer[event.index]
-                    # For tool parts, clear the token counter line
+                    # For tool parts, clear the chunk counter line
                     elif event.index in tool_parts:
-                        # Clear the token counter line
-                        sys.stdout.write("\r\x1b[K")
-                        sys.stdout.flush()
+                        # Clear the chunk counter line by printing spaces and returning
+                        console.print(" " * 50, end="\r")
                     # For thinking parts, just print newline
                     elif event.index in banner_printed:
                         console.print()  # Final newline after streaming
@@ -1953,7 +1938,12 @@ class BaseAgent(ABC):
         def graceful_sigint_handler(_sig, _frame):
             # When using keyboard-based cancel, SIGINT should be a no-op
             # (just show a hint to user about the configured cancel key)
+            # Also reset terminal to prevent bricking on Windows+uvx
             from code_puppy.keymap import get_cancel_agent_display_name
+            from code_puppy.terminal_utils import reset_windows_terminal_full
+
+            # Reset terminal state first to prevent bricking
+            reset_windows_terminal_full()
 
             cancel_key = get_cancel_agent_display_name()
             emit_info(f"Use {cancel_key} to cancel the agent task.")
@@ -1961,12 +1951,6 @@ class BaseAgent(ABC):
         original_handler = None
         key_listener_stop_event = None
         _key_listener_thread = None
-        windows_ctrl_handler = None
-
-        # Check if we're on Windows
-        import sys
-
-        is_windows = sys.platform.startswith("win")
 
         try:
             if cancel_agent_uses_signal():
@@ -1974,27 +1958,10 @@ class BaseAgent(ABC):
                 original_handler = signal.signal(
                     signal.SIGINT, keyboard_interrupt_handler
                 )
-                # On Windows, also use SetConsoleCtrlHandler for reliable Ctrl+C with uvx
-                if is_windows:
-                    windows_ctrl_handler = _add_windows_ctrl_handler(
-                        schedule_agent_cancel
-                    )
             else:
                 # Use keyboard listener for agent cancellation
                 # Set a graceful SIGINT handler that shows a hint
                 original_handler = signal.signal(signal.SIGINT, graceful_sigint_handler)
-                # On Windows, SetConsoleCtrlHandler should also show the hint
-                if is_windows:
-
-                    def graceful_ctrl_handler():
-                        from code_puppy.keymap import get_cancel_agent_display_name
-
-                        cancel_key = get_cancel_agent_display_name()
-                        emit_info(f"Use {cancel_key} to cancel the agent task.")
-
-                    windows_ctrl_handler = _add_windows_ctrl_handler(
-                        graceful_ctrl_handler
-                    )
                 # Spawn keyboard listener with the cancel agent callback
                 key_listener_stop_event = threading.Event()
                 _key_listener_thread = self._spawn_ctrl_x_key_listener(
@@ -2024,17 +1991,8 @@ class BaseAgent(ABC):
             # Stop keyboard listener if it was started
             if key_listener_stop_event is not None:
                 key_listener_stop_event.set()
-            # Remove Windows console handler
-            if windows_ctrl_handler is not None:
-                _remove_windows_ctrl_handler(windows_ctrl_handler)
             # Restore original signal handler
             if (
                 original_handler is not None
             ):  # Explicit None check - SIG_DFL can be 0/falsy!
                 signal.signal(signal.SIGINT, original_handler)
-            # Windows-specific: Reset terminal after Ctrl+C to prevent corruption
-            # This fixes the issue where Enter key shows as 'm' after interrupting with uvx
-            if is_windows:
-                from code_puppy.terminal_utils import reset_windows_terminal_full
-
-                reset_windows_terminal_full()

code_puppy/cli_runner.py

@@ -171,6 +171,45 @@ async def main():
         emit_error(str(e))
         sys.exit(1)
 
+    # Show uvx detection notice if we're on Windows + uvx
+    # Also disable Ctrl+C at the console level to prevent terminal bricking
+    try:
+        from code_puppy.uvx_detection import should_use_alternate_cancel_key
+
+        if should_use_alternate_cancel_key():
+            from code_puppy.terminal_utils import (
+                disable_windows_ctrl_c,
+                set_keep_ctrl_c_disabled,
+            )
+
+            # Disable Ctrl+C at the console input level
+            # This prevents Ctrl+C from being processed as a signal at all
+            disable_windows_ctrl_c()
+
+            # Set flag to keep it disabled (prompt_toolkit may re-enable it)
+            set_keep_ctrl_c_disabled(True)
+
+            # Use print directly - emit_system_message can get cleared by ANSI codes
+            print(
+                "🔧 Detected uvx launch on Windows - using Ctrl+K for cancellation "
+                "(Ctrl+C is disabled to prevent terminal issues)"
+            )
+
+            # Also install a SIGINT handler as backup
+            import signal
+
+            from code_puppy.terminal_utils import reset_windows_terminal_full
+
+            def _uvx_protective_sigint_handler(_sig, _frame):
+                """Protective SIGINT handler for Windows+uvx."""
+                reset_windows_terminal_full()
+                # Re-disable Ctrl+C in case something re-enabled it
+                disable_windows_ctrl_c()
+
+            signal.signal(signal.SIGINT, _uvx_protective_sigint_handler)
+    except ImportError:
+        pass  # uvx_detection module not available, ignore
+
     # Load API keys from puppy.cfg into environment variables
     from code_puppy.config import load_api_keys_to_environment
 
@@ -325,6 +364,7 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
     emit_system_message(
         "Use /diff to configure diff highlighting colors for file changes."
     )
+    emit_system_message("To re-run the tutorial, use /tutorial.")
     try:
         from code_puppy.command_line.motd import print_motd
 
@@ -421,10 +461,6 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
     current_agent_task = None
 
     while True:
-        # Windows-specific: Aggressively reset terminal at the start of every loop
-        # This fixes terminal corruption after Ctrl+C, especially when running via uvx
-        reset_windows_terminal_full()
-
         from code_puppy.agents.agent_manager import get_current_agent
         from code_puppy.messaging import emit_info
 
@@ -444,6 +480,15 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 task = await get_input_with_combined_completion(
                     get_prompt_with_active_model(), history_file=COMMAND_HISTORY_FILE
                 )
+
+                # Windows+uvx: Re-disable Ctrl+C after prompt_toolkit
+                # (prompt_toolkit restores console mode which re-enables Ctrl+C)
+                try:
+                    from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                    ensure_ctrl_c_disabled()
+                except ImportError:
+                    pass
             except ImportError:
                 # Fall back to basic input if prompt_toolkit is not available
                 task = input(">>> ")
@@ -608,8 +653,14 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 # Check if the task was cancelled (but don't show message if we just killed processes)
                 if result is None:
                     # Windows-specific: Reset terminal state after cancellation
-                    # Use full reset (ANSI + console mode) to fix stdin after Ctrl+C
-                    reset_windows_terminal_full()
+                    reset_windows_terminal_ansi()
+                    # Re-disable Ctrl+C if needed (uvx mode)
+                    try:
+                        from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                        ensure_ctrl_c_disabled()
+                    except ImportError:
+                        pass
                     continue
                 # Get the structured response
                 agent_response = result.output
@@ -650,6 +701,15 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
 
             auto_save_session_if_enabled()
 
+            # Re-disable Ctrl+C if needed (uvx mode) - must be done after
+            # each iteration as various operations may restore console mode
+            try:
+                from code_puppy.terminal_utils import ensure_ctrl_c_disabled
+
+                ensure_ctrl_c_disabled()
+            except ImportError:
+                pass
+
 
 def prettier_code_blocks():
     """Configure Rich to use prettier code block rendering."""

code_puppy/command_line/config_commands.py

@@ -46,7 +46,7 @@ def handle_show_command(command: str) -> bool:
         get_use_dbos,
         get_yolo_mode,
     )
-    from code_puppy.keymap import get_cancel_agent_key, get_cancel_agent_display_name
+    from code_puppy.keymap import get_cancel_agent_display_name
     from code_puppy.messaging import emit_info
 
     puppy_name = get_puppy_name()

code_puppy/command_line/core_commands.py

@@ -115,6 +115,57 @@ def handle_motd_command(command: str) -> bool:
     return True
 
 
+@register_command(
+    name="tutorial",
+    description="Run the interactive tutorial wizard",
+    usage="/tutorial",
+    category="core",
+)
+def handle_tutorial_command(command: str) -> bool:
+    """Run the interactive tutorial wizard.
+
+    Usage:
+        /tutorial  - Run the tutorial (can be run anytime)
+    """
+    import asyncio
+    import concurrent.futures
+
+    from code_puppy.command_line.onboarding_wizard import (
+        reset_onboarding,
+        run_onboarding_wizard,
+    )
+    from code_puppy.config import set_model_name
+
+    # Always reset so user can re-run the tutorial anytime
+    reset_onboarding()
+
+    # Run the async wizard in a thread pool (same pattern as agent picker)
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        future = executor.submit(lambda: asyncio.run(run_onboarding_wizard()))
+        result = future.result(timeout=300)  # 5 min timeout
+
+    if result == "chatgpt":
+        emit_info("🔐 Starting ChatGPT OAuth flow...")
+        from code_puppy.plugins.chatgpt_oauth.oauth_flow import run_oauth_flow
+
+        run_oauth_flow()
+        set_model_name("chatgpt-gpt-5.2-codex")
+    elif result == "claude":
+        emit_info("🔐 Starting Claude Code OAuth flow...")
+        from code_puppy.plugins.claude_code_oauth.register_callbacks import (
+            _perform_authentication,
+        )
+
+        _perform_authentication()
+        set_model_name("claude-code-claude-opus-4-5-20251101")
+    elif result == "completed":
+        emit_info("🎉 Tutorial complete! Happy coding!")
+    elif result == "skipped":
+        emit_info("⏭️ Tutorial skipped. Run /tutorial anytime!")
+
+    return True
+
+
 @register_command(
     name="exit",
     description="Exit interactive mode",