janito 1.9.0__py3-none-any.whl → 1.11.0__py3-none-any.whl

janito/shell/session/config.py

@@ -12,90 +12,98 @@ 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"
-        )
+        _print_usage(console)
         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,
-        )
+        _show_config(console)
         return
-
     if args[0] == "reset":
-        if len(args) < 2 or args[1] not in ("local", "global"):
-            console.print("[bold red]Usage:[/bold red] /config reset local|global")
-            return
-        import os
-        from pathlib import Path
+        _reset_config(console, args)
+        return
+    if args[0] == "set":
+        _set_config(console, args)
+        return
 
-        scope = args[1]
-        if scope == "local":
-            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}"
-                )
-        elif scope == "global":
-            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}"
-                )
-            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]"
-        )
+
+def _print_usage(console):
+    console.print(
+        "[bold red]Usage:[/bold red] /config show | /config set local|global key=value | /config reset local|global"
+    )
+
+
+def _show_config(console):
+    from janito.cli._print_config import print_full_config
+
+    print_full_config(
+        local_config,
+        global_config,
+        unified_config,
+        CONFIG_DEFAULTS,
+        console=console,
+    )
+
+
+def _reset_config(console, args):
+    if len(args) < 2 or args[1] not in ("local", "global"):
+        console.print("[bold red]Usage:[/bold red] /config reset local|global")
         return
+    import os
+    from pathlib import Path
 
-    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"
-            )
-            return
-        scope = args[1]
-        try:
-            key, val = args[2].split("=", 1)
-        except ValueError:
-            console.print("[bold red]Invalid format, expected key=val[/bold red]")
-            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())}"
-            )
-            return
-        val = val.strip()
-        if scope == "local":
-            local_config.set(key, val)
-            local_config.save()
-            runtime_config.set(key, val)
-            console.print(f"[green]Local config updated:[/green] {key} = {val}")
+    scope = args[1]
+    if scope == "local":
+        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(
-                "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
+                f"[yellow]Local config file does not exist:[/yellow] {local_path}"
             )
-        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}")
+    elif scope == "global":
+        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}")
+        else:
             console.print(
-                "[bold yellow]Please use /restart for changes to take full effect.[/bold yellow]"
+                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]"
+    )
+
+
+def _set_config(console, args):
+    if len(args) < 3 or args[1] not in ("local", "global"):
+        console.print("[bold red]Usage:[/bold red] /config set local|global key=value")
         return
+    scope = args[1]
+    try:
+        key, val = args[2].split("=", 1)
+    except ValueError:
+        console.print("[bold red]Invalid format, expected key=val[/bold red]")
+        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())}"
+        )
+        return
+    val = val.strip()
+    if scope == "local":
+        local_config.set(key, val)
+        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]"
+        )

janito/shell/session/manager.py

@@ -89,27 +89,6 @@ def save_conversation(messages, prompts, usage_info=None, path=None):
         json.dump(data, f, indent=2, default=usage_serializer)
 
 
-def load_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")
-    try:
-        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")
-    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:
-        json.dump(history_list, f, indent=2)
-
-
 def last_conversation_exists(path=".janito/last_conversation.json"):
     if not os.path.exists(path):
         return False

janito/shell/ui/interactive.py

@@ -17,15 +17,99 @@ def print_welcome(console, version=None, continue_id=None):
     if runtime_config.get("vanilla_mode", False):
         console.print(
             f"[bold magenta]{tr('Welcome to Janito{version_str} in [white on magenta]VANILLA MODE[/white on magenta]! Tools, system prompt, and temperature are disabled unless overridden.', version_str=version_str)}[/bold magenta]\n"
-            f"[cyan]{tr('F12 = Quick Action (follows the recommended action)')}[/cyan]"
         )
     else:
         console.print(
             f"[bold green]{tr('Welcome to Janito{version_str}! Entering chat mode. Type /exit to exit.', version_str=version_str)}[/bold green]\n"
-            f"[cyan]{tr('F12 = Quick Action (follows the recommended action)')}[/cyan]"
         )
 
 
+def format_tokens(n, tag=None):
+    if n is None:
+        return "?"
+    if n < 1000:
+        val = str(n)
+    elif n < 1000000:
+        val = f"{n/1000:.1f}k"
+    else:
+        val = f"{n/1000000:.1f}M"
+    return f"<{tag}>{val}</{tag}>" if tag else val
+
+
+def assemble_first_line(model_name, role_ref, style_ref):
+    model_part = f" {tr('Model')}: <model>{model_name}</model>" if model_name else ""
+    role_part = ""
+    vanilla_mode = runtime_config.get("vanilla_mode", False)
+    if role_ref and not vanilla_mode:
+        role = role_ref()
+        if role:
+            role_part = f"{tr('Role')}: <role>{role}</role>"
+    style_part = ""
+    if style_ref:
+        style = style_ref()
+        if style:
+            style_part = f"{tr('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)
+    return " | ".join(first_line_parts)
+
+
+def assemble_second_line(
+    width,
+    last_usage_info_ref,
+    history_ref,
+    messages_ref,
+    session_id,
+    model_name,
+    role_ref,
+    style_ref,
+):
+    usage = last_usage_info_ref()
+    prompt_tokens = usage.get("prompt_tokens") if usage else None
+    completion_tokens = usage.get("completion_tokens") if usage else None
+    total_tokens = usage.get("total_tokens") if usage else None
+    msg_count = len(history_ref()) if history_ref else len(messages_ref())
+    left = f" {tr('Messages')}: <msg_count>{msg_count}</msg_count>"
+    tokens_part = ""
+    if (
+        prompt_tokens is not None
+        or completion_tokens is not None
+        or total_tokens is not None
+    ):
+        tokens_part = (
+            f" | {tr('Tokens')} - {tr('Prompt')}: {format_tokens(prompt_tokens, 'tokens_in')}, "
+            f"{tr('Completion')}: {format_tokens(completion_tokens, 'tokens_out')}, "
+            f"{tr('Total')}: {format_tokens(total_tokens, 'tokens_total')}"
+        )
+    session_part = (
+        f" | Session ID: <session_id>{session_id}</session_id>" if session_id else ""
+    )
+    second_line = f"{left}{tokens_part}{session_part}"
+    total_len = len(left) + len(tokens_part) + len(session_part)
+    first_line = assemble_first_line(model_name, role_ref, style_ref)
+    if first_line:
+        total_len += len(first_line) + 3
+    if total_len < width:
+        padding = " " * (width - total_len)
+        second_line = f"{left}{tokens_part}{session_part}{padding}"
+    return second_line
+
+
+def assemble_bindings_line():
+    return (
+        f"<b> F12</b>: {tr('Quick Action')} | "
+        f"<b>Ctrl-Y</b>: {tr('Yes')} | "
+        f"<b>Ctrl-N</b>: {tr('No')} | "
+        f"<b>/help</b>: {tr('Help')} | "
+        f"<b>/restart</b>: {tr('Reset Conversation')}"
+    )
+
+
 def get_toolbar_func(
     messages_ref,
     last_usage_info_ref,
@@ -39,82 +123,20 @@ def get_toolbar_func(
 ):
     from prompt_toolkit.application.current import get_app
 
-    def format_tokens(n, tag=None):
-        if n is None:
-            return "?"
-        if n < 1000:
-            val = str(n)
-        elif n < 1000000:
-            val = f"{n/1000:.1f}k"
-        else:
-            val = f"{n/1000000:.1f}M"
-        return f"<{tag}>{val}</{tag}>" if tag else val
-
     def get_toolbar():
         width = get_app().output.get_size().columns
-        model_part = (
-            f" {tr('Model')}: <model>{model_name}</model>" if model_name else ""
-        )
-        role_part = ""
-        vanilla_mode = runtime_config.get("vanilla_mode", False)
-        if role_ref and not vanilla_mode:
-            role = role_ref()
-            if role:
-                role_part = f"{tr('Role')}: <role>{role}</role>"
-
-        style_part = ""
-        if style_ref:
-            style = style_ref()
-            if style:
-                style_part = f"{tr('Style')}: <b>{style}</b>"
-        usage = last_usage_info_ref()
-        prompt_tokens = usage.get("prompt_tokens") if usage else None
-        completion_tokens = usage.get("completion_tokens") if usage else None
-        total_tokens = usage.get("total_tokens") if usage else None
-        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)
-        msg_count = len(history_ref()) if history_ref else len(messages_ref())
-        left = f" {tr('Messages')}: <msg_count>{msg_count}</msg_count>"
-        tokens_part = ""
-        if (
-            prompt_tokens is not None
-            or completion_tokens is not None
-            or total_tokens is not None
-        ):
-            tokens_part = (
-                f" | {tr('Tokens')} - {tr('Prompt')}: {format_tokens(prompt_tokens, 'tokens_in')}, "
-                f"{tr('Completion')}: {format_tokens(completion_tokens, 'tokens_out')}, "
-                f"{tr('Total')}: {format_tokens(total_tokens, 'tokens_total')}"
-            )
-        # Move /help and /restart tips to key bindings/info line
-        # Compose second/status line (no help_part)
-        session_part = (
-            f" | Session ID: <session_id>{session_id}</session_id>"
-            if session_id
-            else ""
-        )
-        second_line = f"{left}{tokens_part}{session_part}"
-        total_len = len(left) + len(tokens_part) + len(session_part)
-        if first_line:
-            total_len += len(first_line) + 3
-        if total_len < width:
-            padding = " " * (width - total_len)
-            second_line = f"{left}{tokens_part}{session_part}{padding}"
-        # Add key bindings info as an extra line, now including /help and /restart
-        bindings_line = (
-            f"<b> F12</b>: {tr('Quick Action')} | "
-            f"<b>Ctrl-Y</b>: {tr('Yes')} | "
-            f"<b>Ctrl-N</b>: {tr('No')} | "
-            f"<b>/help</b>: {tr('Help')} | "
-            f"<b>/restart</b>: {tr('Reset Conversation')}"
+        first_line = assemble_first_line(model_name, role_ref, style_ref)
+        second_line = assemble_second_line(
+            width,
+            last_usage_info_ref,
+            history_ref,
+            messages_ref,
+            session_id,
+            model_name,
+            role_ref,
+            style_ref,
         )
+        bindings_line = assemble_bindings_line()
         if first_line:
             toolbar_text = first_line + "\n" + second_line + "\n" + bindings_line
         else:

janito/termweb/static/editor.css

@@ -1,9 +1,9 @@
 /* Highlight active line in CodeMirror */
 .CodeMirror-activeline-background {
-    background: #353b45 !important;
+    background: #353b45;
 }
 body.light-theme .CodeMirror-activeline-background {
-    background: #e0eaff !important;
+    background: #e0eaff;
 }
 html, body {
     height: 100%;
@@ -39,36 +39,22 @@ body.light-theme {
     flex-direction: column;
     height: 100%;
     min-height: 0;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-.CodeMirror {
-    flex: 1 1 auto;
-    height: 100% !important;
-    min-height: 0;
-    font-size: 1.1em;
-    background: #282a36;
-    color: #f8f8f2;
-    border-radius: 0;
-    border: none;
-    transition: background 0.2s, color 0.2s;
-}
-body.light-theme .CodeMirror {
-    background: #fff;
-    color: #222;
+    padding: 0;
+    margin: 0;
 }
+/* Removed custom .CodeMirror background/color to use CodeMirror's theme defaults */
 .header {
     background: #222;
     color: #fff;
-    padding: 10px 24px;
-    font-size: 1.3em;
+    padding: 4px 12px;
+    font-size: 0.95em;
     font-weight: bold;
     position: relative;
     transition: background 0.2s, color 0.2s;
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    height: 56px;
+    height: 36px;
 }
 
 .header-title {
@@ -78,24 +64,39 @@ body.light-theme .CodeMirror {
     transform: translate(-50%, -50%);
     pointer-events: none;
     font-weight: bold;
-    font-size: 1.3em;
+    font-size: 1.05em;
+    display: flex;
+    align-items: center;
+    gap: 0.5em;
+}
+
+.filename-display {
+    font-weight: normal;
+    font-size: 0.98em;
+    color: #bbb;
+    margin-left: 0.5em;
+    pointer-events: auto;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 180px;
+}
+body.light-theme .filename-display {
+    color: #666;
 }
 
 .footer {
     width: 100%;
     background: #23272b;
     color: #fff;
-    padding: 10px 24px;
+    padding: 4px 12px;
     box-sizing: border-box;
     display: flex;
     align-items: center;
     justify-content: flex-start;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 100;
     border-top: 1px solid #333;
-    min-height: 48px;
+    min-height: 28px;
+    font-size: 0.95em;
 }
 
 .save-btn {
@@ -106,7 +107,6 @@ body.light-theme .CodeMirror {
     margin-left: auto;
 }
 
-
 .save-btn {
     background: #4caf50;
     color: #fff;
@@ -121,8 +121,8 @@ body.light-theme .CodeMirror {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 36px;
-    height: 36px;
+    height: 100%;
+    aspect-ratio: 1/1;
     font-size: 1.3em;
     line-height: 1;
     padding: 0;
@@ -143,4 +143,3 @@ body.light-theme .header {
     background: #eaeaea;
     color: #222;
 }
-

janito/termweb/static/editor.css.bak

@@ -1,27 +1,145 @@
+/* Highlight active line in CodeMirror */
+.CodeMirror-activeline-background {
+    background: #353b45;
+}
+body.light-theme .CodeMirror-activeline-background {
+    background: #e0eaff;
+}
+html, body {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+}
+body {
+    display: flex;
+    flex-direction: column;
+    min-height: 100vh;
+    background: #181a1b;
+    color: #eee;
+    transition: background 0.2s, color 0.2s;
+}
+body.light-theme {
+    background: #f5f5f5;
+    color: #222;
+}
+.main {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: stretch;
+    align-items: stretch;
+    min-height: 0;
+    padding: 0;
+    margin: 0;
+    height: 100%;
+}
+.editor-pane {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    min-height: 0;
+    padding: 0;
+    margin: 0;
+}
+/* Removed custom .CodeMirror background/color to use CodeMirror's theme defaults */
+.header {
+    background: #222;
+    color: #fff;
+    padding: 4px 12px;
+    font-size: 0.95em;
+    font-weight: bold;
+    position: relative;
+    transition: background 0.2s, color 0.2s;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    height: 36px;
+}
+
+.header-title {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    pointer-events: none;
+    font-weight: bold;
+    font-size: 1.05em;
+    display: flex;
+    align-items: center;
+    gap: 0.5em;
+}
+
+.filename-display {
+    font-weight: normal;
+    font-size: 0.98em;
+    color: #bbb;
+    margin-left: 0.5em;
+    pointer-events: auto;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 180px;
+}
+body.light-theme .filename-display {
+    color: #666;
+}
+
+.footer {
+    width: 100%;
+    background: #23272b;
+    color: #fff;
+    padding: 4px 12px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    border-top: 1px solid #333;
+    min-height: 28px;
+    font-size: 0.95em;
+}
 
 .save-btn {
-    background: linear-gradient(90deg, #00ff99 0%, #00cfff 100%);
-    color: #181a1b;
+    /* No margin needed, align left in footer */
+}
+
+.theme-switcher {
+    margin-left: auto;
+}
+
+.save-btn {
+    background: #4caf50;
+    color: #fff;
+    border: none;
+    border-radius: 4px;
+    padding: 6px 14px;
+    cursor: pointer;
+    font-size: 1em;
+}
+
+.theme-switcher {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 36px;
+    height: 36px;
+    font-size: 1.3em;
+    line-height: 1;
+    padding: 0;
+    background: #444;
+    color: #fff;
     border: none;
-    border-radius: 8px;
-    padding: 12px 38px;
+    border-radius: 4px;
     cursor: pointer;
-    font-size: 1.18em;
-    font-weight: 900;
-    box-shadow: 0 0 16px 4px rgba(0,255,153,0.35), 0 2px 16px 0 rgba(0,207,255,0.18);
-    outline: 2.5px solid #00cfff;
-    outline-offset: 2px;
-    transition: box-shadow 0.2s, outline 0.2s, background 0.2s, color 0.2s;
-    letter-spacing: 0.7px;
-    animation: save-btn-pop 0.7s cubic-bezier(.68,-0.55,.27,1.55) 1;
-    min-width: 110px;
-    min-height: 44px;
-    z-index: 2;
-    text-shadow: 0 2px 8px #fff8, 0 1px 0 #fff8;
-}
-.save-btn:hover, .save-btn:focus {
-    background: linear-gradient(90deg, #00cfff 0%, #00ff99 100%);
-    color: #111;
-    box-shadow: 0 0 24px 6px rgba(0,255,153,0.45), 0 4px 24px 0 rgba(0,207,255,0.28);
-    outline: 3px solid #00ff99;
+    transition: background 0.2s, color 0.2s;
+}
+
+body.light-theme .theme-switcher {
+    background: #ddd;
+    color: #222;
+}
+
+body.light-theme .header {
+    background: #eaeaea;
+    color: #222;
 }