janito 2.28.0__py3-none-any.whl → 2.30.0__py3-none-any.whl

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,8 +216,6 @@ 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/rich_terminal_reporter.py

@@ -139,11 +139,12 @@ class RichTerminalReporter(EventHandlerBase):
         if not msg or not subtype:
             return
         if subtype == ReportSubtype.ACTION_INFO:
-            # Use orange for modification actions, cyan otherwise
+            # Use orange for all write/modification actions
             modification_actions = (
                 getattr(ReportAction, "UPDATE", None),
                 getattr(ReportAction, "WRITE", None),
                 getattr(ReportAction, "DELETE", None),
+                getattr(ReportAction, "CREATE", None),
             )
             style = (
                 "orange1"

janito/cli/single_shot_mode/handler.py

@@ -125,8 +125,6 @@ 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", "moonshotai", "zai"}
+        open_providers = {"cerebras", "deepseek", "alibaba", "moonshot", "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-4.1"  # Options: gpt-4.1, gpt-4o, o3-mini, o4-mini, gpt-5, gpt-5-nano
+        "gpt-5"  # 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-only]"
+            info_str += " [count]"
         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.30.0.dist-info/METADATA

@@ -0,0 +1,83 @@
+Metadata-Version: 2.4
+Name: janito
+Version: 2.30.0
+Summary: A new Python package called janito.
+Author-email: João Pinto <janito@ikignosis.org>
+Project-URL: Homepage, https://github.com/ikignosis/janito
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: attrs==25.3.0
+Requires-Dist: rich==14.0.0
+Requires-Dist: pathspec==0.12.1
+Requires-Dist: setuptools>=61.0
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: jinja2>=3.0.0
+Requires-Dist: prompt_toolkit>=3.0.51
+Requires-Dist: lxml>=5.4.0
+Requires-Dist: requests>=2.32.4
+Requires-Dist: bs4>=0.0.2
+Requires-Dist: questionary>=2.0.1
+Requires-Dist: openai>=1.68.0
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: ruff==0.11.9; extra == "dev"
+Requires-Dist: detect-secrets==1.4.0; extra == "dev"
+Requires-Dist: codespell==2.4.1; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: questionary>=2.0.1; extra == "dev"
+Requires-Dist: setuptools_scm>=8.0; extra == "dev"
+Provides-Extra: coder
+Requires-Dist: janito-coder; extra == "coder"
+Dynamic: license-file
+
+# nctl
+
+```bash
+$ nctl --help
+Usage: nctl <command>
+
+Interact with Nine API resources. See https://docs.nineapis.ch for the full API docs.
+
+Run "nctl <command> --help" for more information on a command.
+```
+
+## Setup
+
+```bash
+# If you have go already installed
+go install github.com/ninech/nctl@latest
+
+# Homebrew
+brew install ninech/taps/nctl
+
+# Debian/Ubuntu
+echo "deb [trusted=yes] https://repo.nine.ch/deb/ /" | sudo tee /etc/apt/sources.list.d/repo.nine.ch.list
+sudo apt-get update
+sudo apt-get install nctl
+
+# Fedora/RHEL
+cat <<EOF > /etc/yum.repos.d/repo.nine.ch.repo
+[repo.nine.ch]
+name=Nine Repo
+baseurl=https://repo.nine.ch/yum/
+enabled=1
+gpgcheck=0
+EOF
+dnf install nctl
+
+# Arch
+# Install yay: https://github.com/Jguer/yay#binary
+yay --version
+yay -S nctl-bin
+```
+
+For Windows users, nctl is also built for arm64 and amd64. You can download the
+latest exe file from the [releases](https://github.com/ninech/nctl/releases) and
+install it.
+
+## Getting started
+
+* login to the API using `nctl auth login`
+* run `nctl --help` to get a list of all available commands