janito 2.29.0__py3-none-any.whl → 2.31.0__py3-none-any.whl

janito/README.md

@@ -116,11 +116,11 @@ Janito includes powerful built-in tools for:
 - System commands
 - And more...
 
-### Profiles and Roles
+### Profiles
 Use predefined system prompts:
 ```bash
-janito --profile developer "Create a REST API"
-janito --role python-expert "Optimize this algorithm"
+janito --developer "Create a REST API"  # Same as --profile developer
+janito --market "Analyze market trends"   # Same as --profile market-analyst
 ```
 
 ### Environment Variables

janito/agent/setup_agent.py

@@ -25,10 +25,14 @@ def _load_template_content(profile, templates_dir):
 
     Spaces in the profile name are converted to underscores to align with the file-naming convention (e.g. "Developer with Python Tools" ➜ "Developer_with_Python_Tools" (matches: system_prompt_template_Developer_with_Python_Tools.txt.j2)).
     """
-    # Sanitize profile for filename resolution (convert whitespace to underscores)
-    sanitized_profile = re.sub(r"\s+", "_", profile.strip()) if profile else profile
-
+    sanitized_profile = re.sub(r"\s+", "_", profile.strip())
     template_filename = f"system_prompt_template_{sanitized_profile}.txt.j2"
+
+    return _find_template_file(template_filename, templates_dir)
+
+
+def _find_template_file(template_filename, templates_dir):
+    """Find and load template file from various locations."""
     template_path = templates_dir / template_filename
 
     # 1) Check local templates directory
@@ -96,39 +100,9 @@ def _load_template_content(profile, templates_dir):
         )
 
     raise FileNotFoundError(error_msg)
-    # Replace spaces in profile name with underscores for filename resolution
-    sanitized_profile = re.sub(r"\\s+", "_", profile.strip()) if profile else profile
-    """
-    Loads the template content for the given profile from the specified directory or package resources.
-    If the profile template is not found in the default locations, tries to load from the user profiles directory ~/.janito/profiles.
-    """
-
-    # Sanitize profile name by replacing spaces with underscores to match filename conventions
-    sanitized_profile = re.sub(r"\\s+", "_", profile.strip())
-    template_filename = f"system_prompt_template_{sanitized_profile}.txt.j2"
-    template_path = templates_dir / template_filename
-    if template_path.exists():
-        with open(template_path, "r", encoding="utf-8") as file:
-            return file.read(), template_path
-    # Try package import fallback
-    try:
-        with importlib.resources.files("janito.agent.templates.profiles").joinpath(
-            template_filename
-        ).open("r", encoding="utf-8") as file:
-            return file.read(), template_path
-    except (FileNotFoundError, ModuleNotFoundError, AttributeError):
-        # Try user profiles directory
-        user_profiles_dir = Path(os.path.expanduser("~/.janito/profiles"))
-        user_template_path = user_profiles_dir / profile
-        if user_template_path.exists():
-            with open(user_template_path, "r", encoding="utf-8") as file:
-                return file.read(), user_template_path
-        raise FileNotFoundError(
-            f"[janito] Could not find profile-specific template '{template_filename}' in {template_path} nor in janito.agent.templates.profiles package nor in user profiles directory {user_template_path}."
-        )
 
 
-def _prepare_template_context(role, profile, allowed_permissions):
+def _prepare_template_context(role, profile, allowed_permissions, args=None):
     """
     Prepares the context dictionary for Jinja2 template rendering.
     """
@@ -148,6 +122,11 @@ def _prepare_template_context(role, profile, allowed_permissions):
             perm_str += "x"
         allowed_permissions = perm_str or None
     context["allowed_permissions"] = allowed_permissions
+
+    # Add emoji flag for system prompt
+    context["emoji_enabled"] = (
+        getattr(args, "emoji", False) if "args" in locals() else False
+    )
     # Inject platform info if execute permission is present
     if allowed_permissions and "x" in allowed_permissions:
         pd = PlatformDiscovery()
@@ -171,6 +150,11 @@ def _prepare_template_context(role, profile, allowed_permissions):
         else:
             context["allowed_sites_info"] = f"Restricted to: {', '.join(allowed_sites)}"
 
+    # Add emoji flag for system prompt
+    context["emoji_enabled"] = (
+        getattr(args, "emoji", False) if "args" in locals() else False
+    )
+
     return context
 
 
@@ -267,7 +251,9 @@ def setup_agent(
     template_content, template_path = _load_template_content(profile, templates_dir)
 
     template = Template(template_content)
-    context = _prepare_template_context(role, profile, allowed_permissions)
+    context = _prepare_template_context(
+        role, profile, allowed_permissions, locals().get("args")
+    )
 
     # Debug output if requested
     debug_flag = False

janito/agent/templates/profiles/system_prompt_template_Developer_with_Python_Tools.txt.j2

@@ -88,4 +88,10 @@ You are: {{ role | default('developer') }}
 {# Trying to prevent surrogates generation, found this frequently in gpt4.1/windows #}
 - While writing code, if you need an emoji or special Unicode character in a string, then insert the actual character (e.g., 📖) directly instead of using surrogate pairs or escape sequences.
 {% endif %}
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 🎉
+- Use appropriate emojis to enhance communication: ✅ for success, ⚠️ for warnings, 🔄 for progress, etc.
+- Emojis should complement the message, not replace clear explanations
+{% endif %}
 

janito/agent/templates/profiles/system_prompt_template_developer.txt.j2

@@ -78,4 +78,10 @@ You are: {{ role | default('software developer') }}
 {# Trying to prevent surrogates generation, found this frequently in gpt4.1/windows #}
 - While writing code, if you need an emoji or special Unicode character in a string, then insert the actual character (e.g., 📖) directly instead of using surrogate pairs or escape sequences.
 {% endif %}
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 🎉
+- Use appropriate emojis to enhance communication: ✅ for success, ⚠️ for warnings, 🔄 for progress, etc.
+- Emojis should complement the message, not replace clear explanations
+{% endif %}
 

janito/agent/templates/profiles/system_prompt_template_market_analyst.txt.j2

@@ -107,4 +107,10 @@ When asked about specific stocks or market movements, provide detailed analysis
 {% endfor %}
 {% endif %}
 
-## Guidelines
+## Guidelines
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 📊
+- Use appropriate emojis to enhance communication: 📈 for uptrends, 📉 for downtrends, 💰 for profits, ⚠️ for warnings, etc.
+- Emojis should complement the message, not replace clear financial analysis
+{% endif %}

janito/agent/templates/profiles/system_prompt_template_model_conversation_without_tools_or_context.txt.j2

@@ -50,4 +50,10 @@ You are: {{ role | default('helpful assistant') }}
 ## Guidelines
 - Provide helpful, accurate, and concise responses
 - Ask clarifying questions when needed
-- Maintain a friendly and professional tone
+- Maintain a friendly and professional tone
+{% if emoji_enabled %}
+## Emoji Usage
+- Feel free to use emojis in your responses to make them more engaging and expressive 😊
+- Use appropriate emojis to enhance communication: ✅ for confirmations, ❓ for questions, 💡 for ideas, etc.
+- Emojis should complement the message, not replace clear communication
+{% endif %}

janito/cli/chat_mode/session.py

@@ -119,9 +119,7 @@ class ChatSession:
         profile_system_prompt = None
         no_tools_mode = False
 
-        profile = self._determine_profile(
-            profile, role_arg, python_profile, market_profile
-        )
+        profile = self._determine_profile(profile, python_profile, market_profile)
 
         if (
             profile is None
@@ -136,31 +134,8 @@ class ChatSession:
             if skip_profile_selection:
                 profile = "Developer with Python Tools"  # Default for non-interactive commands
             else:
-                try:
-                    from janito.cli.chat_mode.session_profile_select import (
-                        select_profile,
-                    )
-
-                    result = select_profile()
-                    if isinstance(result, dict):
-                        profile = result.get("profile")
-                        profile_system_prompt = result.get("profile_system_prompt")
-                        no_tools_mode = result.get("no_tools_mode", False)
-                    elif isinstance(result, str) and result.startswith("role:"):
-                        role = result[len("role:") :].strip()
-                        profile = "Developer with Python Tools"
-                    else:
-                        profile = (
-                            "Developer with Python Tools"
-                            if result == "Developer"
-                            else result
-                        )
-                except ImportError:
-                    profile = "Raw Model Session (no tools, no context)"
-        if role_arg is not None:
-            role = role_arg
-            if profile is None:
                 profile = "Developer with Python Tools"
+
         return profile, role, profile_system_prompt, no_tools_mode
 
     def _create_conversation_history(self):
@@ -308,25 +283,6 @@ class ChatSession:
                 )
             )
 
-            for candidate in candidates:
-                try:
-                    if not candidate:
-                        continue
-                    parsed = urlparse(str(candidate))
-                    host = parsed.netloc or parsed.path
-                    if host:
-                        backend_hostname = host
-                        break
-                except Exception:
-                    backend_hostname = str(candidate)
-                    break
-
-            self.console.print(
-                Rule(
-                    f"[bold blue]Model: {model_name} ({provider_name}) | Backend: {backend_hostname}[/bold blue]"
-                )
-            )
-
             self._prompt_handler.run_prompt(cmd_input)
             end_time = time.time()
             elapsed = end_time - start_time
@@ -337,6 +293,8 @@ class ChatSession:
             print_token_message_summary(
                 self.console, self.msg_count, usage, elapsed=elapsed
             )
+            # Send terminal bell character to trigger TUI bell after printing token summary
+            print("\a", end="", flush=True)
             if final_event and hasattr(final_event, "metadata"):
                 exit_reason = (
                     final_event.metadata.get("exit_reason")
@@ -356,18 +314,18 @@ class ChatSession:
     def _extract_args(self, args):
         """Extract profile and role arguments from args."""
         profile = getattr(args, "profile", None) if args is not None else None
-        role_arg = getattr(args, "role", None) if args is not None else None
+        role_arg = None
         python_profile = (
             getattr(args, "developer", False) if args is not None else False
         )
         market_profile = getattr(args, "market", False) if args is not None else False
         return profile, role_arg, python_profile, market_profile
 
-    def _determine_profile(self, profile, role_arg, python_profile, market_profile):
+    def _determine_profile(self, profile, python_profile, market_profile):
         """Determine the profile based on flags and arguments."""
-        if python_profile and profile is None and role_arg is None:
+        if python_profile and profile is None:
             return "Developer with Python Tools"
-        if market_profile and profile is None and role_arg is None:
+        if market_profile and profile is None:
             return "Market Analyst"
         return profile
 
@@ -517,9 +475,19 @@ class ChatSession:
         else:
             duration_str = f"{session_duration/3600:.1f}h"
 
+        # Format tokens in k/m/t as appropriate
+        if total_tokens >= 1_000_000_000:
+            token_str = f"{total_tokens/1_000_000_000:.1f}t"
+        elif total_tokens >= 1_000_000:
+            token_str = f"{total_tokens/1_000_000:.1f}m"
+        elif total_tokens >= 1_000:
+            token_str = f"{total_tokens/1_000:.1f}k"
+        else:
+            token_str = f"{total_tokens}"
+
         self.console.print(f"[bold yellow]Session completed![/bold yellow]")
         self.console.print(
-            f"[dim]Session time: {duration_str} | Total tokens: {total_tokens:,}[/dim]"
+            f"[dim]Session time: {duration_str} | Total tokens: {token_str}[/dim]"
         )
         self.console.print("[bold yellow]Goodbye![/bold yellow]")
 

janito/cli/cli_commands/list_plugins.py

@@ -14,80 +14,104 @@ def handle_list_plugins(args: argparse.Namespace) -> None:
     """List plugins command handler."""
 
     if getattr(args, "list_plugins_available", False):
-        # List available plugins
-        available = list_available_plugins()
-        builtin_plugins = BuiltinPluginRegistry.list_builtin_plugins()
-
-        if available or builtin_plugins:
-            print("Available plugins:")
-
-            # Show builtin plugins first
-            if builtin_plugins:
-                print("  Builtin plugins:")
-                for plugin in builtin_plugins:
-                    print(f"    - {plugin} [BUILTIN]")
-
-            # Show other available plugins
-            other_plugins = [p for p in available if p not in builtin_plugins]
-            if other_plugins:
-                print("  External plugins:")
-                for plugin in other_plugins:
-                    print(f"    - {plugin}")
-        else:
-            print("No plugins found in search paths")
-            print("Search paths:")
-            print(f"  - {os.getcwd()}/plugins")
-            print(f"  - {os.path.expanduser('~')}/.janito/plugins")
+        _list_available_plugins()
     elif getattr(args, "list_resources", False):
-        # List all resources from loaded plugins
-        manager = PluginManager()
-        all_resources = manager.list_all_resources()
-
-        if all_resources:
-            print("Plugin Resources:")
-            for plugin_name, resources in all_resources.items():
-                metadata = manager.get_plugin_metadata(plugin_name)
-                print(
-                    f"\n{plugin_name} v{metadata.version if metadata else 'unknown'}:"
-                )
-
-                # Group resources by type
-                tools = [r for r in resources if r["type"] == "tool"]
-                commands = [r for r in resources if r["type"] == "command"]
-                configs = [r for r in resources if r["type"] == "config"]
-
-                if tools:
-                    print("  Tools:")
-                    for tool in tools:
-                        print(f"    - {tool['name']}: {tool['description']}")
-
-                if commands:
-                    print("  Commands:")
-                    for cmd in commands:
-                        print(f"    - {cmd['name']}: {cmd['description']}")
-
-                if configs:
-                    print("  Configuration:")
-                    for config in configs:
-                        print(f"    - {config['name']}: {config['description']}")
-        else:
-            print("No plugins loaded")
+        _list_plugin_resources()
     else:
-        # List loaded plugins
-        manager = PluginManager()
-        loaded = manager.list_plugins()
-
-        if loaded:
-            print("Loaded plugins:")
-            for plugin_name in loaded:
-                metadata = manager.get_plugin_metadata(plugin_name)
-                is_builtin = BuiltinPluginRegistry.is_builtin(plugin_name)
-                if metadata:
-                    builtin_tag = " [BUILTIN]" if is_builtin else ""
-                    print(f"  - {metadata.name} v{metadata.version}{builtin_tag}")
-                    print(f"    {metadata.description}")
-                    if metadata.author:
-                        print(f"    Author: {metadata.author}")
-                    print()
-        else:
-            print("No plugins loaded")
+        _list_loaded_plugins()
+
+
+def _list_available_plugins():
+    """List available plugins."""
+    available = list_available_plugins()
+    builtin_plugins = BuiltinPluginRegistry.list_builtin_plugins()
+
+    if available or builtin_plugins:
+        print("Available plugins:")
+        _print_builtin_plugins(builtin_plugins)
+        _print_external_plugins(available, builtin_plugins)
+    else:
+        print("No plugins found in search paths")
+        print("Search paths:")
+        print(f"  - {os.getcwd()}/plugins")
+        print(f"  - {os.path.expanduser('~')}/.janito/plugins")
+
+
+def _print_builtin_plugins(builtin_plugins):
+    """Print builtin plugins."""
+    if builtin_plugins:
+        print("  Builtin plugins:")
+        for plugin in builtin_plugins:
+            print(f"    - {plugin} [BUILTIN]")
+
+
+def _print_external_plugins(available, builtin_plugins):
+    """Print external plugins."""
+    other_plugins = [p for p in available if p not in builtin_plugins]
+    if other_plugins:
+        print("  External plugins:")
+        for plugin in other_plugins:
+            print(f"    - {plugin}")
+
+
+def _list_plugin_resources():
+    """List all resources from loaded plugins."""
+    manager = PluginManager()
+    all_resources = manager.list_all_resources()
+
+    if all_resources:
+        print("Plugin Resources:")
+        for plugin_name, resources in all_resources.items():
+            metadata = manager.get_plugin_metadata(plugin_name)
+            print(f"\n{plugin_name} v{metadata.version if metadata else 'unknown'}:")
+            _print_resources_by_type(resources)
+    else:
+        print("No plugins loaded")
+
+
+def _print_resources_by_type(resources):
+    """Print resources grouped by type."""
+    tools = [r for r in resources if r["type"] == "tool"]
+    commands = [r for r in resources if r["type"] == "command"]
+    configs = [r for r in resources if r["type"] == "config"]
+
+    if tools:
+        print("  Tools:")
+        for tool in tools:
+            print(f"    - {tool['name']}: {tool['description']}")
+
+    if commands:
+        print("  Commands:")
+        for cmd in commands:
+            print(f"    - {cmd['name']}: {cmd['description']}")
+
+    if configs:
+        print("  Configuration:")
+        for config in configs:
+            print(f"    - {config['name']}: {config['description']}")
+
+
+def _list_loaded_plugins():
+    """List loaded plugins."""
+    manager = PluginManager()
+    loaded = manager.list_plugins()
+
+    if loaded:
+        print("Loaded plugins:")
+        for plugin_name in loaded:
+            _print_plugin_details(manager, plugin_name)
+    else:
+        print("No plugins loaded")
+
+
+def _print_plugin_details(manager, plugin_name):
+    """Print details for a loaded plugin."""
+    metadata = manager.get_plugin_metadata(plugin_name)
+    is_builtin = BuiltinPluginRegistry.is_builtin(plugin_name)
+    if metadata:
+        builtin_tag = " [BUILTIN]" if is_builtin else ""
+        print(f"  - {metadata.name} v{metadata.version}{builtin_tag}")
+        print(f"    {metadata.description}")
+        if metadata.author:
+            print(f"    Author: {metadata.author}")
+        print()

janito/cli/cli_commands/show_system_prompt.py

@@ -35,6 +35,7 @@ def _prepare_context(args, agent_role, allowed_permissions):
     context["role"] = agent_role or "developer"
     context["profile"] = getattr(args, "profile", None)
     context["allowed_permissions"] = allowed_permissions
+    context["emoji_enabled"] = getattr(args, "emoji", False)
     if allowed_permissions and "x" in allowed_permissions:
         pd = PlatformDiscovery()
         context["platform"] = pd.get_platform_name()
@@ -122,6 +123,10 @@ def handle_show_system_prompt(args):
     if profile is None and getattr(args, "market", False):
         profile = "Market Analyst"
 
+    # Handle --developer flag mapping to Developer With Python Tools profile
+    if profile is None and getattr(args, "developer", False):
+        profile = "Developer With Python Tools"
+
     if not profile:
         print(
             "[janito] No profile specified. The main agent runs without a system prompt template.\n"
@@ -152,9 +157,9 @@ def handle_show_system_prompt(args):
     system_prompt = template.render(**context)
     system_prompt = re.sub(r"\n{3,}", "\n\n", system_prompt)
 
-    print(
-        f"\n--- System Prompt (resolved, profile: {getattr(args, 'profile', 'main')}) ---\n"
-    )
+    # Use the actual profile name for display, not the resolved value
+    display_profile = profile or "main"
+    print(f"\n--- System Prompt (resolved, profile: {display_profile}) ---\n")
     print(system_prompt)
     print("\n-------------------------------\n")
     if agent_role:

janito/cli/core/runner.py

@@ -109,8 +109,8 @@ def prepare_llm_driver_config(args, modifiers):
     llm_driver_config = LLMDriverConfig(**driver_config_data)
     if getattr(llm_driver_config, "verbose_api", None):
         pass
-    # If both --role and --profile are provided, --role takes precedence for agent_role
-    agent_role = modifiers.get("role") or modifiers.get("profile") or "developer"
+
+    agent_role = modifiers.get("profile") or "developer"
     return provider, llm_driver_config, agent_role
 
 

janito/cli/main_cli.py

@@ -51,14 +51,6 @@ definition = [
             "help": "Start with the Market Analyst profile (equivalent to --profile 'Market Analyst')",
         },
     ),
-    (
-        ["--role"],
-        {
-            "metavar": "ROLE",
-            "help": "Select the developer role name (overrides profile, e.g. 'python-expert').",
-            "default": None,
-        },
-    ),
     (
         ["-W", "--workdir"],
         {
@@ -205,6 +197,13 @@ definition = [
             "help": "Set the reasoning effort for models that support it (low, medium, high, none)",
         },
     ),
+    (
+        ["--emoji"],
+        {
+            "action": "store_true",
+            "help": "Enable emoji usage in responses to make output more engaging and expressive",
+        },
+    ),
     (["user_prompt"], {"nargs": argparse.REMAINDER, "help": "Prompt to submit"}),
     (
         ["-e", "--event-log"],
@@ -244,7 +243,6 @@ definition = [
 MODIFIER_KEYS = [
     "provider",
     "model",
-    "role",
     "profile",
     "developer",
     "market",
@@ -257,6 +255,7 @@ MODIFIER_KEYS = [
     "exec",
     "read",
     "write",
+    "emoji",
 ]
 SETTER_KEYS = ["set", "set_provider", "set_api_key", "unset"]
 GETTER_KEYS = [
@@ -372,9 +371,7 @@ class JanitoCLI:
             for k in MODIFIER_KEYS
             if getattr(self.args, k, None) is not None
         }
-        # If --role is provided, override role in modifiers
-        if getattr(self.args, "role", None):
-            modifiers["role"] = getattr(self.args, "role")
+
         return modifiers
 
     def classify(self):
@@ -420,9 +417,6 @@ class JanitoCLI:
             self.args.exec = True
             # Remove the /rwx prefix from the prompt
             self.args.user_prompt = self.args.user_prompt[1:]
-        elif self.args.user_prompt and self.args.user_prompt[0].startswith("/"):
-            # Skip LLM processing for other commands that start with /
-            return
 
         # If running in single shot mode and --profile is not provided, default to 'developer' profile
         # Skip profile selection for list commands that don't need it

janito/cli/prompt_core.py

@@ -216,6 +216,8 @@ class PromptHandler:
             if on_event and final_event is not None:
                 on_event(final_event)
                 global_event_bus.publish(final_event)
+                # Terminal bell moved to token summary printing in session.py and handler.py
+                pass  # print('\a', end='', flush=True)
         except KeyboardInterrupt:
             # Capture user interrupt / cancellation
             self.console.print("[red]Interrupted by the user.[/red]")

janito/cli/single_shot_mode/handler.py

@@ -125,6 +125,8 @@ class PromptHandler:
             print_token_message_summary(
                 shared_console, msg_count=1, usage=usage, elapsed=elapsed
             )
+            # Send terminal bell character to trigger TUI bell after printing token summary
+            print("\a", end="", flush=True)
         self._cleanup_driver_and_console()
 
     def _cleanup_driver_and_console(self):

janito/llm/agent.py

@@ -244,7 +244,12 @@ class LLMAgent:
                         f"[agent] [DEBUG] Tool call detected: {getattr(part, 'name', repr(part))} with arguments: {getattr(part, 'arguments', None)}"
                     )
                 tool_calls.append(part)
-                result = self.tools_adapter.execute_function_call_message_part(part)
+                try:
+                    result = self.tools_adapter.execute_function_call_message_part(part)
+                except Exception as e:
+                    # Catch any exception during tool execution and return as string
+                    # instead of letting it propagate to the user
+                    result = str(e)
                 tool_results.append(result)
         if tool_calls:
             # Prepare tool_calls message for assistant

janito/provider_registry.py

@@ -41,7 +41,7 @@ class ProviderRegistry:
             rows.append(info[:3])
 
         # Group providers by openness (open-source first, then proprietary)
-        open_providers = {"cerebras", "deepseek", "alibaba", "moonshot", "zai"}
+        open_providers = {"cerebras", "deepseek", "alibaba", "moonshotai", "zai"}
 
         def sort_key(row):
             provider_name = row[0]

janito/providers/openai/provider.py

@@ -18,7 +18,7 @@ class OpenAIProvider(LLMProvider):
     MAINTAINER = "João Pinto <janito@ikignosis.org>"
     MODEL_SPECS = MODEL_SPECS
     DEFAULT_MODEL = (
-        "gpt-5"  # Options: gpt-4.1, gpt-4o, o3-mini, o4-mini, gpt-5, gpt-5-nano
+        "gpt-4.1"  # Options: gpt-4.1, gpt-4o, o3-mini, o4-mini, gpt-5, gpt-5-nano
     )
 
     def __init__(

janito/tools/adapters/local/ask_user.py

@@ -5,6 +5,7 @@ from janito.tools.loop_protection_decorator import protect_against_loops
 from rich import print as rich_print
 from janito.i18n import tr
 from rich.panel import Panel
+from rich.markdown import Markdown
 from prompt_toolkit import PromptSession
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.enums import EditingMode
@@ -36,7 +37,7 @@ class AskUserTool(ToolBase):
     def run(self, question: str) -> str:
 
         print()  # Print an empty line before the question panel
-        rich_print(Panel.fit(question, title=tr("Question"), style="cyan"))
+        rich_print(Panel.fit(Markdown(question), title=tr("Question"), style="cyan"))
 
         bindings = KeyBindings()
         mode = {"multiline": False}
@@ -107,4 +108,5 @@ class AskUserTool(ToolBase):
                     rich_print(
                         "[yellow]Warning: Some characters in your input were not valid UTF-8 and have been replaced.[/yellow]"
                     )
+                print("\a", end="", flush=True)  # Print bell character
                 return sanitized

janito/tools/adapters/local/fetch_url.py

@@ -196,25 +196,15 @@ class FetchUrlTool(ToolBase):
         whitelist_manager = get_url_whitelist_manager()
 
         if not whitelist_manager.is_url_allowed(url):
-            error_message = tr(
-                "Warning: URL blocked by whitelist: {url}",
-                url=url,
-            )
+            error_message = tr("Blocked")
             self.report_error(
-                tr(
-                    "❗ URL blocked by whitelist: {url}",
-                    url=url,
-                ),
+                tr("❗ Blocked"),
                 ReportAction.READ,
             )
             return error_message
 
         # Check session cache first
         if url in self.session_cache:
-            self.report_warning(
-                tr("ℹ️ Using session cache"),
-                ReportAction.READ,
-            )
             return self.session_cache[url]
 
         # Check persistent cache for known errors
@@ -258,9 +248,8 @@ class FetchUrlTool(ToolBase):
             status_code = http_err.response.status_code if http_err.response else None
             if status_code and 400 <= status_code < 500:
                 error_message = tr(
-                    "Warning: HTTP {status_code} error for URL: {url}",
+                    "HTTP {status_code}",
                     status_code=status_code,
-                    url=url,
                 )
                 # Cache 403 and 404 errors
                 if status_code in [403, 404]:
@@ -268,9 +257,8 @@ class FetchUrlTool(ToolBase):
 
                 self.report_error(
                     tr(
-                        "❗ HTTP {status_code} error for URL: {url}",
+                        "❗ HTTP {status_code}",
                         status_code=status_code,
-                        url=url,
                     ),
                     ReportAction.READ,
                 )
@@ -278,25 +266,21 @@ class FetchUrlTool(ToolBase):
             else:
                 self.report_error(
                     tr(
-                        "❗ HTTP error for URL: {url}: {err}",
-                        url=url,
-                        err=str(http_err),
+                        "❗ HTTP {status_code}",
+                        status_code=status_code or "Error",
                     ),
                     ReportAction.READ,
                 )
                 return tr(
-                    "Warning: HTTP error for URL: {url}: {err}",
-                    url=url,
-                    err=str(http_err),
+                    "HTTP {status_code}",
+                    status_code=status_code or "Error",
                 )
         except Exception as err:
             self.report_error(
-                tr("❗ Error fetching URL: {url}: {err}", url=url, err=str(err)),
+                tr("❗ Error"),
                 ReportAction.READ,
             )
-            return tr(
-                "Warning: Error fetching URL: {url}: {err}", url=url, err=str(err)
-            )
+            return tr("Error")
 
     def _extract_and_clean_text(self, html_content: str) -> str:
         """Extract and clean text from HTML content."""
@@ -370,7 +354,11 @@ class FetchUrlTool(ToolBase):
                 cookies=cookies,
                 follow_redirects=follow_redirects,
             )
-            if html_content.startswith("Warning:"):
+            if (
+                html_content.startswith("HTTP ")
+                or html_content == "Error"
+                or html_content == "Blocked"
+            ):
                 return html_content
 
             try:
@@ -399,7 +387,11 @@ class FetchUrlTool(ToolBase):
             cookies=cookies,
             follow_redirects=follow_redirects,
         )
-        if html_content.startswith("Warning:"):
+        if (
+            html_content.startswith("HTTP ")
+            or html_content == "Error"
+            or html_content == "Blocked"
+        ):
             return html_content
 
         # Extract and clean text

janito/tools/adapters/local/replace_text_in_file.py

@@ -159,16 +159,22 @@ class ReplaceTextInFileTool(ToolBase):
             )
         return warning, concise_warning
 
-    def _report_success(self, match_lines):
+    def _report_success(self, match_lines, line_delta_str=""):
         """Report success with line numbers where replacements occurred."""
         if match_lines:
             lines_str = ", ".join(str(line_no) for line_no in match_lines)
             self.report_success(
-                tr(" ✅ replaced at {lines_str}", lines_str=lines_str),
+                tr(
+                    " ✅ replaced at {lines_str}{delta}",
+                    lines_str=lines_str,
+                    delta=line_delta_str,
+                ),
                 ReportAction.CREATE,
             )
         else:
-            self.report_success(tr(" ✅ replaced (lines unknown)"), ReportAction.CREATE)
+            self.report_success(
+                tr(" ✅ replaced{delta}", delta=line_delta_str), ReportAction.CREATE
+            )
 
     def _get_line_delta_str(self, content, new_content):
         """Return a string describing the net line change after replacement."""

janito/tools/adapters/local/search_text/core.py

@@ -98,7 +98,7 @@ class SearchTextTool(ToolBase):
         if max_depth > 0:
             info_str += tr(" [max_depth={max_depth}]", max_depth=max_depth)
         if count_only:
-            info_str += " [count]"
+            info_str += " [count-only]"
         self.report_action(info_str, ReportAction.READ)
         if os.path.isfile(search_path):
             dir_output, dir_limit_reached, per_file_counts = self._handle_file(
@@ -144,7 +144,7 @@ class SearchTextTool(ToolBase):
         file_word_max = file_word + (" (max)" if dir_limit_reached else "")
         self.report_success(
             tr(
-                " ✅ {count} {file_word} from {num_files} {file_label}",
+                " ✅ {count} {file_word}/{num_files} {file_label}",
                 count=count,
                 file_word=file_word_max,
                 num_files=num_files,

janito/tools/loop_protection_decorator.py

@@ -119,22 +119,18 @@ def protect_against_loops(
                             current_time - timestamp <= time_window
                             for timestamp in _decorator_call_tracker[op_name]
                         ):
-                            # Define the error reporting function
-                            def _report_error_and_raise(args, operation_type):
-                                # Get the tool instance to access report_error method if available
-                                tool_instance = args[0] if args else None
-                                error_msg = f"Loop protection: Too many {operation_type} operations in a short time period ({max_calls} calls in {time_window}s)"
-
-                                # Try to report the error through the tool's reporting mechanism
-                                if hasattr(tool_instance, "report_error"):
-                                    try:
-                                        tool_instance.report_error(error_msg)
-                                    except Exception:
-                                        pass  # If reporting fails, we still raise the error
-
-                                raise RuntimeError(error_msg)
-
-                            _report_error_and_raise(args, op_name)
+                            # Return loop protection message as string instead of raising exception
+                            error_msg = f"Loop protection: Too many {op_name} operations in a short time period ({max_calls} calls in {time_window}s). Please try a different approach or wait before retrying."
+
+                            # Try to report the error through the tool's reporting mechanism
+                            tool_instance = args[0] if args else None
+                            if hasattr(tool_instance, "report_error"):
+                                try:
+                                    tool_instance.report_error(error_msg)
+                                except Exception:
+                                    pass  # If reporting fails, we still return the message
+
+                            return error_msg
 
                 # Record this call
                 if op_name not in _decorator_call_tracker:

janito/tools/tools_adapter.py

@@ -460,9 +460,9 @@ class ToolsAdapterBase:
             raise ToolCallException(tool_name, error_msg, arguments=arguments)
 
     def _handle_execution_error(self, tool_name, request_id, exception, arguments):
-        # Check if this is a loop protection error that should be returned as a string
+        # Check if this is a loop protection error that should trigger a new strategy
         if isinstance(exception, RuntimeError) and "Loop protection:" in str(exception):
-            error_msg = str(exception)  # Return the loop protection message directly
+            error_msg = str(exception)
             if self._event_bus:
                 self._event_bus.publish(
                     ToolCallError(
@@ -473,8 +473,22 @@ class ToolsAdapterBase:
                         arguments=arguments,
                     )
                 )
-            # Return the error message instead of raising an exception
-            return error_msg
+            # Return the loop protection message as string to trigger new strategy
+            return f"Loop protection triggered - requesting new strategy: {error_msg}"
+
+        # Check if this is a string return from loop protection (new behavior)
+        if isinstance(exception, str) and "Loop protection:" in exception:
+            error_msg = str(exception)
+            if self._event_bus:
+                self._event_bus.publish(
+                    ToolCallError(
+                        tool_name=tool_name,
+                        request_id=request_id,
+                        error=error_msg,
+                        arguments=arguments,
+                    )
+                )
+            return f"Loop protection triggered - requesting new strategy: {error_msg}"
 
         error_msg = f"Exception during execution of tool '{tool_name}': {exception}"
         if self._event_bus:

{janito-2.29.0.dist-info → janito-2.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.29.0
+Version: 2.31.0
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-2.29.0.dist-info → janito-2.31.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-janito/README.md,sha256=G84OZfHInp0F84_01mmcTZ_b1T-qPBUFMMHUJeRSPcY,4701
+janito/README.md,sha256=Kd4GcEYIt04520J2AIMCZbp1enAGRzlLswCfyi1g5AY,4737
 janito/__init__.py,sha256=a0pFui3A_AfWJiUfg93yE-Vf4868bqG3y9yg2fkTIuY,244
 janito/__main__.py,sha256=lPQ8kAyYfyeS1KopmJ8EVY5g1YswlIqCS615mM_B_rM,70
 janito/_version.py,sha256=PtAVr2K9fOS5sv6aXzmcb7UaR5NLGMFOofL7Ndjh75o,2344
@@ -16,21 +16,21 @@ janito/perf_singleton.py,sha256=g1h0Sdf4ydzegeEpJlMhQt4H0GQZ2hryXrdYOTL-b30,113
 janito/performance_collector.py,sha256=RYu4av16Trj3RljJZ8-2Gbn1KlGdJUosrcVFYtwviNI,6285
 janito/platform_discovery.py,sha256=JN3kC7hkxdvuj-AyrJTlbbDJjtNHke3fdlZDqGi_uz0,4621
 janito/provider_config.py,sha256=acn2FEgWsEIyi2AxZiuCLoP2rXDd-nXcP5VB4CZHaeE,3189
-janito/provider_registry.py,sha256=IRNB35Cjn4PSXMWOxKBjPg0DfUEOoL4vh63OSPxhMtk,6925
+janito/provider_registry.py,sha256=VMxwIatPxrkCo-racXm9UxMd37iCyEdi_viotqaspXo,6927
 janito/report_events.py,sha256=q4OR_jTZNfcqaQF_fzTjgqo6_VlUIxSGWfhpT4nJWcw,938
 janito/shell.bak.zip,sha256=hznHbmgfkAkjuQDJ3w73XPQh05yrtUZQxLmtGbanbYU,22
 janito/utils.py,sha256=eXSsMgM69YyzahgCNrJQLcEbB8ssLI1MQqaa20ONxbE,376
-janito/agent/setup_agent.py,sha256=kE60LMVBoskHE3l6cViPEUNynF2a9irA_y8XwsezKcc,13570
-janito/agent/templates/profiles/system_prompt_template_Developer_with_Python_Tools.txt.j2,sha256=R-LxBq4wtsOeexZoQSYrdfGNdp5rdzHCP5Lt0pbejzE,3600
-janito/agent/templates/profiles/system_prompt_template_developer.txt.j2,sha256=vO0RGuj_tkL-o_rrrd0H7iD7bVe9NWGcyBR4h0T81hY,3283
-janito/agent/templates/profiles/system_prompt_template_market_analyst.txt.j2,sha256=A4WxfDdcGA1g1ndUP3Swu5lQSAMl7nP7W7MVPgyKcZM,3764
-janito/agent/templates/profiles/system_prompt_template_model_conversation_without_tools_or_context.txt.j2,sha256=K7sYNF0Yh7DchdqyhhvCLpbqiCJ36gX1M67XRZMw20c,1256
+janito/agent/setup_agent.py,sha256=Qo9fm9O5IUd65ao4KODOMd6f7baw_mEiluj1pBNxrIg,12228
+janito/agent/templates/profiles/system_prompt_template_Developer_with_Python_Tools.txt.j2,sha256=Q6p57GakGJv4damUITO0iq8rwfhPxVlek6y3I7nnkK8,3931
+janito/agent/templates/profiles/system_prompt_template_developer.txt.j2,sha256=lG6ihPRoGqJ0ho2jb1sgBPs9itwpSYpy9CrLjXwZxB0,3614
+janito/agent/templates/profiles/system_prompt_template_market_analyst.txt.j2,sha256=TCoZITPBOMvN3zA6QXg6UCNrHWj_iDKRxAREwYev5Ks,4123
+janito/agent/templates/profiles/system_prompt_template_model_conversation_without_tools_or_context.txt.j2,sha256=ynhuZESiVvmwHW0pKNUCu9wXexYkFxs6vf4AcC_r24g,1589
 janito/cli/__init__.py,sha256=xaPDOrWphBbCR63Xpcx_yfpXSJIlCaaICc4j2qpWqrM,194
 janito/cli/config.py,sha256=HkZ14701HzIqrvaNyDcDhGlVHfpX_uHlLp2rHmhRm_k,872
 janito/cli/console.py,sha256=gJolqzWL7jEPLxeuH-CwBDRFpXt976KdZOEAB2tdBDs,64
 janito/cli/main.py,sha256=s5odou0txf8pzTf1ADk2yV7T5m8B6cejJ81e7iu776U,312
-janito/cli/main_cli.py,sha256=Axubqtwl7LVikdCZ4edgTurLgq_F11641CjVbTi2oow,17008
-janito/cli/prompt_core.py,sha256=F68J4Xl6jZMYFN4oBBYZFj15Jp-HTYoLub4bw2XpNRU,11648
+janito/cli/main_cli.py,sha256=FXpoybaEbDRlK5-oMOMlcdM7TpVfnOdr6-mOkgJHeTo,16648
+janito/cli/prompt_core.py,sha256=s7FInCOlz3CMAsARcNWMyWXGep--zeySx22m29b2l7Q,11799
 janito/cli/prompt_handler.py,sha256=SnPTlL64noeAMGlI08VBDD5IDD8jlVMIYA4-fS8zVLg,215
 janito/cli/prompt_setup.py,sha256=s48gvNfZhKjsEhf4EzL1tKIGm4wDidPMDvlM6TAPYes,2116
 janito/cli/rich_terminal_reporter.py,sha256=K48Ywwj6xz_NikuezzBmYJM1PANmQD-G48sE4NjQhn0,6835
@@ -40,8 +40,7 @@ janito/cli/chat_mode/bindings.py,sha256=odjc5_-YW1t2FRhBUNRNoBMoQIg5sMz3ktV7xG0A
 janito/cli/chat_mode/chat_entry.py,sha256=RFdPd23jsA2DMHRacpjAdwI_1dFBaWrtnwyQEgb2fHA,475
 janito/cli/chat_mode/prompt_style.py,sha256=vsqQ9xxmrYjj1pWuVe9CayQf39fo2EIXrkKPkflSVn4,805
 janito/cli/chat_mode/script_runner.py,sha256=WFTFVWzg_VQrD2Ujj02XWjscfGgHwmjBeRxaEjWw9ps,6505
-janito/cli/chat_mode/session.py,sha256=JNawNraHt_N6lUy46GTLUBojLW9zhgluApQ7RSTVyJg,20107
-janito/cli/chat_mode/session_profile_select.py,sha256=bEM8Q41c6taxxMCalXlLMUO18y6WRB84zaVEb-j6Wj4,6441
+janito/cli/chat_mode/session.py,sha256=RA4vQVVNEIWsl3gG3j08FioqUEpv7_j5hjd3fmQRvd4,18678
 janito/cli/chat_mode/toolbar.py,sha256=SzdWAJdcY1g2rTPZCPL6G5X8jO6ZQYjwko2-nw54_nU,3397
 janito/cli/chat_mode/shell/autocomplete.py,sha256=lE68MaVaodbA2VfUM0_YLqQVLBJAE_BJsd5cMtwuD-g,793
 janito/cli/chat_mode/shell/commands.bak.zip,sha256=I7GFjXg2ORT5NzFpicH1vQ3kchhduQsZinzqo0xO8wU,74238
@@ -82,7 +81,7 @@ janito/cli/cli_commands/enable_disable_plugin.py,sha256=IIEg5Gz2aAW_7BKrMQTXSGF0
 janito/cli/cli_commands/list_config.py,sha256=oiQEGaGPjwjG-PrOcakpNMbbqISTsBEs7rkGH3ceQsI,1179
 janito/cli/cli_commands/list_drivers.py,sha256=r2ENykUcvf_9XYp6LHd3RvLXGXyVUA6oe_Pr0dyv92I,5124
 janito/cli/cli_commands/list_models.py,sha256=QF3Wa7OhNcJFKeBxaw0C_rDfsvJFNb-siz5uorajBvo,1595
-janito/cli/cli_commands/list_plugins.py,sha256=UfQARomd0O9oHmNowvrUAbf_foYhdgkou1WRdwNa00A,3686
+janito/cli/cli_commands/list_plugins.py,sha256=lha2XX7AKIGtFattATpJgsEKRSxRULPHXI1vNSQiQcg,3846
 janito/cli/cli_commands/list_profiles.py,sha256=O4k6U9iCEeNH3lM-NP_XX_E9W0h__hheLSn23241dkA,3538
 janito/cli/cli_commands/list_providers.py,sha256=oilrBjNL5mot1nz45XQQY6oeiSxoNvphhQYspNcEJpw,391
 janito/cli/cli_commands/list_providers_region.py,sha256=qrMj_gtgEMty8UH0P_O5SgWCVJ9ZKxGUp_GdsE4_EH4,2548
@@ -92,16 +91,16 @@ janito/cli/cli_commands/model_utils.py,sha256=4t2ZN8DYA8jxluXHiiliV8gMbF_90nKGtg
 janito/cli/cli_commands/ping_providers.py,sha256=hetZAKKZzQYRpRDT5OvRTOe4jYUVNZGjo8gFoyeRA3I,1921
 janito/cli/cli_commands/set_api_key.py,sha256=IR_hUcLjK-2oJmiIVdjc8epPsQAzqEN9MS7lSTVqmKM,1060
 janito/cli/cli_commands/show_config.py,sha256=ammzVEqJQCAdWFRrhI1zjjmzgTCH2l38REoT4gYJPP0,3467
-janito/cli/cli_commands/show_system_prompt.py,sha256=JBFjaLnZZQn3Q0ChFYKYZaohmKuqgJNcH8asYFe2rH0,6002
+janito/cli/cli_commands/show_system_prompt.py,sha256=WQclY_bmJrHbIBRU1qx1WV4VyooyXVx_XQyX_4Rb1hs,6335
 janito/cli/core/__init__.py,sha256=YH95fhgY9yBX8RgqX9dSrEkl4exjV0T4rbmJ6xUpG-Y,196
 janito/cli/core/event_logger.py,sha256=1X6lR0Ax7AgF8HlPWFoY5Ystuu7Bh4ooTo78vXzeGB0,2008
 janito/cli/core/getters.py,sha256=opmcSz86J-I95Klsh0c4y6lsYvNakrvRqvuA0o5ARWI,2869
 janito/cli/core/model_guesser.py,sha256=V7LBkIllSp_tP9-2B1gcl5b4b-La7mrOvE3AZQQm8lk,1716
-janito/cli/core/runner.py,sha256=7JS9-mN9XNFg6htjQUyOgpQFG86as_4gWMxxwRLc424,9156
+janito/cli/core/runner.py,sha256=gi8xke6re9AoHHNCivV50i0eUAliw8QTUdXyqMkMplM,9044
 janito/cli/core/setters.py,sha256=zjSUxy6iUzcrmEunFk7dA90KqbMaq2O7LTGP8wn2HxA,5378
 janito/cli/core/unsetters.py,sha256=FEw9gCt0vRvoCt0kRSNfVB2tzi_TqppJIx2nHPP59-k,2012
 janito/cli/single_shot_mode/__init__.py,sha256=Ct99pKe9tINzVW6oedZJfzfZQKWpXz-weSSCn0hrwHY,115
-janito/cli/single_shot_mode/handler.py,sha256=d251ObY-5bkUyccV9NYkKDF0VCKrQTrGEnwt3mtj61w,5529
+janito/cli/single_shot_mode/handler.py,sha256=aOTh9s7HyHBLs2sgquEVbVhFWC_7Udu4u_9LoQ0f78E,5667
 janito/docs/GETTING_STARTED.md,sha256=Yx3vi1LQWyDWlE_JYuz4V9EL-Gh4WU6cOBqCr8XidF4,4960
 janito/drivers/dashscope.bak.zip,sha256=9Pv4Xyciju8jO1lEMFVgYXexoZkxmDO3Ig6vw3ODfL8,4936
 janito/drivers/openai_responses.bak.zip,sha256=E43eDCHGa2tCtdjzj_pMnWDdnsOZzj8BJTR5tJp8wcM,13352
@@ -122,7 +121,7 @@ janito/i18n/messages.py,sha256=fBuwOTFoygyHPkYphm6Y0r1iE8497Z4iryVAmPhMEkg,1851
 janito/i18n/pt.py,sha256=NlTgpDSftUfFG7FGbs7TK54vQlJVMyaZDHGcWjelwMc,4168
 janito/llm/README.md,sha256=6GRqCu_a9va5HCB1YqNqbshyWKFyAGlnXugrjom-xj8,1213
 janito/llm/__init__.py,sha256=dpyVH51qVRCw-PDyAFLAxq0zd4jl5MDcuV6Cri0D-dQ,134
-janito/llm/agent.py,sha256=RYX1LAQKDkdE4H76bAT7ZeFst5ZP_npefuwhevJpbDg,21013
+janito/llm/agent.py,sha256=T0JfeMoOudTWsHwWCcaocrHyq9k0TvkL4_YePlXvZfo,21269
 janito/llm/auth.py,sha256=8Dl_orUEPhn2X6XjkO2Nr-j1HFT2YDxk1qJl9hSFI88,2286
 janito/llm/auth_utils.py,sha256=7GH7bIScKhVWJW6ugcDrJLcYRamj5dl_l8N1rrvR4Ws,663
 janito/llm/driver.py,sha256=stiicPe_MXTuWW4q6MSwK7PCj8UZcA_30pGACu6xYUQ,10039
@@ -169,7 +168,7 @@ janito/providers/moonshot/model_info.py,sha256=PpdUkmuR7g6SyiEzS9nePskPjn5xI1ZM2
 janito/providers/moonshot/provider.py,sha256=LJxNoC7Oo-ZoFKs2ulK2lXzUEx7kV-79HJ8JG4J-UWU,3856
 janito/providers/openai/__init__.py,sha256=f0m16-sIqScjL9Mp4A0CQBZx6H3PTEy0cnE08jeaB5U,38
 janito/providers/openai/model_info.py,sha256=VTkq3xcx2vk0tXlFVHQxKeFzl-DL1T1J2elVOEwCdHI,4265
-janito/providers/openai/provider.py,sha256=PPr_qmSe5GyysnZCxhjeUVhE2LWKjKOSRel-8aaxq_U,4761
+janito/providers/openai/provider.py,sha256=VBU5S5eSpqE3qX-nHdxLwsp7usgvUFzOsPzKJKu1-10,4763
 janito/providers/openai/schema_generator.py,sha256=hTqeLcPTR8jeKn5DUUpo7b-EZ-V-g1WwXiX7MbHnFzE,2234
 janito/providers/zai/__init__.py,sha256=qtIr9_QBFaXG8xB6cRDGhS7se6ir11CWseI9azLMRBo,24
 janito/providers/zai/model_info.py,sha256=ldwD8enpxXv1G-YsDw4YJn31YsVueQ4vj5HgoYvnPxo,1183
@@ -186,7 +185,7 @@ janito/tools/base.py,sha256=R38A9xWYh3JRYZMDSom2d1taNDy9J7HpLbZo9X2wH_o,316
 janito/tools/disabled_tools.py,sha256=Tx__16wtMWZ9z34cYLdH1gukwot5MCL-9kLjd5MPX6Y,2110
 janito/tools/inspect_registry.py,sha256=Jo7PrMPRKLuR-j_mBAk9PBcTzeJf1eQrS1ChGofgQk0,538
 janito/tools/loop_protection.py,sha256=WQ2Cqt459vXvrO0T1EqkEHynHlRkPzfaC83RSmXzjkM,4718
-janito/tools/loop_protection_decorator.py,sha256=bS28p9MTVEDlrw2vRYX2B-HADFJL3768aThz65U24qw,6668
+janito/tools/loop_protection_decorator.py,sha256=R1j2ouscKbVcDm2wlxRZ6zQuKExgj633ijeDq4j0oO0,6457
 janito/tools/outline_file.bak.zip,sha256=EeI2cBXCwTdWVgJDNiroxKeYlkjwo6NLKeXz3J-2iZI,15607
 janito/tools/path_security.py,sha256=40b0hV0X3449Dht93A04Q3c9AYSsBQsBFy2BjzM83lA,8214
 janito/tools/path_utils.py,sha256=Rg5GE4kiu7rky6I2KTtivW6wPXzc9Qmq0_lOjwkPYlI,832
@@ -197,18 +196,18 @@ janito/tools/tool_events.py,sha256=czRtC2TYakAySBZvfHS_Q6_NY_7_krxzAzAL1ggRFWA,1
 janito/tools/tool_run_exception.py,sha256=43yWgTaGBGEtRteo6FvTrane6fEVGo9FU1uOdjMRWJE,525
 janito/tools/tool_use_tracker.py,sha256=IaEmA22D6RuL1xMUCScOMGv0crLPwEJVGmj49cydIaM,2662
 janito/tools/tool_utils.py,sha256=alPm9DvtXSw_zPRKvP5GjbebPRf_nfvmWk2TNlL5Cws,1219
-janito/tools/tools_adapter.py,sha256=FHQwAHIUD_pwbdmNI1w_BGKWKDG1zSO2KakZNhsvQZA,21044
+janito/tools/tools_adapter.py,sha256=F1Wkji222dY53HMaZWf3vqVas1Bimm3UXERKvxF54Ew,21687
 janito/tools/tools_schema.py,sha256=rGrKrmpPNR07VXHAJ_haGBRRO-YGLOF51BlYRep9AAQ,4415
 janito/tools/url_whitelist.py,sha256=0CPLkHTp5HgnwgjxwgXnJmwPeZQ30q4j3YjW59hiUUE,4295
 janito/tools/adapters/__init__.py,sha256=XKixOKtUJs1R-rGwGDXSLVLg5-Kp090gvWbsseWT4LI,92
 janito/tools/adapters/local/__init__.py,sha256=8xJw8Qv3T_wwkiGBVVgs9p7pH1ONIAipccEUqY2II8A,2231
 janito/tools/adapters/local/adapter.py,sha256=u4nLHTaYdwZXMi1J8lsKvlG6rOmdq9xjey_3zeyCG4k,8707
-janito/tools/adapters/local/ask_user.py,sha256=4xY8SUndw_OYAPzeIRxugmihxxn7Y-b2v9xYT_LGdkY,3941
+janito/tools/adapters/local/ask_user.py,sha256=-shjMRKrRe7HNHM2w_6YAl7eEgl8QXaIV6LKrUDEBxU,4060
 janito/tools/adapters/local/copy_file.py,sha256=SBJm19Ipe5dqRE1Mxl6JSrn4bNmfObVnDr5b1mcEu6c,3682
 janito/tools/adapters/local/create_directory.py,sha256=LxwqQEsnOrEphCIoaMRRx9P9bu0MzidP3Fc5q6letxc,2584
 janito/tools/adapters/local/create_file.py,sha256=nZf8iPScO9_nrvmHwXqOcqpLZkLABTh9uLVNddC4PCk,3760
 janito/tools/adapters/local/delete_text_in_file.py,sha256=uEeedRxXAR7_CqUc_qhbEdM0OzRi_pgnP-iDjs2Zvjk,5087
-janito/tools/adapters/local/fetch_url.py,sha256=mt5C85_PJG-Dj1ffFZDxemuRV5TsTHcrSPq10NEy9ZU,16484
+janito/tools/adapters/local/fetch_url.py,sha256=bkrFFE41h8pWepqnFpmsJ1gF0oDDd5htBsEwFniSKMQ,16064
 janito/tools/adapters/local/find_files.py,sha256=Zbag3aP34vc7ffJh8bOqAwXj3KiZhV--uzTVHtNb-fI,6250
 janito/tools/adapters/local/move_file.py,sha256=LMGm8bn3NNyIPJG4vrlO09smXQcgzA09EwoooZxkIA8,4695
 janito/tools/adapters/local/open_html_in_browser.py,sha256=XqICIwVx5vEE77gHkaNAC-bAeEEy0DBmDksATiL-sRY,2101
@@ -220,7 +219,7 @@ janito/tools/adapters/local/read_chart.py,sha256=qQebp_MEE_x2AL_pl85uA58A4lbhLQs
 janito/tools/adapters/local/read_files.py,sha256=LzlNrQEadYF8dF97Wm8AHde2nuqbMkN5vVskQLhvFdA,2329
 janito/tools/adapters/local/remove_directory.py,sha256=DEhHdmwJRl5Yp9eEukIIooMrpATCtXcv5HmaDRn8vH8,1913
 janito/tools/adapters/local/remove_file.py,sha256=Imra4jGkBfAd6pnUAmbUsjN0exj2vzZWuNRXq_GOMsI,2093
-janito/tools/adapters/local/replace_text_in_file.py,sha256=Y6mbPuoTpsFXKrSp51s0rz7Hhz1WHkG1sY4pZ3RoZsU,10790
+janito/tools/adapters/local/replace_text_in_file.py,sha256=zJIDecviF2YRpWxbvhtka4Iaje-QYhcaqQX1PxWolzE,10966
 janito/tools/adapters/local/run_bash_command.py,sha256=7fABqAeAu7WJwzzwHmT54_m5OSwPMcgpQ74lQhPG7TA,7955
 janito/tools/adapters/local/run_powershell_command.py,sha256=uQSJVQe40wSGbesyvZxDmIKJthAbDJFaxXm1dEN3gBs,9313
 janito/tools/adapters/local/view_file.py,sha256=cBKcbwbfH-UMyvQ7PmYTgsshcFmorjWtyH1kaYi7oNY,7379
@@ -231,7 +230,7 @@ janito/tools/adapters/local/get_file_outline/markdown_outline.py,sha256=bXEBg0D9
 janito/tools/adapters/local/get_file_outline/python_outline.py,sha256=RAcf9Vxec08lA06drYaNre5HCJ2lTzrRAskZ3rlyE-U,10326
 janito/tools/adapters/local/get_file_outline/search_outline.py,sha256=bski24TpnJVf3L0TNzkx3HfvaXwttQl4EVkwk2POQOw,1348
 janito/tools/adapters/local/search_text/__init__.py,sha256=FEYpF5tTtf0fiAyRGIGSn-kV-MJDkhdFIbus16mYW8Y,34
-janito/tools/adapters/local/search_text/core.py,sha256=Ryi3XOZNvk2dx5c1rAttXJKQI5yBKckav2baKYMKqyM,7882
+janito/tools/adapters/local/search_text/core.py,sha256=obCq4WoJ4ld2kpd57pCyt91wpXVsrvQ0PBTSL8Lxpk0,7882
 janito/tools/adapters/local/search_text/match_lines.py,sha256=RLR8fZFP-Q57rY0fTENbMItmt3dJZiYX0otmGHVRjfw,2131
 janito/tools/adapters/local/search_text/pattern_utils.py,sha256=D7vtAr8oT0tGV0C_UUarAXS9XQtP-MTYmmc8Yg8iVTg,2362
 janito/tools/adapters/local/search_text/traverse_directory.py,sha256=EpL1qywAV0H29pm8-QsHrjKchKP4i4sRUOENVuNptCo,4000
@@ -247,9 +246,9 @@ janito/tools/adapters/local/validate_file_syntax/ps1_validator.py,sha256=TeIkPt0
 janito/tools/adapters/local/validate_file_syntax/python_validator.py,sha256=BfCO_K18qy92m-2ZVvHsbEU5e11OPo1pO9Vz4G4616E,130
 janito/tools/adapters/local/validate_file_syntax/xml_validator.py,sha256=AijlsP_PgNuC8ZbGsC5vOTt3Jur76otQzkd_7qR0QFY,284
 janito/tools/adapters/local/validate_file_syntax/yaml_validator.py,sha256=TgyI0HRL6ug_gBcWEm5TGJJuA4E34ZXcIzMpAbv3oJs,155
-janito-2.29.0.dist-info/licenses/LICENSE,sha256=GSAKapQH5ZIGWlpQTA7v5YrfECyaxaohUb1vJX-qepw,1090
-janito-2.29.0.dist-info/METADATA,sha256=qs80f05hLB5SVF0hPk5h1vwBvWt0S1B5mWwYBr5egSE,16945
-janito-2.29.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-2.29.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-2.29.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-2.29.0.dist-info/RECORD,,
+janito-2.31.0.dist-info/licenses/LICENSE,sha256=GSAKapQH5ZIGWlpQTA7v5YrfECyaxaohUb1vJX-qepw,1090
+janito-2.31.0.dist-info/METADATA,sha256=PTDIEejdQE8T6pYMV-_SZubwGBauxg0aER9EbzwAt_s,16945
+janito-2.31.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+janito-2.31.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-2.31.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-2.31.0.dist-info/RECORD,,

janito/cli/chat_mode/session_profile_select.py

@@ -1,182 +0,0 @@
-import os
-from pathlib import Path
-import questionary
-from questionary import Style
-import os
-from pathlib import Path
-from prompt_toolkit.formatted_text import HTML
-from prompt_toolkit import PromptSession
-from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.enums import EditingMode
-from prompt_toolkit.formatted_text import HTML
-from .prompt_style import chat_shell_style
-
-
-"""
-Profile selection logic for Janito Chat CLI using questionary.
-"""
-
-
-def _handle_raw_model_session_no_tools():
-    return {
-        "profile": "model_conversation_without_tools_or_context",
-        "profile_system_prompt": None,
-        "no_tools_mode": True,
-    }  # Raw Model Session (no tools, no context)
-
-
-def _handle_using_role():
-    role_name = questionary.text("Enter the role name:").ask()
-    return f"role:{role_name}"
-
-
-def _get_toolbar(mode):
-    if mode["multiline"]:
-        return HTML(
-            "<b>Multiline mode (Esc+Enter to submit). Type /single to switch.</b>"
-        )
-    else:
-        return HTML(
-            "<b>Single-line mode (Enter to submit). Type /multi for multiline.</b>"
-        )
-
-
-def _handle_custom_system_prompt():
-    print(
-        "\n[Custom System Prompt]\nPlease enter the message that will be used as the model system prompt. This will define how the AI behaves for this session.\nYou can use /multi for multiline mode, and /single to return to single-line mode.\n"
-    )
-    mode = {"multiline": False}
-    bindings = KeyBindings()
-
-    @bindings.add("c-r")
-    def _(event):
-        pass
-
-    @bindings.add("f12")
-    def _(event):
-        buf = event.app.current_buffer
-        buf.text = "Do It"
-        buf.validate_and_handle()
-
-    session = PromptSession(
-        multiline=False,
-        key_bindings=bindings,
-        editing_mode=EditingMode.EMACS,
-        bottom_toolbar=lambda: _get_toolbar(mode),
-        style=chat_shell_style,
-    )
-    prompt_icon = HTML("<inputline>📝 </inputline>")
-    while True:
-        try:
-            response = session.prompt(prompt_icon)
-        except KeyboardInterrupt:
-            print("[Custom System Prompt] Exited by the user.")
-            import sys
-
-            sys.exit(0)
-        if not mode["multiline"] and response.strip() == "/multi":
-            mode["multiline"] = True
-            session.multiline = True
-            continue
-        elif mode["multiline"] and response.strip() == "/single":
-            mode["multiline"] = False
-            session.multiline = False
-            continue
-        else:
-            sanitized = response.strip()
-            try:
-                sanitized.encode("utf-8")
-            except UnicodeEncodeError:
-                sanitized = sanitized.encode("utf-8", errors="replace").decode("utf-8")
-            return {"profile": None, "profile_system_prompt": sanitized}
-
-
-def _load_user_profiles():
-    user_profiles_dir = Path.home() / ".janito" / "profiles"
-    profiles = {}
-    if user_profiles_dir.exists() and user_profiles_dir.is_dir():
-        for profile_file in user_profiles_dir.glob("*"):
-            if profile_file.is_file():
-                try:
-                    with open(profile_file, "r", encoding="utf-8") as f:
-                        profiles[profile_file.stem] = f.read().strip()
-                except Exception:
-                    # Ignore unreadable files
-                    pass
-    return profiles
-
-
-def select_profile():
-    user_profiles = _load_user_profiles()
-    choices = [
-        "Developer with Python Tools",
-        "Developer",
-        "Market Analyst",
-        "Custom system prompt...",
-        "Raw Model Session (no tools, no context)",
-    ]
-    # Add user profiles to choices
-    if user_profiles:
-        choices.extend(user_profiles.keys())
-
-    custom_style = Style(
-        [
-            ("highlighted", "bg:#00aaff #ffffff"),  # background for item under cursor
-            ("question", "fg:#00aaff bold"),
-        ]
-    )
-    answer = questionary.select(
-        "Select a profile to use:", choices=choices, default=None, style=custom_style
-    ).ask()
-
-    if not answer:
-        import sys
-
-        sys.exit(0)
-
-    if answer == "Raw Model Session (no tools, no context)":
-        return _handle_raw_model_session_no_tools()
-    elif answer == "Custom system prompt...":
-        return _handle_custom_system_prompt()
-    elif answer in user_profiles:
-        # Return the content of the user profile as a custom system prompt
-        return {"profile": None, "profile_system_prompt": user_profiles[answer]}
-    elif answer == "Developer":
-        # Return the content of the built-in Developer profile prompt
-        from pathlib import Path
-        from jinja2 import Template
-        from janito.agent.setup_agent import _prepare_template_context
-
-        # Get the absolute path relative to the current script location
-        current_dir = Path(__file__).parent
-        template_path = (
-            current_dir
-            / "../../agent/templates/profiles/system_prompt_template_developer.txt.j2"
-        )
-        with open(template_path, "r", encoding="utf-8") as f:
-            template_content = f.read()
-
-        template = Template(template_content)
-        context = _prepare_template_context("developer", "Developer", None)
-        prompt = template.render(**context)
-        return {"profile": "Developer", "profile_system_prompt": prompt}
-    elif answer == "Market Analyst":
-        # Return the content of the built-in Market Analyst profile prompt
-        from pathlib import Path
-        from jinja2 import Template
-        from janito.agent.setup_agent import _prepare_template_context
-
-        # Get the absolute path relative to the current script location
-        current_dir = Path(__file__).parent
-        template_path = (
-            current_dir
-            / "../../agent/templates/profiles/system_prompt_template_market_analyst.txt.j2"
-        )
-        with open(template_path, "r", encoding="utf-8") as f:
-            template_content = f.read()
-
-        template = Template(template_content)
-        context = _prepare_template_context("market_analyst", "Market Analyst", None)
-        prompt = template.render(**context)
-        return {"profile": "Market Analyst", "profile_system_prompt": prompt}
-    return answer