janito 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

janito/cli_chat_shell/commands/config.py

@@ -0,0 +1,22 @@
+def handle_reload(console, *args, **kwargs):
+    from ..load_prompt import load_prompt
+
+    agent = kwargs.get("agent")
+    state = kwargs.get("state")
+    filename = args[0] if args else None
+    try:
+        prompt_text = load_prompt(filename)
+        if hasattr(agent, "system_prompt_template"):
+            agent.system_prompt_template = prompt_text
+        # Update the first system message in the conversation if present
+        messages = state.get("messages") if state else None
+        if messages:
+            for msg in messages:
+                if msg.get("role") == "system":
+                    msg["content"] = prompt_text
+                    break
+        console.print(
+            f"[bold green]System prompt reloaded from {'default file' if not filename else filename}![/bold green]"
+        )
+    except Exception as e:
+        console.print(f"[bold red]Failed to reload system prompt:[/bold red] {e}")

janito/cli_chat_shell/commands/history_reset.py

@@ -0,0 +1,29 @@
+from prompt_toolkit.history import InMemoryHistory
+import os
+
+
+def handle_reset(console, state, **kwargs):
+    save_path = os.path.join(".janito", "last_conversation.json")
+
+    # Clear in-memory conversation and prompt history
+    state["messages"].clear()
+    state["history_list"].clear()
+    state["mem_history"] = InMemoryHistory()
+    state["last_usage_info"] = None
+    state["last_elapsed"] = None
+
+    # Delete saved conversation file if exists
+    if os.path.exists(save_path):
+        try:
+            os.remove(save_path)
+            console.print(
+                "[bold yellow]Deleted saved conversation history.[/bold yellow]"
+            )
+        except Exception as e:
+            console.print(
+                f"[bold red]Failed to delete saved conversation:[/bold red] {e}"
+            )
+    else:
+        console.print("[bold yellow]No saved conversation to delete.[/bold yellow]")
+
+    console.print("[bold green]Conversation history has been reset.[/bold green]")

janito/cli_chat_shell/commands/session.py

@@ -0,0 +1,48 @@
+from prompt_toolkit.history import InMemoryHistory
+import os
+import json
+
+
+def handle_continue(console, state, **kwargs):
+    save_path = os.path.join(".janito", "last_conversation.json")
+    if not os.path.exists(save_path):
+        console.print("[bold red]No saved conversation found.[/bold red]")
+        return
+
+    with open(save_path, "r", encoding="utf-8") as f:
+        data = json.load(f)
+    state["messages"].clear()
+    state["messages"].extend(data.get("messages", []))
+    state["history_list"].clear()
+    state["history_list"].extend(data.get("prompts", []))
+    state["mem_history"] = InMemoryHistory()
+    for item in state["history_list"]:
+        state["mem_history"].append_string(item)
+    state["last_usage_info"] = data.get("last_usage_info")
+    console.print("[bold green]Conversation restored from last session.[/bold green]")
+
+
+def handle_history(console, state, *args, **kwargs):
+    messages = state.get("messages", [])
+    if not args:
+        # Default: last 5 messages
+        start = max(0, len(messages) - 5)
+        end = len(messages)
+    elif len(args) == 1:
+        count = int(args[0])
+        start = max(0, len(messages) - count)
+        end = len(messages)
+    elif len(args) >= 2:
+        start = int(args[0])
+        end = int(args[1]) + 1  # inclusive
+    else:
+        start = 0
+        end = len(messages)
+
+    console.print(
+        f"[bold cyan]Showing messages {start} to {end - 1} (total {len(messages)}):[/bold cyan]"
+    )
+    for idx, msg in enumerate(messages[start:end], start=start):
+        role = msg.get("role", "unknown")
+        content = msg.get("content", "")
+        console.print(f"[bold]{idx} [{role}]:[/bold] {content}")

janito/cli_chat_shell/commands/session_control.py

@@ -0,0 +1,12 @@
+import os
+import sys
+
+
+def handle_exit(console, **kwargs):
+    console.print("[bold red]Exiting chat mode.[/bold red]")
+    sys.exit(0)
+
+
+def handle_restart(console, **kwargs):
+    console.print("[bold yellow]Restarting CLI...[/bold yellow]")
+    os.execv(sys.executable, [sys.executable, "-m", "janito"] + sys.argv[1:])

janito/cli_chat_shell/commands/system.py

@@ -0,0 +1,73 @@
+from janito.agent.runtime_config import runtime_config
+
+
+def handle_system(console, **kwargs):
+    profile_manager = kwargs.get("profile_manager")
+    prompt = profile_manager.system_prompt_template if profile_manager else None
+    if not prompt and profile_manager:
+        prompt = profile_manager.render_prompt()
+    console.print(f"[bold magenta]System Prompt:[/bold magenta]\n{prompt}")
+
+
+def handle_role(console, *args, **kwargs):
+    state = kwargs.get("state")
+    profile_manager = kwargs.get("profile_manager")
+    if not args:
+        console.print("[bold red]Usage: /role <new role description>[/bold red]")
+        return
+    new_role = " ".join(args)
+    if profile_manager:
+        profile_manager.set_role(new_role)
+    # Update system message in conversation
+    found = False
+    for msg in state["messages"]:
+        if msg.get("role") == "system":
+            msg["content"] = (
+                profile_manager.system_prompt_template if profile_manager else new_role
+            )
+            found = True
+            break
+    if not found:
+        state["messages"].insert(0, {"role": "system", "content": new_role})
+    # Also store the raw role string
+    if profile_manager:
+        setattr(profile_manager, "role_name", new_role)
+    runtime_config.set("role", new_role)
+    console.print(f"[bold green]System role updated to:[/bold green] {new_role}")
+
+
+def handle_style(console, *args, **kwargs):
+    """/style <new_style> - Change the interaction style (e.g., default, technical)"""
+    state = kwargs.get("state")
+    profile_manager = kwargs.get("profile_manager")
+    if not args:
+        current = getattr(profile_manager, "interaction_style", "default")
+        console.print(f"[bold green]Current style:[/bold green] {current}")
+        return
+    new_style = args[0]
+    if profile_manager:
+        profile_manager.set_interaction_style(new_style)
+    # Update system message in conversation
+    found = False
+    for msg in state["messages"]:
+        if msg.get("role") == "system":
+            msg["content"] = (
+                profile_manager.system_prompt_template
+                if profile_manager
+                else msg["content"]
+            )
+            found = True
+            break
+    if not found:
+        state["messages"].insert(
+            0,
+            {
+                "role": "system",
+                "content": (
+                    profile_manager.system_prompt_template
+                    if profile_manager
+                    else new_style
+                ),
+            },
+        )
+    console.print(f"[bold green]Interaction style updated to:[/bold green] {new_style}")

janito/cli_chat_shell/commands/utility.py

@@ -0,0 +1,29 @@
+def handle_help(console, **kwargs):
+    console.print(
+        """
+[bold green]Available commands:[/bold green]
+  /exit, exit     - Exit chat mode
+  /restart  - Restart the CLI
+  /help     - Show this help message
+  /continue - Restore last saved conversation
+  /reset    - Reset conversation history
+  /system   - Show the system prompt
+  /role     - Change the system role
+  /clear    - Clear the terminal screen
+  /multi    - Provide multiline input as next message
+  /config   - Show or set configuration (see: /config show, /config set local|global key=value)
+"""
+    )
+
+
+def handle_clear(console, **kwargs):
+    import os
+
+    os.system("cls" if os.name == "nt" else "clear")
+
+
+def handle_multi(console, state, **kwargs):
+    console.print(
+        "[bold yellow]Multiline mode activated. Provide or write your text and press Esc + Enter to submit.[/bold yellow]"
+    )
+    state["paste_mode"] = True

janito/cli_chat_shell/config_shell.py

@@ -2,6 +2,7 @@ from janito.agent.config import local_config, global_config, CONFIG_OPTIONS
 from janito.agent.config_defaults import CONFIG_DEFAULTS
 from janito.agent.runtime_config import unified_config, runtime_config
 
+
 def handle_config_shell(console, *args, **kwargs):
     """
     /config show
@@ -11,13 +12,22 @@ def handle_config_shell(console, *args, **kwargs):
     /config reset global
     """
     if not args or args[0] not in ("show", "set", "reset"):
-        console.print("[bold red]Usage:[/bold red] /config show | /config set local|global key=value | /config reset local|global")
+        console.print(
+            "[bold red]Usage:[/bold red] /config show | /config set local|global key=value | /config reset local|global"
+        )
         return
 
     if args[0] == "show":
         # Show config, unified with CLI
         from janito.cli._print_config import print_full_config
-        print_full_config(local_config, global_config, unified_config, CONFIG_DEFAULTS, console=console)
+
+        print_full_config(
+            local_config,
+            global_config,
+            unified_config,
+            CONFIG_DEFAULTS,
+            console=console,
+        )
         return
 
     if args[0] == "reset":
@@ -26,27 +36,38 @@ def handle_config_shell(console, *args, **kwargs):
             return
         import os
         from pathlib import Path
+
         scope = args[1]
         if scope == "local":
-            local_path = Path('.janito/config.json')
+            local_path = Path(".janito/config.json")
             if local_path.exists():
                 os.remove(local_path)
                 console.print(f"[green]Removed local config file:[/green] {local_path}")
             else:
-                console.print(f"[yellow]Local config file does not exist:[/yellow] {local_path}")
+                console.print(
+                    f"[yellow]Local config file does not exist:[/yellow] {local_path}"
+                )
         elif scope == "global":
-            global_path = Path.home() / '.janito/config.json'
+            global_path = Path.home() / ".janito/config.json"
             if global_path.exists():
                 os.remove(global_path)
-                console.print(f"[green]Removed global config file:[/green] {global_path}")
+                console.print(
+                    f"[green]Removed global config file:[/green] {global_path}"
+                )
             else:
-                console.print(f"[yellow]Global config file does not exist:[/yellow] {global_path}")
-        console.print("[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]")
+                console.print(
+                    f"[yellow]Global config file does not exist:[/yellow] {global_path}"
+                )
+        console.print(
+            "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
+        )
         return
 
     if args[0] == "set":
         if len(args) < 3 or args[1] not in ("local", "global"):
-            console.print("[bold red]Usage:[/bold red] /config set local|global key=value")
+            console.print(
+                "[bold red]Usage:[/bold red] /config set local|global key=value"
+            )
             return
         scope = args[1]
         try:
@@ -56,7 +77,9 @@ def handle_config_shell(console, *args, **kwargs):
             return
         key = key.strip()
         if key not in CONFIG_OPTIONS and not key.startswith("template."):
-            console.print(f"[bold red]Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}")
+            console.print(
+                f"[bold red]Invalid config key: '{key}'. Supported keys are: {', '.join(CONFIG_OPTIONS.keys())}"
+            )
             return
         val = val.strip()
         if scope == "local":
@@ -64,9 +87,15 @@ def handle_config_shell(console, *args, **kwargs):
             local_config.save()
             runtime_config.set(key, val)
             console.print(f"[green]Local config updated:[/green] {key} = {val}")
+            console.print(
+                "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
+            )
         elif scope == "global":
             global_config.set(key, val)
             global_config.save()
             runtime_config.set(key, val)
             console.print(f"[green]Global config updated:[/green] {key} = {val}")
+            console.print(
+                "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
+            )
         return

janito/cli_chat_shell/load_prompt.py

@@ -1,5 +1,6 @@
 import os
 
+
 def load_prompt(filename=None):
     """
     Load the system prompt from a file. If filename is None, use the default prompt file.
@@ -7,9 +8,11 @@ def load_prompt(filename=None):
     """
     if filename is None:
         # Default prompt file path (can be customized)
-        filename = os.path.join(os.path.dirname(__file__), '../agent/templates/system_instructions.j2')
+        filename = os.path.join(
+            os.path.dirname(__file__), "../agent/templates/system_prompt_template.j2"
+        )
     filename = os.path.abspath(filename)
     if not os.path.exists(filename):
         raise FileNotFoundError(f"Prompt file not found: {filename}")
-    with open(filename, 'r', encoding='utf-8') as f:
+    with open(filename, "r", encoding="utf-8") as f:
         return f.read()

janito/cli_chat_shell/session_manager.py

@@ -3,65 +3,62 @@ import json
 from datetime import datetime
 
 
-def load_last_summary(path='.janito/last_conversation.json'):
+def load_last_summary(path=".janito/last_conversation.json"):
     if not os.path.exists(path):
         return None
-    with open(path, 'r', encoding='utf-8') as f:
+    with open(path, "r", encoding="utf-8") as f:
         data = json.load(f)
     return data
 
 
-
-def load_last_conversation(path='.janito/last_conversation.json'):
+def load_last_conversation(path=".janito/last_conversation.json"):
     if not os.path.exists(path):
         return [], [], None
-    with open(path, 'r', encoding='utf-8') as f:
+    with open(path, "r", encoding="utf-8") as f:
         data = json.load(f)
-    messages = data.get('messages', [])
-    prompts = data.get('prompts', [])
-    usage = data.get('last_usage_info')
+    messages = data.get("messages", [])
+    prompts = data.get("prompts", [])
+    usage = data.get("last_usage_info")
     return messages, prompts, usage
 
 
-
-def save_conversation(messages, prompts, usage_info=None, path='.janito/last_conversation.json'):
+def save_conversation(
+    messages, prompts, usage_info=None, path=".janito/last_conversation.json"
+):
     os.makedirs(os.path.dirname(path), exist_ok=True)
-    data = {
-        'messages': messages,
-        'prompts': prompts,
-        'last_usage_info': usage_info
-    }
-    with open(path, 'w', encoding='utf-8') as f:
+    data = {"messages": messages, "prompts": prompts, "last_usage_info": usage_info}
+    with open(path, "w", encoding="utf-8") as f:
         json.dump(data, f, indent=2)
 
 
 def load_input_history():
-    history_dir = os.path.join('.janito', 'input_history')
+    history_dir = os.path.join(".janito", "input_history")
     os.makedirs(history_dir, exist_ok=True)
-    today_str = datetime.now().strftime('%y%m%d')
-    history_file = os.path.join(history_dir, f'{today_str}.json')
+    today_str = datetime.now().strftime("%y%m%d")
+    history_file = os.path.join(history_dir, f"{today_str}.json")
     try:
-        with open(history_file, 'r', encoding='utf-8') as f:
+        with open(history_file, "r", encoding="utf-8") as f:
             return json.load(f)
     except (FileNotFoundError, json.JSONDecodeError):
         return []
 
 
 def save_input_history(history_list):
-    history_dir = os.path.join('.janito', 'input_history')
+    history_dir = os.path.join(".janito", "input_history")
     os.makedirs(history_dir, exist_ok=True)
-    today_str = datetime.now().strftime('%y%m%d')
-    history_file = os.path.join(history_dir, f'{today_str}.json')
-    with open(history_file, 'w', encoding='utf-8') as f:
+    today_str = datetime.now().strftime("%y%m%d")
+    history_file = os.path.join(history_dir, f"{today_str}.json")
+    with open(history_file, "w", encoding="utf-8") as f:
         json.dump(history_list, f, indent=2)
 
-def last_conversation_exists(path='.janito/last_conversation.json'):
+
+def last_conversation_exists(path=".janito/last_conversation.json"):
     if not os.path.exists(path):
         return False
     try:
-        with open(path, 'r', encoding='utf-8') as f:
+        with open(path, "r", encoding="utf-8") as f:
             data = json.load(f)
-        messages = data.get('messages', [])
+        messages = data.get("messages", [])
         return bool(messages)
     except Exception:
         return False

janito/cli_chat_shell/ui.py

@@ -9,39 +9,58 @@ from .session_manager import last_conversation_exists
 def print_summary(console, data, continue_session):
     if not data:
         return
-    msgs = data.get('messages', [])
-    last_user = next((m['content'] for m in reversed(msgs) if m.get('role') == 'user'), None)
-    last_assistant = next((m['content'] for m in reversed(msgs) if m.get('role') == 'assistant'), None)
-    usage = data.get('last_usage_info', {})
-    console.print('[bold cyan]Last saved conversation:[/bold cyan]')
+    msgs = data.get("messages", [])
+    last_user = next(
+        (m["content"] for m in reversed(msgs) if m.get("role") == "user"), None
+    )
+    last_assistant = next(
+        (m["content"] for m in reversed(msgs) if m.get("role") == "assistant"), None
+    )
+    usage = data.get("last_usage_info", {})
+    console.print("[bold cyan]Last saved conversation:[/bold cyan]")
     console.print(f"Messages: {len(msgs)}")
     if last_user:
-        console.print(f"Last user: [italic]{last_user[:100]}{'...' if len(last_user)>100 else ''}[/italic]")
+        console.print(
+            f"Last user: [italic]{last_user[:100]}{'...' if len(last_user)>100 else ''}[/italic]"
+        )
     if last_assistant:
-        console.print(f"Last assistant: [italic]{last_assistant[:100]}{'...' if len(last_assistant)>100 else ''}[/italic]")
+        console.print(
+            f"Last assistant: [italic]{last_assistant[:100]}{'...' if len(last_assistant)>100 else ''}[/italic]"
+        )
     if usage:
-        ptok = usage.get('prompt_tokens')
-        ctok = usage.get('completion_tokens')
+        ptok = usage.get("prompt_tokens")
+        ctok = usage.get("completion_tokens")
         tot = (ptok or 0) + (ctok or 0)
         console.print(f"Tokens - Prompt: {ptok}, Completion: {ctok}, Total: {tot}")
     # Only print /continue suggestion if a last conversation exists
     if not continue_session and last_conversation_exists():
-        console.print("[bold yellow]Type /continue to restore the last saved conversation.[/bold yellow]")
+        console.print(
+            "[bold yellow]Type /continue to restore the last saved conversation.[/bold yellow]"
+        )
 
 
 def print_welcome(console, version=None, continued=False):
     version_str = f" (v{version})" if version else ""
-    vanilla_mode = runtime_config.get('vanilla_mode', False)
+    vanilla_mode = runtime_config.get("vanilla_mode", False)
     if vanilla_mode:
-        console.print(f"[bold magenta]Welcome to Janito{version_str} in [white on magenta]VANILLA MODE[/white on magenta]! Tools, system prompt, and temperature are disabled unless overridden.[/bold magenta]")
+        console.print(
+            f"[bold magenta]Welcome to Janito{version_str} in [white on magenta]VANILLA MODE[/white on magenta]! Tools, system prompt, and temperature are disabled unless overridden.[/bold magenta]\n[cyan]Quick action: Press F12 to continue. Double-check the suggested action first. 😊[/cyan]"
+        )
     else:
-        console.print(f"[bold green]Welcome to Janito{version_str}! Entering chat mode. Type /exit to exit.[/bold green]")
+        console.print(
+            f"[bold green]Welcome to Janito{version_str}! Entering chat mode. Type /exit to exit.[/bold green]\n[cyan]Quick action: Press F12 to continue. Double-check the suggested action first. 😊[/cyan]"
+        )
     # Only print /continue suggestion if a last conversation exists
-    if not continued and last_conversation_exists():
-        console.print("[yellow]To resume your previous conversation, type /continue at any time.[/yellow]")
 
 
-def get_toolbar_func(messages_ref, last_usage_info_ref, last_elapsed_ref, model_name=None, role_ref=None):
+def get_toolbar_func(
+    messages_ref,
+    last_usage_info_ref,
+    last_elapsed_ref,
+    model_name=None,
+    role_ref=None,
+    style_ref=None,
+):
     def format_tokens(n):
         if n is None:
             return "?"
@@ -52,12 +71,12 @@ def get_toolbar_func(messages_ref, last_usage_info_ref, last_elapsed_ref, model_
         return str(n)
 
     def get_toolbar():
-        left = f' Messages:  <msg_count>{len(messages_ref())}</msg_count>'
+        left = f" Messages:  <msg_count>{len(messages_ref())}</msg_count>"
         usage = last_usage_info_ref()
         last_elapsed = last_elapsed_ref()
         if usage:
-            prompt_tokens = usage.get('prompt_tokens')
-            completion_tokens = usage.get('completion_tokens')
+            prompt_tokens = usage.get("prompt_tokens")
+            completion_tokens = usage.get("completion_tokens")
             total_tokens = (prompt_tokens or 0) + (completion_tokens or 0)
             speed = None
             if last_elapsed and last_elapsed > 0:
@@ -71,26 +90,34 @@ def get_toolbar_func(messages_ref, last_usage_info_ref, last_elapsed_ref, model_
                 left += f", speed=<speed>{speed:.1f}</speed> tokens/sec"
 
         from prompt_toolkit.application import get_app
+
         width = get_app().output.get_size().columns
         model_part = f" Model:  <model>{model_name}</model>" if model_name else ""
         role_part = ""
-        vanilla_mode = runtime_config.get('vanilla_mode', False)
+        vanilla_mode = runtime_config.get("vanilla_mode", False)
         if role_ref and not vanilla_mode:
             role = role_ref()
             if role:
                 role_part = f"Role: <b>{role}</b>"
+        style_part = ""
+        if style_ref:
+            style = style_ref()
+            if style:
+                style_part = f"Style: <b>{style}</b>"
         first_line_parts = []
         if model_part:
             first_line_parts.append(model_part)
         if role_part:
             first_line_parts.append(role_part)
+        if style_part:
+            first_line_parts.append(style_part)
         first_line = " | ".join(first_line_parts)
-        help_part = "<b>/help</b> for help | <b>F12</b>: Go ahead"
+        help_part = "<b>/help</b> for help | <b>F12</b>: proceed"
         total_len = len(left) + len(help_part) + 3  # separators and spaces
         if first_line:
             total_len += len(first_line) + 3
         if total_len < width:
-            padding = ' ' * (width - total_len)
+            padding = " " * (width - total_len)
             second_line = f"{left}{padding} | {help_part}"
         else:
             second_line = f"{left} | {help_part}"
@@ -99,39 +126,47 @@ def get_toolbar_func(messages_ref, last_usage_info_ref, last_elapsed_ref, model_
         else:
             toolbar_text = second_line
         return HTML(toolbar_text)
+
     return get_toolbar
 
+
 def get_prompt_session(get_toolbar_func, mem_history):
     from prompt_toolkit.key_binding import KeyBindings
-    style = Style.from_dict({
-        'bottom-toolbar': 'bg:#333333 #ffffff',
-        'b': 'bold',
-        'prompt': 'bold bg:#000080 #ffffff',
-        'model': 'bold bg:#005f5f #ffffff',  # distinct background/foreground
-        'msg_count': 'bg:#333333 #ffff00 bold',
-        'tokens_in': 'ansicyan bold',
-        'tokens_out': 'ansigreen bold',
-        'tokens_total': 'ansiyellow bold',
-        'speed': 'ansimagenta bold',
-        'right': 'bg:#005f5f #ffffff',
-        'input': 'bg:#000080 #ffffff',
-        '': 'bg:#000080 #ffffff',
-    })
+
+    style = Style.from_dict(
+        {
+            "bottom-toolbar": "bg:#333333 #ffffff",
+            "b": "bold",
+            "prompt": "bold bg:#000080 #ffffff",
+            "model": "bold bg:#005f5f #ffffff",  # distinct background/foreground
+            "msg_count": "bg:#333333 #ffff00 bold",
+            "tokens_in": "ansicyan bold",
+            "tokens_out": "ansigreen bold",
+            "tokens_total": "ansiyellow bold",
+            "speed": "ansimagenta bold",
+            "right": "bg:#005f5f #ffffff",
+            "input": "bg:#000080 #ffffff",
+            "": "bg:#000080 #ffffff",
+        }
+    )
     kb = KeyBindings()
-    @kb.add('f12')
+
+    @kb.add("f12")
     def _(event):
-        """When F12 is pressed, send 'Go ahead' as input immediately."""
+        """When F12 is pressed, send 'proceed' as input immediately."""
         buf = event.app.current_buffer
-        buf.text = 'Go ahead'
+        buf.text = "proceed"
         buf.validate_and_handle()
+
     session = PromptSession(
         multiline=False,
         key_bindings=kb,
         editing_mode=EditingMode.EMACS,
         bottom_toolbar=get_toolbar_func,
         style=style,
-        history=mem_history
+        history=mem_history,
     )
     return session
 
+
 # ... rest of the file remains unchanged ...