janito 1.12.2__py3-none-any.whl → 1.13.0__py3-none-any.whl

janito/cli/arg_parser.py

@@ -258,6 +258,11 @@ def create_parser():
         action="store_true",
         help="Disable tool call reason tracking (no tools tracking)",
     )
+    parser.add_argument(
+        "--all-out",
+        action="store_true",
+        help="Stream all output live to both the model and the screen, and do not store output in files. (use --all-out)",
+    )
     parser.add_argument(
         "--tool-user",
         action="store_true",

janito/cli/cli_main.py

@@ -18,32 +18,43 @@ def is_port_free(port):
         return s.connect_ex(("localhost", port)) != 0
 
 
+def _set_runtime_flags(args, flags):
+    for flag in flags:
+        if hasattr(args, flag):
+            runtime_config.set(flag, getattr(args, flag, False))
+
+
+def _set_runtime_if_present(args, attr, config_key=None):
+    if getattr(args, attr, None) is not None:
+        runtime_config.set(config_key or attr, getattr(args, attr))
+
+
 def normalize_args(args):
     if getattr(args, "vanilla", False):
         runtime_config.set("vanilla_mode", True)
     if getattr(args, "ntt", False):
         runtime_config.set("no_tools_tracking", True)
-    for flag in [
-        "verbose_http",
-        "verbose_http_raw",
-        "verbose_response",
-        "verbose_reason",
-        "verbose_tools",
-        "verbose_events",
-        "verbose_messages",
-    ]:
-        if hasattr(args, flag):
-            runtime_config.set(flag, getattr(args, flag, False))
+    if getattr(args, "all_out", False):
+        runtime_config.set("all_out", True)
+    _set_runtime_flags(
+        args,
+        [
+            "verbose_http",
+            "verbose_http_raw",
+            "verbose_response",
+            "verbose_reason",
+            "verbose_tools",
+            "verbose_events",
+            "verbose_messages",
+        ],
+    )
     if getattr(args, "trust_tools", False):
         runtime_config.set("trust_tools", True)
-    if getattr(args, "model", None):
-        runtime_config.set("model", args.model)
-    if getattr(args, "max_tools", None) is not None:
-        runtime_config.set("max_tools", args.max_tools)
+    _set_runtime_if_present(args, "model")
+    _set_runtime_if_present(args, "max_tools")
     if getattr(args, "verbose_reason", False):
         runtime_config.set("verbose_reason", True)
-    if getattr(args, "max_tokens", None) is not None:
-        runtime_config.set("max_tokens", args.max_tokens)
+    _set_runtime_if_present(args, "max_tokens")
 
 
 def setup_profile_manager(args, role, interaction_mode, profile, lang):

janito/shell/commands/utility.py

@@ -6,6 +6,9 @@ def handle_help(console, **kwargs):
         help_text = getattr(handler, "help_text", None)
         if help_text:
             console.print(f"  {cmd} - {help_text}")
+    console.print(
+        "[bold cyan]!command[/]: Run a shell/cmd command without exiting the shell (e.g., !dir or !ls)"
+    )
 
 
 def handle_clear(console, **kwargs):

janito/shell/main.py

@@ -87,6 +87,51 @@ def load_session(shell_state, continue_session, session_id, profile_manager):
     return True
 
 
+def _handle_exit_confirmation(session, message_handler, conversation_history):
+    try:
+        confirm = (
+            session.prompt(
+                HTML("<inputline>Do you really want to exit? (y/n): </inputline>")
+            )
+            .strip()
+            .lower()
+        )
+    except KeyboardInterrupt:
+        message_handler.handle_message({"type": "error", "message": "Exiting..."})
+        return True
+    if confirm == "y":
+        message_handler.handle_message({"type": "error", "message": "Exiting..."})
+        conversation_history.add_message(
+            {"role": "system", "content": "[Session ended by user]"}
+        )
+        return True
+    return False
+
+
+def _handle_shell_command(user_input, console):
+    command = user_input.strip()[1:].strip()
+    if command:
+        console.print(f"[bold cyan]Executing shell command:[/] {command}")
+        exit_code = os.system(command)
+        console.print(f"[green]Command exited with code {exit_code}[/green]")
+    else:
+        console.print("[red]No command provided after ![/red]")
+
+
+def _handle_prompt_command(user_input, console, shell_state, conversation_history):
+    result = handle_command(
+        user_input.strip(),
+        console,
+        shell_state=shell_state,
+    )
+    if result == "exit":
+        conversation_history.add_message(
+            {"role": "system", "content": "[Session ended by user]"}
+        )
+        return True
+    return False
+
+
 def handle_prompt_loop(
     shell_state, session, profile_manager, agent, max_rounds, session_id
 ):
@@ -110,42 +155,22 @@ def handle_prompt_loop(
             break
         except KeyboardInterrupt:
             console.print()
-            try:
-                confirm = (
-                    session.prompt(
-                        HTML(
-                            "<inputline>Do you really want to exit? (y/n): </inputline>"
-                        )
-                    )
-                    .strip()
-                    .lower()
-                )
-            except KeyboardInterrupt:
-                message_handler.handle_message(
-                    {"type": "error", "message": "Exiting..."}
-                )
-                break
-            if confirm == "y":
-                message_handler.handle_message(
-                    {"type": "error", "message": "Exiting..."}
-                )
-                conversation_history.add_message(
-                    {"role": "system", "content": "[Session ended by user]"}
-                )
+            if _handle_exit_confirmation(
+                session, message_handler, conversation_history
+            ):
                 break
             else:
                 continue
+        # Handle !cmd command: execute shell command with os.system
+        if user_input.strip().startswith("!"):
+            _handle_shell_command(user_input, console)
+            continue
+
         cmd_input = user_input.strip().lower()
         if not was_paste_mode and (cmd_input.startswith("/") or cmd_input == "exit"):
-            result = handle_command(
-                user_input.strip(),
-                console,
-                shell_state=shell_state,
-            )
-            if result == "exit":
-                conversation_history.add_message(
-                    {"role": "system", "content": "[Session ended by user]"}
-                )
+            if _handle_prompt_command(
+                user_input, console, shell_state, conversation_history
+            ):
                 break
             continue
         if not user_input.strip():

{janito-1.12.2.dist-info → janito-1.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 1.12.2
+Version: 1.13.0
 Summary: Natural Language Coding Agent,
 Author-email: João Pinto <joao.pinto@gmail.com>
 License-Expression: MIT

{janito-1.12.2.dist-info → janito-1.13.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-janito/__init__.py,sha256=sShV3o03FCd1sOSP-USIgwsoW5l17OBSGUpFodS8-rQ,24
+janito/__init__.py,sha256=3Vxl6FAJt_13oY3p4Zx-Yd9-94VF7otXCDoEarA5jhA,24
 janito/__main__.py,sha256=KKIoPBE9xPcb54PRYO2UOt0ti04iAwLeJlg8YY36vew,76
 janito/rich_utils.py,sha256=x7OsZdwtAOtUu_HYbrAMga0LElFMPbQL8GZ62vw5Jh8,1825
 janito/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -47,32 +47,32 @@ janito/agent/tools/get_lines.py,sha256=OO53g0tz1TnWXL8DqabQPEJhI_rYYp1VDjuSElhBP
 janito/agent/tools/move_file.py,sha256=65ndePzYCR0TpI3LPmvL6qt1Tsz9nU6i-YRr3Y7dzCY,5113
 janito/agent/tools/open_url.py,sha256=xXGEonfvU3rCc8vOkdjeC1ibGfDnQEhHQ_qo0MIpPKk,1197
 janito/agent/tools/present_choices.py,sha256=XVO9jhWOUry7TedGPkOU4CG3COV_YdTUp3YiKyNKo2U,2422
-janito/agent/tools/python_command_runner.py,sha256=RSBH8utsFjQ_HqVMN_F9XbrsWD8BqhiMAE8dlmWmrBo,6087
-janito/agent/tools/python_file_runner.py,sha256=tHKScu_FA11EHXrxOc9ntLOGSOORdw7pX-7966i8qpc,5920
-janito/agent/tools/python_stdin_runner.py,sha256=fpLDCVyIo3viecmmwzprzn1OxrSWLtKrbRnh8C55Z_E,6265
+janito/agent/tools/python_command_runner.py,sha256=cu2EHwhgRKYERZ7Wjz-x0E_6NhNQUWnxcg1wqU4Jg_Q,8511
+janito/agent/tools/python_file_runner.py,sha256=nLIG4CSqMNKJyZyQ5js23LpRP8BAGjTTI1s36-YnUXg,8345
+janito/agent/tools/python_stdin_runner.py,sha256=rWWAX2l7vPG1poV0wnIy7K983Eft15kf-RvORxqJ1gk,8795
 janito/agent/tools/remove_directory.py,sha256=9NmSqlSIGbm-uvundEQM89ZMGmcgPqygnnw-Cu9lQq8,2500
 janito/agent/tools/remove_file.py,sha256=v6NJdECofBxYB2YRt3DCqHr91kSPVfMQlgpuL0svVEs,2409
 janito/agent/tools/replace_file.py,sha256=SurwU_oR6HqZ2vsxNo8Ud-NT-gayg0XipoiCWlMESDI,3275
-janito/agent/tools/replace_text_in_file.py,sha256=xLICg1l_kjJo3AwQisxL5oLcO_Gbg0ybFzn_2moN7Fo,11027
-janito/agent/tools/run_bash_command.py,sha256=XEyBGa5cSfjdi0sOklsaPNsEW_9oC9LZIir4FkxcO0M,5877
-janito/agent/tools/run_powershell_command.py,sha256=qA27uMsF6CqFd3A81Gn8TzEj99MHr0C_12QM74fIRNc,9022
+janito/agent/tools/replace_text_in_file.py,sha256=gOZOE-gIZ9Dxdzy1mQBue465kYSyAB8LTFQSh4APqoo,10974
+janito/agent/tools/run_bash_command.py,sha256=ea694qpN1M0bwkHkxPqRao1pSKyNmbjQnDGZgjRLZ9Q,8582
+janito/agent/tools/run_powershell_command.py,sha256=2s4YjsUzgElwX6KgUFq3xZcFj5wosPJ4F0nPXke6M6s,10306
 janito/agent/tools/get_file_outline/__init__.py,sha256=OKV_BHnoD9h-vkcVoW6AHmsuDjjauHPCKNK0nVFl4sU,37
 janito/agent/tools/get_file_outline/core.py,sha256=e75fij0Wx7mBveBIQirpkuu8WzMnxUIEwSylvS-UNzc,3312
 janito/agent/tools/get_file_outline/markdown_outline.py,sha256=bXEBg0D93tEBDNy8t-wh4i7WxsxfpQ2C3dX1_rmtj08,434
 janito/agent/tools/get_file_outline/python_outline.py,sha256=d_DKQjo5fbzOvQadc2A_58kmavUTVqkzpWRdFRO4sbU,5768
 janito/agent/tools/get_file_outline/search_outline.py,sha256=_wPdylEFvl-iE3fuwY3MEUlaDKO5cbHxN1_DTJf5x8s,1079
 janito/agent/tools/search_text/__init__.py,sha256=FEYpF5tTtf0fiAyRGIGSn-kV-MJDkhdFIbus16mYW8Y,34
-janito/agent/tools/search_text/core.py,sha256=dpIknu-GHarl1kNo9V-x0zXfKg0bC1CXjIHmtCwrVoU,6882
+janito/agent/tools/search_text/core.py,sha256=7x4hXKXQD7OGeE2zwjWoksGxJrFT6SpTDaw3fJsu8wc,6879
 janito/agent/tools/search_text/match_lines.py,sha256=OjYgX9vFphambv0SfTLGZoR5Cdzf-Fp5Ytbj4sGEgnI,1999
-janito/agent/tools/search_text/pattern_utils.py,sha256=j_Svq_l-RT63VVAI9nj1ULm1qdU2JTsWKrVVaAgyRoo,2129
+janito/agent/tools/search_text/pattern_utils.py,sha256=x8ZUVIu_yC5urafcp4f11T--2hiuLTGvjcAevOAKYOI,2123
 janito/agent/tools/search_text/traverse_directory.py,sha256=Ln_GaJFQ0DQ4A2qBZ1Y4tX7YMFROhonFgTHf48DDXHQ,3864
 janito/agent/tools/validate_file_syntax/__init__.py,sha256=P53RHmas4BbHL90cMxH9m-RpMCJI8JquoJb0rpkPVVk,29
-janito/agent/tools/validate_file_syntax/core.py,sha256=jUT4m-4i6hcFh4U1eCpt4V5xbpKMrlCZyHdr2Ca25SY,3407
+janito/agent/tools/validate_file_syntax/core.py,sha256=tmX1kaZP_W6xQbNAnXKl6V9D-MVsiKz9tads3H3W5dI,3359
 janito/agent/tools/validate_file_syntax/css_validator.py,sha256=tRnCzNkpiYKQ_X9yvPeDPqZvc59He2T-2CbXmCs8Hjw,1371
 janito/agent/tools/validate_file_syntax/html_validator.py,sha256=YlAQUmBkuE9jMiN3uepYI8W9s3E0vwONXiAdNu9l5-U,3074
 janito/agent/tools/validate_file_syntax/js_validator.py,sha256=oVkGxK9wBbZ3cFqwrV_aF76FDQwKPDvbXxXn1tL4We0,1018
 janito/agent/tools/validate_file_syntax/json_validator.py,sha256=jfft16AjPqo4opIlv36Yc1QhpwiYVlMOyfeAJuhRZ8U,170
-janito/agent/tools/validate_file_syntax/markdown_validator.py,sha256=cLyBS8P7xZIjp91V3wDaHStHOPHoxfsIYqaesO5rUAc,3540
+janito/agent/tools/validate_file_syntax/markdown_validator.py,sha256=IppdzFV3d9WK17VqWEal-kQXUVUuZDlR00AZ2OlVHzM,3531
 janito/agent/tools/validate_file_syntax/ps1_validator.py,sha256=DQbsIIC3oaFkbeK7BMjZcIzy-zkPHX1JbhMMS3q_rmc,1172
 janito/agent/tools/validate_file_syntax/python_validator.py,sha256=SN9eNgk9Uormr_kfyan9hCZClZ1LB5guObOzbZRyo6c,150
 janito/agent/tools/validate_file_syntax/xml_validator.py,sha256=nDHMnrSdjAyQhbSIJZcDuqEkeiJmjvTALlKdtn_Ny0k,304
@@ -89,8 +89,8 @@ janito/cli/_livereload_log_utils.py,sha256=BGhf1VT3dVR2ZhyTnZeTFg4I8Zj2tAn2UslME
 janito/cli/_print_config.py,sha256=fzrVy23Ppe-Dax97VU759bus-KRe1VycU5MAPbHE72g,3259
 janito/cli/_termweb_log_utils.py,sha256=QpH40uxPhksrJHWqthW4cR7BhcSSYakpza_qTeFGABs,722
 janito/cli/_utils.py,sha256=tRAUMDWKczd81ZvKYkwpsHWSeLzQoVlOoQ-lOw9Iujw,291
-janito/cli/arg_parser.py,sha256=8cE0E6zHWy4VE1jio3E3hyBpULD2AKo8q6QkTjyeWiQ,8345
-janito/cli/cli_main.py,sha256=egi9Ql8iskSlmP_QU6eGAVqbzRp4lU5dt97K9WrIsn0,10341
+janito/cli/arg_parser.py,sha256=4VzEBI6PPXsHQLHyH4HCax8M-6wWRryNgnr6W4n96Y4,8554
+janito/cli/cli_main.py,sha256=emvt6R6Ou1caIeb82W6CfjLo9L14m-UtfpUKk7vDnNI,10572
 janito/cli/config_commands.py,sha256=7c1a-FMaRLHSUuH93NqLlao9plg3C220xe_MnhE1zMA,7561
 janito/cli/config_runner.py,sha256=Nzam25C8P55dFlT_f6IlEj2ZvFwS63AAbnkIWe3oNsg,1702
 janito/cli/formatting_runner.py,sha256=k0mtHoglqR8fKcebSK81iWTT_EL-gDl7eNfjlFZRY6g,287
@@ -104,9 +104,8 @@ janito/i18n/messages.py,sha256=fBuwOTFoygyHPkYphm6Y0r1iE8497Z4iryVAmPhMEkg,1851
 janito/i18n/pt.py,sha256=52-ENCIrPW4A1tXFRT28xA8TwuUFoihs6ezJj-m3-Y4,4260
 janito/livereload/app.py,sha256=oJTKDN5vpix26d1MA5iQz9mPLDu4VaHisAW8wtOUEhY,666
 janito/shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-janito/shell/commands.py,sha256=gqMKLvb6MrESPx51O28OP5I9hDZuBkRMaom3hT_ACqA,1586
 janito/shell/input_history.py,sha256=JedB9TQoRf31l2XGadeQtyx1qAAFPLRyXSvMLltRwZE,2542
-janito/shell/main.py,sha256=9X8--rkh5v56VV7ttz9okHal9L8lNQ86L5Oth67cTCE,11413
+janito/shell/main.py,sha256=ZMVAMvUAbbfYqdSdQwe6fSeHsc82rGmwZhzR9n4f-zY,12169
 janito/shell/commands/__init__.py,sha256=CJGXhVFEQdbIL214g3vF7vhyvlvtjqjFHjSMMTjXHjM,2016
 janito/shell/commands/config.py,sha256=UTNbyNOLpIqlAle_JpCiffP7h5IOk7wxih-10_ok62w,959
 janito/shell/commands/conversation_restart.py,sha256=b32vWa7rm43lA1SrFZ0v-OAB-zf4dTP307rEr52Mt9A,2825
@@ -120,7 +119,7 @@ janito/shell/commands/session_control.py,sha256=PAFg00vXQvIhAuCtd4L149hrj8jGguB0
 janito/shell/commands/termweb_log.py,sha256=xxFz2GhFRI7w7jNk0D0Gq6RFBuzIZF1paDMK2MBeNWA,3519
 janito/shell/commands/tools.py,sha256=Z6kB0Lu87gzWYiUcjNB_kkX-jCNSRpZZh_qgetzhFMU,970
 janito/shell/commands/track.py,sha256=xOqVHjcnrMWZ_vhP1gpT0-2NUvJqPVT-MGdC38NJatg,1577
-janito/shell/commands/utility.py,sha256=kuUw1kklQa7c4okSFJ2bRA92NV-YUXqgor5Io7y1zGM,860
+janito/shell/commands/utility.py,sha256=DKcEbBIDmtxxZgWtT9-qBUVmFbCbRUILDo0kecmGJBE,992
 janito/shell/commands/verbose.py,sha256=mg7BlsWTkNwbUBN2p_GME4ep3zzAp0jMSc6N4BT3Ebg,980
 janito/shell/prompt/completer.py,sha256=6gNu0DNNSbUUVgjk8Y0hWwJwk-jbN8Lm6Y4u0mRu930,755
 janito/shell/prompt/load_prompt.py,sha256=gHedc5TtaFBKiGgwRM_u9nVnBuLHDTSa8VPlPOtoMEA,2125
@@ -155,9 +154,9 @@ janito/tests/test_rich_utils.py,sha256=S_mGVynekAP0DM4A_ZaY-SseJGtdlBJxOlzc-v8lJ
 janito/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janito/web/__main__.py,sha256=5Ck6okOZmxKYkQ-ir4mxXDH7XWMNR-9szgsm0UyQLE0,734
 janito/web/app.py,sha256=-zUBA1zlnrZdYbI421CSAgFZXOisLmIznNzUJrkSLQQ,4762
-janito-1.12.2.dist-info/licenses/LICENSE,sha256=sHBqv0bvtrb29H7WRR-Z603YHm9pLtJIo3nHU_9cmgE,1091
-janito-1.12.2.dist-info/METADATA,sha256=JithxB50yNFl6cZ4cUorEQj0xpNnpKGffurpijW4LPs,12879
-janito-1.12.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-janito-1.12.2.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-1.12.2.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-1.12.2.dist-info/RECORD,,
+janito-1.13.0.dist-info/licenses/LICENSE,sha256=sHBqv0bvtrb29H7WRR-Z603YHm9pLtJIo3nHU_9cmgE,1091
+janito-1.13.0.dist-info/METADATA,sha256=er7ySO_CJRytKqwmORgEU7zFtTJqyt4bGPxms4to_RE,12879
+janito-1.13.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+janito-1.13.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-1.13.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-1.13.0.dist-info/RECORD,,

{janito-1.12.2.dist-info → janito-1.13.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

janito/shell/commands.py

@@ -1,40 +0,0 @@
-from janito.agent.tool_registry import get_tool_schemas
-from rich.console import Console
-
-
-def handle_command(cmd, console: Console, shell_state=None):
-    cmd = cmd.strip().lower()
-    if cmd in ("/exit", "exit"):
-        return "exit"
-    if cmd in ("/help", "help"):
-        console.print("[bold cyan]/help[/]: Show this help message")
-        console.print("[bold cyan]/exit[/]: Exit the shell")
-        console.print("[bold cyan]/tools[/]: List available tools")
-        return
-    if cmd in ("/tools", "tools"):
-        table = None
-        try:
-            from rich.table import Table
-
-            table = Table(
-                title="Available Tools", show_lines=True, style="bold magenta"
-            )
-            table.add_column("Name", style="cyan", no_wrap=True)
-            table.add_column("Description", style="green")
-            table.add_column("Parameters", style="yellow")
-            for schema in get_tool_schemas():
-                fn = schema["function"]
-                params = "\n".join(
-                    [
-                        f"[bold]{k}[/]: {v['type']}"
-                        for k, v in fn["parameters"].get("properties", {}).items()
-                    ]
-                )
-                table.add_row(f"[b]{fn['name']}[/b]", fn["description"], params or "-")
-        except Exception as e:
-            console.print(f"[red]Error loading tools: {e}[/red]")
-        if table:
-            console.print(table)
-        return
-    # Unknown command
-    console.print(f"[yellow]Unknown command:[/] {cmd}")