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

janito/cli/chat_mode/session.py

@@ -63,6 +63,7 @@ class ChatSession:
         allowed_permissions=None,
     ):
         self.console = console
+        self.session_start_time = time.time()
         self.user_input_history = UserInputHistory()
         self.input_dicts = self.user_input_history.load()
         self.mem_history = InMemoryHistory()
@@ -114,22 +115,13 @@ class ChatSession:
         self.multi_line_mode = getattr(args, "multi", False) if args else False
 
     def _select_profile_and_role(self, args, role):
-        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
-        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
+        profile, role_arg, python_profile, market_profile = self._extract_args(args)
         profile_system_prompt = None
         no_tools_mode = False
 
-        # Handle --developer flag
-        if python_profile and profile is None and role_arg is None:
-            profile = "Developer with Python Tools"
-
-        # Handle --market flag
-        if market_profile and profile is None and role_arg is None:
-            profile = "Market Analyst"
+        profile = self._determine_profile(
+            profile, role_arg, python_profile, market_profile
+        )
 
         if (
             profile is None
@@ -137,16 +129,9 @@ class ChatSession:
             and not python_profile
             and not market_profile
         ):
-            # Skip interactive profile selection for list commands
-            from janito.cli.core.getters import GETTER_KEYS
-
-            # Check if any getter command is active - these don't need interactive mode
+            skip_profile_selection = self._should_skip_profile_selection(args)
+        else:
             skip_profile_selection = False
-            if args is not None:
-                for key in GETTER_KEYS:
-                    if getattr(args, key, False):
-                        skip_profile_selection = True
-                        break
 
             if skip_profile_selection:
                 profile = "Developer with Python Tools"  # Default for non-interactive commands
@@ -314,39 +299,14 @@ class ChatSession:
             )
             start_time = time.time()
 
-            # Print rule line with model info before processing prompt
-            model_name = (
-                self.agent.get_model_name()
-                if hasattr(self.agent, "get_model_name")
-                else "Unknown"
-            )
-            provider_name = (
-                self.agent.get_provider_name()
-                if hasattr(self.agent, "get_provider_name")
-                else "Unknown"
-            )
+            model_name, provider_name = self._get_model_info()
+            backend_hostname = self._get_backend_hostname()
 
-            backend_hostname = "Unknown"
-            candidates = []
-            drv = getattr(self.agent, "driver", None)
-            if drv is not None:
-                cfg = getattr(drv, "config", None)
-                if cfg is not None:
-                    b = getattr(cfg, "base_url", None)
-                    if b:
-                        candidates.append(b)
-                direct_base = getattr(drv, "base_url", None)
-                if direct_base:
-                    candidates.append(direct_base)
-            cfg2 = getattr(self.agent, "config", None)
-            if cfg2 is not None:
-                b2 = getattr(cfg2, "base_url", None)
-                if b2:
-                    candidates.append(b2)
-            top_base = getattr(self.agent, "base_url", None)
-            if top_base:
-                candidates.append(top_base)
-            from urllib.parse import urlparse
+            self.console.print(
+                Rule(
+                    f"[bold blue]Model: {model_name} ({provider_name}) | Backend: {backend_hostname}[/bold blue]"
+                )
+            )
 
             for candidate in candidates:
                 try:
@@ -377,8 +337,6 @@ 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")
@@ -395,6 +353,102 @@ class ChatSession:
 
             self.console.print(traceback.format_exc())
 
+    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
+        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):
+        """Determine the profile based on flags and arguments."""
+        if python_profile and profile is None and role_arg is None:
+            return "Developer with Python Tools"
+        if market_profile and profile is None and role_arg is None:
+            return "Market Analyst"
+        return profile
+
+    def _should_skip_profile_selection(self, args):
+        """Check if profile selection should be skipped for getter commands."""
+        from janito.cli.core.getters import GETTER_KEYS
+
+        if args is None:
+            return False
+
+        for key in GETTER_KEYS:
+            if getattr(args, key, False):
+                return True
+        return False
+
+    def _get_model_info(self):
+        """Get model and provider information."""
+        model_name = (
+            self.agent.get_model_name()
+            if hasattr(self.agent, "get_model_name")
+            else "Unknown"
+        )
+        provider_name = (
+            self.agent.get_provider_name()
+            if hasattr(self.agent, "get_provider_name")
+            else "Unknown"
+        )
+        return model_name, provider_name
+
+    def _get_backend_hostname(self):
+        """Extract backend hostname from agent configuration."""
+        candidates = self._collect_base_urls()
+        return self._parse_hostname_from_urls(candidates)
+
+    def _collect_base_urls(self):
+        """Collect all possible base URLs from agent configuration."""
+        candidates = []
+
+        # Collect from driver
+        drv = getattr(self.agent, "driver", None)
+        if drv is not None:
+            cfg = getattr(drv, "config", None)
+            if cfg is not None:
+                b = getattr(cfg, "base_url", None)
+                if b:
+                    candidates.append(b)
+            direct_base = getattr(drv, "base_url", None)
+            if direct_base:
+                candidates.append(direct_base)
+
+        # Collect from agent config
+        cfg2 = getattr(self.agent, "config", None)
+        if cfg2 is not None:
+            b2 = getattr(cfg2, "base_url", None)
+            if b2:
+                candidates.append(b2)
+
+        # Collect from agent directly
+        top_base = getattr(self.agent, "base_url", None)
+        if top_base:
+            candidates.append(top_base)
+
+        return candidates
+
+    def _parse_hostname_from_urls(self, candidates):
+        """Parse hostname from a list of URL candidates."""
+        from urllib.parse import urlparse
+
+        for candidate in candidates:
+            try:
+                if not candidate:
+                    continue
+                parsed = urlparse(str(candidate))
+                host = parsed.netloc or parsed.path
+                if host:
+                    return host
+            except Exception:
+                return str(candidate)
+
+        return "Unknown"
+
     def _create_prompt_session(self):
         return PromptSession(
             style=chat_shell_style,
@@ -416,7 +470,25 @@ class ChatSession:
         else:
             try:
                 cmd_input = session.prompt(HTML("<inputline>💬 </inputline>"))
-            except (KeyboardInterrupt, EOFError):
+            except KeyboardInterrupt:
+                # Ask for confirmation on Ctrl+C
+                from prompt_toolkit import prompt
+
+                try:
+                    confirm = prompt(
+                        "Are you sure you want to exit? (y/n): ",
+                        style=self._create_prompt_session().style,
+                    )
+                    if confirm.lower() == "y":
+                        self._handle_exit()
+                        return None
+                    else:
+                        return ""  # Return empty string to continue
+                except (KeyboardInterrupt, EOFError):
+                    # Handle second Ctrl+C or Ctrl+D as immediate exit
+                    self._handle_exit()
+                    return None
+            except EOFError:
                 self._handle_exit()
                 return None
         sanitized = cmd_input.strip()
@@ -430,7 +502,27 @@ class ChatSession:
         return sanitized
 
     def _handle_exit(self):
-        self.console.print("[bold yellow]Exiting chat. Goodbye![/bold yellow]")
+        session_duration = time.time() - self.session_start_time
+
+        # Get total token usage from performance collector
+        from janito.perf_singleton import performance_collector
+
+        total_tokens = performance_collector.get_token_usage().get("total_tokens", 0)
+
+        # Format session duration
+        if session_duration < 60:
+            duration_str = f"{session_duration:.1f}s"
+        elif session_duration < 3600:
+            duration_str = f"{session_duration/60:.1f}m"
+        else:
+            duration_str = f"{session_duration/3600:.1f}h"
+
+        self.console.print(f"[bold yellow]Session completed![/bold yellow]")
+        self.console.print(
+            f"[dim]Session time: {duration_str} | Total tokens: {total_tokens:,}[/dim]"
+        )
+        self.console.print("[bold yellow]Goodbye![/bold yellow]")
+
         if hasattr(self, "agent") and hasattr(self.agent, "join_driver"):
             if (
                 hasattr(self.agent, "input_queue")

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/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/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(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.28.0
+Version: 2.29.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.28.0.dist-info → janito-2.29.0.dist-info}/RECORD

@@ -16,7 +16,7 @@ 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=VMxwIatPxrkCo-racXm9UxMd37iCyEdi_viotqaspXo,6927
+janito/provider_registry.py,sha256=IRNB35Cjn4PSXMWOxKBjPg0DfUEOoL4vh63OSPxhMtk,6925
 janito/report_events.py,sha256=q4OR_jTZNfcqaQF_fzTjgqo6_VlUIxSGWfhpT4nJWcw,938
 janito/shell.bak.zip,sha256=hznHbmgfkAkjuQDJ3w73XPQh05yrtUZQxLmtGbanbYU,22
 janito/utils.py,sha256=eXSsMgM69YyzahgCNrJQLcEbB8ssLI1MQqaa20ONxbE,376
@@ -30,17 +30,17 @@ 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=s7FInCOlz3CMAsARcNWMyWXGep--zeySx22m29b2l7Q,11799
+janito/cli/prompt_core.py,sha256=F68J4Xl6jZMYFN4oBBYZFj15Jp-HTYoLub4bw2XpNRU,11648
 janito/cli/prompt_handler.py,sha256=SnPTlL64noeAMGlI08VBDD5IDD8jlVMIYA4-fS8zVLg,215
 janito/cli/prompt_setup.py,sha256=s48gvNfZhKjsEhf4EzL1tKIGm4wDidPMDvlM6TAPYes,2116
-janito/cli/rich_terminal_reporter.py,sha256=_-eRzrxM-lCD31KjElCroSVx1vbBcG2Lo8gDVE0v9Yc,6785
+janito/cli/rich_terminal_reporter.py,sha256=K48Ywwj6xz_NikuezzBmYJM1PANmQD-G48sE4NjQhn0,6835
 janito/cli/utils.py,sha256=plCQiDKIf3V8mFhhX5H9-MF2W86i-xRdWf8Xi117Z0w,677
 janito/cli/verbose_output.py,sha256=wY_B4of5e8Vv7w1fRwOZzNGU2JqbMdcFnGjtEr4hLus,7686
 janito/cli/chat_mode/bindings.py,sha256=odjc5_-YW1t2FRhBUNRNoBMoQIg5sMz3ktV7xG0ADFU,975
 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=GPh2lctvZ1m_NT6SoK9DD-E2q18icgNtzXAjsPZDnDo,16952
+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/toolbar.py,sha256=SzdWAJdcY1g2rTPZCPL6G5X8jO6ZQYjwko2-nw54_nU,3397
 janito/cli/chat_mode/shell/autocomplete.py,sha256=lE68MaVaodbA2VfUM0_YLqQVLBJAE_BJsd5cMtwuD-g,793
@@ -101,7 +101,7 @@ janito/cli/core/runner.py,sha256=7JS9-mN9XNFg6htjQUyOgpQFG86as_4gWMxxwRLc424,915
 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=aOTh9s7HyHBLs2sgquEVbVhFWC_7Udu4u_9LoQ0f78E,5667
+janito/cli/single_shot_mode/handler.py,sha256=d251ObY-5bkUyccV9NYkKDF0VCKrQTrGEnwt3mtj61w,5529
 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
@@ -169,7 +169,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=VBU5S5eSpqE3qX-nHdxLwsp7usgvUFzOsPzKJKu1-10,4763
+janito/providers/openai/provider.py,sha256=PPr_qmSe5GyysnZCxhjeUVhE2LWKjKOSRel-8aaxq_U,4761
 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
@@ -231,7 +231,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=S2NxtPKwwTwCrIXy6YCnG4Ddfp-jsF0Zcjnsj7qYQd4,7887
+janito/tools/adapters/local/search_text/core.py,sha256=Ryi3XOZNvk2dx5c1rAttXJKQI5yBKckav2baKYMKqyM,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 +247,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.28.0.dist-info/licenses/LICENSE,sha256=GSAKapQH5ZIGWlpQTA7v5YrfECyaxaohUb1vJX-qepw,1090
-janito-2.28.0.dist-info/METADATA,sha256=841f_kQs71NwwEGKK5p6cMdDsRf3MX0rL_DYDArHwgQ,16945
-janito-2.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-2.28.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-2.28.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-2.28.0.dist-info/RECORD,,
+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,,