code-puppy 0.0.344__tar.gz → 0.0.346__tar.gz

{code_puppy-0.0.344 → code_puppy-0.0.346}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.344
+Version: 0.0.346
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Code Generators
 Requires-Python: <3.14,>=3.11
 Requires-Dist: camoufox>=0.4.11
+Requires-Dist: dbos>=2.5.0
 Requires-Dist: fastapi>=0.111.0
 Requires-Dist: httpx[http2]>=0.24.1
 Requires-Dist: json-repair>=0.46.2
@@ -173,6 +174,27 @@ These providers are automatically configured with correct OpenAI-compatible endp
 - **⚠️ Unsupported Providers** - Providers like Amazon Bedrock and Google Vertex that require special authentication are clearly marked
 - **⚠️ No Tool Calling** - Models without tool calling support show a big warning since they can't use Code Puppy's file/shell tools
 
+### Durable Execution
+
+Code Puppy now supports **[DBOS](https://github.com/dbos-inc/dbos-transact-py)** durable execution.
+
+When enabled, every agent is automatically wrapped as a `DBOSAgent`, checkpointing key interactions (including agent inputs, LLM responses, MCP calls, and tool calls) in a database for durability and recovery.
+
+You can toggle DBOS via either of these options:
+
+- CLI config (persists): `/set enable_dbos true` (or `false` to disable)
+
+
+Config takes precedence if set; otherwise the environment variable is used.
+
+### Configuration
+
+The following environment variables control DBOS behavior:
+- `DBOS_CONDUCTOR_KEY`: If set, Code Puppy connects to the [DBOS Management Console](https://console.dbos.dev/). Make sure you first register an app named `dbos-code-puppy` on the console to generate a Conductor key. Default: `None`.
+- `DBOS_LOG_LEVEL`: Logging verbosity: `CRITICAL`, `ERROR`, `WARNING`, `INFO`, or `DEBUG`. Default: `ERROR`.
+- `DBOS_SYSTEM_DATABASE_URL`: Database URL used by DBOS. Can point to a local SQLite file or a Postgres instance. Example: `postgresql://postgres:dbos@localhost:5432/postgres`. Default: `dbos_store.sqlite` file in the config directory.
+- `DBOS_APP_VERSION`: If set, Code Puppy uses it as the [DBOS application version](https://docs.dbos.dev/architecture#application-and-workflow-versions) and automatically tries to recover pending workflows for this version. Default: Code Puppy version + Unix timestamp in millisecond (disable automatic recovery).
+
 ### Custom Commands
 Create markdown files in `.claude/commands/`, `.github/prompts/`, or `.agents/commands/` to define custom slash commands. The filename becomes the command name and the content runs as a prompt.
 

{code_puppy-0.0.344 → code_puppy-0.0.346}/README.md

@@ -133,6 +133,27 @@ These providers are automatically configured with correct OpenAI-compatible endp
 - **⚠️ Unsupported Providers** - Providers like Amazon Bedrock and Google Vertex that require special authentication are clearly marked
 - **⚠️ No Tool Calling** - Models without tool calling support show a big warning since they can't use Code Puppy's file/shell tools
 
+### Durable Execution
+
+Code Puppy now supports **[DBOS](https://github.com/dbos-inc/dbos-transact-py)** durable execution.
+
+When enabled, every agent is automatically wrapped as a `DBOSAgent`, checkpointing key interactions (including agent inputs, LLM responses, MCP calls, and tool calls) in a database for durability and recovery.
+
+You can toggle DBOS via either of these options:
+
+- CLI config (persists): `/set enable_dbos true` (or `false` to disable)
+
+
+Config takes precedence if set; otherwise the environment variable is used.
+
+### Configuration
+
+The following environment variables control DBOS behavior:
+- `DBOS_CONDUCTOR_KEY`: If set, Code Puppy connects to the [DBOS Management Console](https://console.dbos.dev/). Make sure you first register an app named `dbos-code-puppy` on the console to generate a Conductor key. Default: `None`.
+- `DBOS_LOG_LEVEL`: Logging verbosity: `CRITICAL`, `ERROR`, `WARNING`, `INFO`, or `DEBUG`. Default: `ERROR`.
+- `DBOS_SYSTEM_DATABASE_URL`: Database URL used by DBOS. Can point to a local SQLite file or a Postgres instance. Example: `postgresql://postgres:dbos@localhost:5432/postgres`. Default: `dbos_store.sqlite` file in the config directory.
+- `DBOS_APP_VERSION`: If set, Code Puppy uses it as the [DBOS application version](https://docs.dbos.dev/architecture#application-and-workflow-versions) and automatically tries to recover pending workflows for this version. Default: Code Puppy version + Unix timestamp in millisecond (disable automatic recovery).
+
 ### Custom Commands
 Create markdown files in `.claude/commands/`, `.github/prompts/`, or `.agents/commands/` to define custom slash commands. The filename becomes the command name and the content runs as a prompt.
 

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/agents/base_agent.py

@@ -24,6 +24,7 @@ from typing import (
 import mcp
 import pydantic
 import pydantic_ai.models
+from dbos import DBOS, SetWorkflowID
 from pydantic_ai import Agent as PydanticAgent
 from pydantic_ai import (
     BinaryContent,
@@ -34,6 +35,7 @@ from pydantic_ai import (
     UsageLimitExceeded,
     UsageLimits,
 )
+from pydantic_ai.durable_exec.dbos import DBOSAgent
 from pydantic_ai.messages import (
     ModelMessage,
     ModelRequest,
@@ -54,6 +56,7 @@ from code_puppy.config import (
     get_global_model_name,
     get_message_limit,
     get_protected_token_count,
+    get_use_dbos,
     get_value,
 )
 from code_puppy.error_logging import log_error
@@ -1209,25 +1212,56 @@ class BaseAgent(ABC):
 
         self._last_model_name = resolved_model_name
         # expose for run_with_mcp
+        # Wrap it with DBOS, but handle MCP servers separately to avoid serialization issues
         global _reload_count
         _reload_count += 1
-        # Include filtered MCP servers in the agent
-        p_agent = PydanticAgent(
-            model=model,
-            instructions=instructions,
-            output_type=str,
-            retries=3,
-            toolsets=filtered_mcp_servers if filtered_mcp_servers else [],
-            history_processors=[self.message_history_accumulator],
-            model_settings=model_settings,
-        )
-        # Register regular tools on the agent
-        agent_tools = self.get_available_tools()
-        register_tools_for_agent(p_agent, agent_tools)
+        if get_use_dbos():
+            # Don't pass MCP servers to the agent constructor when using DBOS
+            # This prevents the "cannot pickle async_generator object" error
+            # MCP servers will be handled separately in run_with_mcp
+            agent_without_mcp = PydanticAgent(
+                model=model,
+                instructions=instructions,
+                output_type=str,
+                retries=3,
+                toolsets=[],  # Don't include MCP servers here
+                history_processors=[self.message_history_accumulator],
+                model_settings=model_settings,
+            )
+
+            # Register regular tools (non-MCP) on the new agent
+            agent_tools = self.get_available_tools()
+            register_tools_for_agent(agent_without_mcp, agent_tools)
+
+            # Wrap with DBOS
+            dbos_agent = DBOSAgent(
+                agent_without_mcp, name=f"{self.name}-{_reload_count}"
+            )
+            self.pydantic_agent = dbos_agent
+            self._code_generation_agent = dbos_agent
 
-        self.pydantic_agent = p_agent
-        self._code_generation_agent = p_agent
-        self._mcp_servers = filtered_mcp_servers
+            # Store filtered MCP servers separately for runtime use
+            self._mcp_servers = filtered_mcp_servers
+        else:
+            # Normal path without DBOS - include filtered MCP servers in the agent
+            # Re-create agent with filtered MCP servers
+            p_agent = PydanticAgent(
+                model=model,
+                instructions=instructions,
+                output_type=str,
+                retries=3,
+                toolsets=filtered_mcp_servers,
+                history_processors=[self.message_history_accumulator],
+                model_settings=model_settings,
+            )
+            # Register regular tools on the agent
+            agent_tools = self.get_available_tools()
+            register_tools_for_agent(p_agent, agent_tools)
+
+            self.pydantic_agent = p_agent
+            self._code_generation_agent = p_agent
+            self._mcp_servers = filtered_mcp_servers
+            self._mcp_servers = mcp_servers
         return self._code_generation_agent
 
     def _create_agent_with_output_type(self, output_type: Type[Any]) -> PydanticAgent:
@@ -1241,7 +1275,7 @@ class BaseAgent(ABC):
             output_type: The Pydantic model or type for structured output.
 
         Returns:
-            A configured PydanticAgent with the custom output_type.
+            A configured PydanticAgent (or DBOSAgent wrapper) with the custom output_type.
         """
         from code_puppy.model_utils import prepare_prompt_for_model
         from code_puppy.tools import register_tools_for_agent
@@ -1268,19 +1302,38 @@ class BaseAgent(ABC):
         global _reload_count
         _reload_count += 1
 
-        temp_agent = PydanticAgent(
-            model=model,
-            instructions=instructions,
-            output_type=output_type,
-            retries=3,
-            toolsets=mcp_servers,
-            history_processors=[self.message_history_accumulator],
-            model_settings=model_settings,
-        )
-        agent_tools = self.get_available_tools()
-        register_tools_for_agent(temp_agent, agent_tools)
-        return temp_agent
+        if get_use_dbos():
+            temp_agent = PydanticAgent(
+                model=model,
+                instructions=instructions,
+                output_type=output_type,
+                retries=3,
+                toolsets=[],
+                history_processors=[self.message_history_accumulator],
+                model_settings=model_settings,
+            )
+            agent_tools = self.get_available_tools()
+            register_tools_for_agent(temp_agent, agent_tools)
+            dbos_agent = DBOSAgent(
+                temp_agent, name=f"{self.name}-structured-{_reload_count}"
+            )
+            return dbos_agent
+        else:
+            temp_agent = PydanticAgent(
+                model=model,
+                instructions=instructions,
+                output_type=output_type,
+                retries=3,
+                toolsets=mcp_servers,
+                history_processors=[self.message_history_accumulator],
+                model_settings=model_settings,
+            )
+            agent_tools = self.get_available_tools()
+            register_tools_for_agent(temp_agent, agent_tools)
+            return temp_agent
 
+    # It's okay to decorate it with DBOS.step even if not using DBOS; the decorator is a no-op in that case.
+    @DBOS.step()
     def message_history_accumulator(self, ctx: RunContext, messages: List[Any]):
         _message_history = self.get_message_history()
         message_history_hashes = set([self.hash_message(m) for m in _message_history])
@@ -1788,14 +1841,49 @@ class BaseAgent(ABC):
 
                 usage_limits = UsageLimits(request_limit=get_message_limit())
 
-                # MCP servers are already included in the agent
-                result_ = await pydantic_agent.run(
-                    prompt_payload,
-                    message_history=self.get_message_history(),
-                    usage_limits=usage_limits,
-                    event_stream_handler=self._event_stream_handler,
-                    **kwargs,
-                )
+                # Handle MCP servers - add them temporarily when using DBOS
+                if (
+                    get_use_dbos()
+                    and hasattr(self, "_mcp_servers")
+                    and self._mcp_servers
+                ):
+                    # Temporarily add MCP servers to the DBOS agent using internal _toolsets
+                    original_toolsets = pydantic_agent._toolsets
+                    pydantic_agent._toolsets = original_toolsets + self._mcp_servers
+                    pydantic_agent._toolsets = original_toolsets + self._mcp_servers
+
+                    try:
+                        # Set the workflow ID for DBOS context so DBOS and Code Puppy ID match
+                        with SetWorkflowID(group_id):
+                            result_ = await pydantic_agent.run(
+                                prompt_payload,
+                                message_history=self.get_message_history(),
+                                usage_limits=usage_limits,
+                                event_stream_handler=self._event_stream_handler,
+                                **kwargs,
+                            )
+                    finally:
+                        # Always restore original toolsets
+                        pydantic_agent._toolsets = original_toolsets
+                elif get_use_dbos():
+                    # DBOS without MCP servers
+                    with SetWorkflowID(group_id):
+                        result_ = await pydantic_agent.run(
+                            prompt_payload,
+                            message_history=self.get_message_history(),
+                            usage_limits=usage_limits,
+                            event_stream_handler=self._event_stream_handler,
+                            **kwargs,
+                        )
+                else:
+                    # Non-DBOS path (MCP servers are already included)
+                    result_ = await pydantic_agent.run(
+                        prompt_payload,
+                        message_history=self.get_message_history(),
+                        usage_limits=usage_limits,
+                        event_stream_handler=self._event_stream_handler,
+                        **kwargs,
+                    )
                 return result_
             except* UsageLimitExceeded as ule:
                 emit_info(f"Usage limit exceeded: {str(ule)}", group_id=group_id)
@@ -1811,8 +1899,12 @@ class BaseAgent(ABC):
                 )
             except* asyncio.exceptions.CancelledError:
                 emit_info("Cancelled")
+                if get_use_dbos():
+                    await DBOS.cancel_workflow_async(group_id)
             except* InterruptedError as ie:
                 emit_info(f"Interrupted: {str(ie)}")
+                if get_use_dbos():
+                    await DBOS.cancel_workflow_async(group_id)
             except* Exception as other_error:
                 # Filter out CancelledError and UsageLimitExceeded from the exception group - let it propagate
                 remaining_exceptions = []

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/cli_runner.py

@@ -12,9 +12,11 @@ import argparse
 import asyncio
 import os
 import sys
+import time
 import traceback
 from pathlib import Path
 
+from dbos import DBOS, DBOSConfig
 from rich.console import Console
 
 from code_puppy import __version__, callbacks, plugins
@@ -24,8 +26,10 @@ from code_puppy.command_line.clipboard import get_clipboard_manager
 from code_puppy.config import (
     AUTOSAVE_DIR,
     COMMAND_HISTORY_FILE,
+    DBOS_DATABASE_URL,
     ensure_config_exists,
     finalize_autosave_session,
+    get_use_dbos,
     initialize_command_history_file,
     save_command_to_history,
 )
@@ -283,6 +287,33 @@ async def main():
 
     await callbacks.on_startup()
 
+    # Initialize DBOS if not disabled
+    if get_use_dbos():
+        # Append a Unix timestamp in ms to the version for uniqueness
+        dbos_app_version = os.environ.get(
+            "DBOS_APP_VERSION", f"{current_version}-{int(time.time() * 1000)}"
+        )
+        dbos_config: DBOSConfig = {
+            "name": "dbos-code-puppy",
+            "system_database_url": DBOS_DATABASE_URL,
+            "run_admin_server": False,
+            "conductor_key": os.environ.get(
+                "DBOS_CONDUCTOR_KEY"
+            ),  # Optional, if set in env, connect to conductor
+            "log_level": os.environ.get(
+                "DBOS_LOG_LEVEL", "ERROR"
+            ),  # Default to ERROR level to suppress verbose logs
+            "application_version": dbos_app_version,  # Match DBOS app version to Code Puppy version
+        }
+        try:
+            DBOS(config=dbos_config)
+            DBOS.launch()
+        except Exception as e:
+            emit_error(f"Error initializing DBOS: {e}")
+            sys.exit(1)
+    else:
+        pass
+
     global shutdown_flag
     shutdown_flag = False
     try:
@@ -307,6 +338,8 @@ async def main():
         if bus_renderer:
             bus_renderer.stop()
         await callbacks.on_shutdown()
+        if get_use_dbos():
+            DBOS.destroy()
 
 
 async def interactive_mode(message_renderer, initial_command: str = None) -> None:
@@ -874,6 +907,8 @@ def main_entry():
     except KeyboardInterrupt:
         # Note: Using sys.stderr for crash output - messaging system may not be available
         sys.stderr.write(traceback.format_exc())
+        if get_use_dbos():
+            DBOS.destroy()
         return 0
     finally:
         # Reset terminal on Unix-like systems (not Windows)

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/command_line/add_model_menu.py

@@ -17,6 +17,7 @@ from prompt_toolkit.layout import Dimension, Layout, VSplit, Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.widgets import Frame
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.config import EXTRA_MODELS_FILE, set_config_value
 from code_puppy.messaging import emit_error, emit_info, emit_warning
 from code_puppy.models_dev_parser import ModelInfo, ModelsDevRegistry, ProviderInfo
@@ -724,8 +725,8 @@ class AddModelMenu:
                 emit_info(f"  {hint}")
 
             try:
-                # Use regular input - simpler and works in threaded context
-                value = input(f"  Enter {env_var} (or press Enter to skip): ").strip()
+                # Use safe_input for cross-platform compatibility (Windows fix)
+                value = safe_input(f"  Enter {env_var} (or press Enter to skip): ")
 
                 if not value:
                     emit_warning(
@@ -785,7 +786,7 @@ class AddModelMenu:
         )
 
         try:
-            model_name = input("  Model ID: ").strip()
+            model_name = safe_input("  Model ID: ")
 
             if not model_name:
                 emit_warning("No model name provided, cancelled.")
@@ -795,7 +796,7 @@ class AddModelMenu:
             emit_info("\n  Enter the context window size (in tokens).")
             emit_info("  Common sizes: 8192, 32768, 128000, 200000, 1000000\n")
 
-            context_input = input("  Context size [128000]: ").strip()
+            context_input = safe_input("  Context size [128000]: ")
 
             if not context_input:
                 context_length = 128000  # Default
@@ -1045,11 +1046,9 @@ class AddModelMenu:
                     f"   It will be very limited for coding tasks."
                 )
                 try:
-                    confirm = (
-                        input("\n  Are you sure you want to add this model? (y/N): ")
-                        .strip()
-                        .lower()
-                    )
+                    confirm = safe_input(
+                        "\n  Are you sure you want to add this model? (y/N): "
+                    ).lower()
                     if confirm not in ("y", "yes"):
                         emit_info("Model addition cancelled.")
                         return False

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/command_line/config_commands.py

@@ -43,6 +43,7 @@ def handle_show_command(command: str) -> bool:
         get_protected_token_count,
         get_puppy_name,
         get_temperature,
+        get_use_dbos,
         get_yolo_mode,
     )
     from code_puppy.keymap import get_cancel_agent_display_name
@@ -71,6 +72,7 @@ def handle_show_command(command: str) -> bool:
 [bold]default_agent:[/bold]        [cyan]{default_agent}[/cyan]
 [bold]model:[/bold]                 [green]{model}[/green]
 [bold]YOLO_MODE:[/bold]             {"[red]ON[/red]" if yolo_mode else "[yellow]off[/yellow]"}
+[bold]DBOS:[/bold]                  {"[green]enabled[/green]" if get_use_dbos() else "[yellow]disabled[/yellow]"} (toggle: /set enable_dbos true|false)
 [bold]auto_save_session:[/bold]     {"[green]enabled[/green]" if auto_save else "[yellow]disabled[/yellow]"}
 [bold]protected_tokens:[/bold]      [cyan]{protected_tokens:,}[/cyan] recent tokens preserved
 [bold]compaction_threshold:[/bold]     [cyan]{compaction_threshold:.1%}[/cyan] context usage triggers compaction
@@ -211,6 +213,14 @@ def handle_set_command(command: str) -> bool:
         )
         return True
     if key:
+        # Check if we're toggling DBOS enablement
+        if key == "enable_dbos":
+            emit_info(
+                Text.from_markup(
+                    "[yellow]⚠️ DBOS configuration changed. Please restart Code Puppy for this change to take effect.[/yellow]"
+                )
+            )
+
         # Validate cancel_agent_key before setting
         if key == "cancel_agent_key":
             from code_puppy.keymap import VALID_CANCEL_KEYS

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/command_line/mcp/catalog_server_installer.py

@@ -7,6 +7,7 @@ MCP servers from the catalog.
 import os
 from typing import Dict, Optional
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.messaging import emit_info, emit_success, emit_warning
 
 # Helpful hints for common environment variables
@@ -52,7 +53,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     # Get custom name
     default_name = server.name
     try:
-        name_input = input(f"  Server name [{default_name}]: ").strip()
+        name_input = safe_input(f"  Server name [{default_name}]: ")
         server_name = name_input if name_input else default_name
     except (KeyboardInterrupt, EOFError):
         emit_info("")
@@ -63,9 +64,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     existing = find_server_id_by_name(manager, server_name)
     if existing:
         try:
-            override = input(
-                f"  Server '{server_name}' exists. Override? [y/N]: "
-            ).strip()
+            override = safe_input(f"  Server '{server_name}' exists. Override? [y/N]: ")
             if not override.lower().startswith("y"):
                 emit_warning("Installation cancelled")
                 return None
@@ -91,7 +90,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                     hint = get_env_var_hint(var)
                     if hint:
                         emit_info(f"     {hint}")
-                    value = input(f"     Enter {var}: ").strip()
+                    value = safe_input(f"     Enter {var}: ")
                     if value:
                         env_vars[var] = value
                         # Save to config for future use
@@ -119,7 +118,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                 prompt_str += " (optional)"
 
             try:
-                value = input(f"{prompt_str}: ").strip()
+                value = safe_input(f"{prompt_str}: ")
                 if value:
                     cmd_args[name] = value
                 elif default:

{code_puppy-0.0.344 → code_puppy-0.0.346}/code_puppy/command_line/mcp/custom_server_installer.py

@@ -7,6 +7,7 @@ custom MCP servers with JSON configuration.
 import json
 import os
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 
 # Example configurations for each server type
@@ -58,7 +59,7 @@ def prompt_and_install_custom_server(manager) -> bool:
 
     # Get server name
     try:
-        server_name = input("  Server name: ").strip()
+        server_name = safe_input("  Server name: ")
         if not server_name:
             emit_warning("Server name is required")
             return False
@@ -71,9 +72,7 @@ def prompt_and_install_custom_server(manager) -> bool:
     existing = find_server_id_by_name(manager, server_name)
     if existing:
         try:
-            override = input(
-                f"  Server '{server_name}' exists. Override? [y/N]: "
-            ).strip()
+            override = safe_input(f"  Server '{server_name}' exists. Override? [y/N]: ")
             if not override.lower().startswith("y"):
                 emit_warning("Cancelled")
                 return False
@@ -89,7 +88,7 @@ def prompt_and_install_custom_server(manager) -> bool:
     emit_info("    3. 📡 sse    - Server-Sent Events\n")
 
     try:
-        type_choice = input("  Enter choice [1-3]: ").strip()
+        type_choice = safe_input("  Enter choice [1-3]: ")
     except (KeyboardInterrupt, EOFError):
         emit_info("")
         emit_warning("Cancelled")
@@ -115,8 +114,8 @@ def prompt_and_install_custom_server(manager) -> bool:
     empty_count = 0
     try:
         while True:
-            line = input()
-            if line.strip() == "":
+            line = safe_input("")
+            if line == "":
                 empty_count += 1
                 if empty_count >= 2:
                     break

code_puppy-0.0.346/code_puppy/command_line/utils.py

@@ -0,0 +1,93 @@
+import os
+from typing import List, Tuple
+
+from rich.table import Table
+
+
+def list_directory(path: str = None) -> Tuple[List[str], List[str]]:
+    """
+    Returns (dirs, files) for the specified path, splitting out directories and files.
+    """
+    if path is None:
+        path = os.getcwd()
+    entries = []
+    try:
+        entries = [e for e in os.listdir(path)]
+    except Exception as e:
+        raise RuntimeError(f"Error listing directory: {e}")
+    dirs = [e for e in entries if os.path.isdir(os.path.join(path, e))]
+    files = [e for e in entries if not os.path.isdir(os.path.join(path, e))]
+    return dirs, files
+
+
+def make_directory_table(path: str = None) -> Table:
+    """
+    Returns a rich.Table object containing the directory listing.
+    """
+    if path is None:
+        path = os.getcwd()
+    dirs, files = list_directory(path)
+    table = Table(
+        title=f"\U0001f4c1 [bold blue]Current directory:[/bold blue] [cyan]{path}[/cyan]"
+    )
+    table.add_column("Type", style="dim", width=8)
+    table.add_column("Name", style="bold")
+    for d in sorted(dirs):
+        table.add_row("[green]dir[/green]", f"[cyan]{d}[/cyan]")
+    for f in sorted(files):
+        table.add_row("[yellow]file[/yellow]", f"{f}")
+    return table
+
+
+def _reset_windows_console() -> None:
+    """Reset Windows console to normal input mode.
+
+    After a prompt_toolkit Application exits on Windows, the console can be
+    left in a weird state where Enter doesn't work properly. This resets it.
+    """
+    import sys
+
+    if sys.platform != "win32":
+        return
+
+    try:
+        import ctypes
+
+        kernel32 = ctypes.windll.kernel32
+        # Get handle to stdin
+        STD_INPUT_HANDLE = -10
+        handle = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+
+        # Enable line input and echo (normal console mode)
+        # ENABLE_LINE_INPUT = 0x0002
+        # ENABLE_ECHO_INPUT = 0x0004
+        # ENABLE_PROCESSED_INPUT = 0x0001
+        NORMAL_MODE = 0x0007  # Line input + echo + processed
+        kernel32.SetConsoleMode(handle, NORMAL_MODE)
+    except Exception:
+        pass  # Silently ignore errors - this is best-effort
+
+
+def safe_input(prompt_text: str = "") -> str:
+    """Cross-platform safe input that works after prompt_toolkit Applications.
+
+    On Windows, raw input() can fail after a prompt_toolkit Application exits
+    because the terminal can be left in a weird state. This function resets
+    the Windows console mode before calling input().
+
+    Args:
+        prompt_text: The prompt to display to the user
+
+    Returns:
+        The user's input string (stripped)
+
+    Raises:
+        KeyboardInterrupt: If user presses Ctrl+C
+        EOFError: If user presses Ctrl+D/Ctrl+Z
+    """
+    # Reset Windows console to normal mode before reading input
+    _reset_windows_console()
+
+    # Use standard input() - now that console is reset, it should work
+    result = input(prompt_text)
+    return result.strip() if result else ""