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

janito/{cli_chat_shell/ui.py → shell/ui/interactive.py}

@@ -7,14 +7,13 @@ from janito.agent.runtime_config import runtime_config
 from janito.i18n import tr
 
 
-def print_summary(console, data, continue_session):
-    if not data:
-        return
-    console.print("[bold cyan]Last saved conversation:[/bold cyan]")
-
-
-def print_welcome(console, version=None, continued=False):
+def print_welcome(console, version=None, continue_id=None):
     version_str = f" (v{version})" if version else ""
+    # DEBUG: Show continue_id/session_id at runtime
+    if continue_id:
+        console.print(
+            f"[bold yellow]{tr('Resuming session')}[/bold yellow] [white on blue]{continue_id}[/white on blue]\n"
+        )
     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"
@@ -35,6 +34,8 @@ def get_toolbar_func(
     role_ref=None,
     style_ref=None,
     version=None,
+    session_id=None,
+    history_ref=None,
 ):
     from prompt_toolkit.application.current import get_app
 
@@ -79,7 +80,8 @@ def get_toolbar_func(
         if style_part:
             first_line_parts.append(style_part)
         first_line = " | ".join(first_line_parts)
-        left = f" {tr('Messages')}: <msg_count>{len(messages_ref())}</msg_count>"
+        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
@@ -91,22 +93,27 @@ def get_toolbar_func(
                 f"{tr('Completion')}: {format_tokens(completion_tokens, 'tokens_out')}, "
                 f"{tr('Total')}: {format_tokens(total_tokens, 'tokens_total')}"
             )
-        # Move /help and /start tips to key bindings/info line
+        # Move /help and /restart tips to key bindings/info line
         # Compose second/status line (no help_part)
-        second_line = f"{left}{tokens_part}"
-        total_len = len(left) + len(tokens_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}{padding}"
-        # Add key bindings info as an extra line, now including /help and /start
+            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>/start</b>: {tr('New Task')}"
+            f"<b>/restart</b>: {tr('Reset Conversation')}"
         )
         if first_line:
             toolbar_text = first_line + "\n" + second_line + "\n" + bindings_line
@@ -161,6 +168,7 @@ def get_prompt_session(get_toolbar_func, mem_history):
             "tokens_out": "ansigreen bold",
             "tokens_total": "ansiyellow bold",
             "msg_count": "bg:#333333 #ffff00 bold",
+            "session_id": "bg:#005f00 #ffffff bold",
             "b": "bold",
             "prompt": "bg:#005f5f #ffffff",  # (legacy, not used)
             # Style for prompt_toolkit input line:
@@ -172,7 +180,7 @@ def get_prompt_session(get_toolbar_func, mem_history):
             "inputline": "bg:#005fdd #ffffff",  # Blue background for the prompt label (icon/text)
         }
     )
-    from .shell_command_completer import ShellCommandCompleter
+    from janito.shell.prompt.completer import ShellCommandCompleter
 
     completer = ShellCommandCompleter()
     return PromptSession(

janito/termweb/app.py

@@ -1,10 +1,10 @@
 from quart import Quart, send_from_directory, request, jsonify, websocket
 import os
-from janito.agent.tools.dir_walk_utils import walk_dir_with_gitignore
+from janito.agent.tools_utils.dir_walk_utils import walk_dir_with_gitignore
 
 app = Quart(__name__)
 
-BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
+BASE_DIR = os.getcwd()
 
 
 @app.route("/")
@@ -50,7 +50,7 @@ async def api_explorer(path="."):
     # GET: comportamento actual
     if os.path.isdir(abs_path):
         entries = []
-        walker = walk_dir_with_gitignore(abs_path, recursive=False)
+        walker = walk_dir_with_gitignore(abs_path, max_depth=1)
         for root, dirs, files in walker:
             for entry in sorted(dirs):
                 entries.append({"name": entry, "is_dir": True})

janito/termweb/static/editor.css

@@ -0,0 +1,146 @@
+/* Highlight active line in CodeMirror */
+.CodeMirror-activeline-background {
+    background: #353b45 !important;
+}
+body.light-theme .CodeMirror-activeline-background {
+    background: #e0eaff !important;
+}
+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 !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;
+}
+.header {
+    background: #222;
+    color: #fff;
+    padding: 10px 24px;
+    font-size: 1.3em;
+    font-weight: bold;
+    position: relative;
+    transition: background 0.2s, color 0.2s;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    height: 56px;
+}
+
+.header-title {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    pointer-events: none;
+    font-weight: bold;
+    font-size: 1.3em;
+}
+
+.footer {
+    width: 100%;
+    background: #23272b;
+    color: #fff;
+    padding: 10px 24px;
+    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;
+}
+
+.save-btn {
+    /* 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: 4px;
+    cursor: pointer;
+    transition: background 0.2s, color 0.2s;
+}
+
+body.light-theme .theme-switcher {
+    background: #ddd;
+    color: #222;
+}
+
+body.light-theme .header {
+    background: #eaeaea;
+    color: #222;
+}
+

janito/termweb/static/editor.css.bak

@@ -0,0 +1,27 @@
+
+.save-btn {
+    background: linear-gradient(90deg, #00ff99 0%, #00cfff 100%);
+    color: #181a1b;
+    border: none;
+    border-radius: 8px;
+    padding: 12px 38px;
+    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;
+}

janito/termweb/static/editor.html

@@ -8,231 +8,33 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/codemirror.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/theme/dracula.min.css">
     <link rel="stylesheet" href="/static/termweb.css">
-    <style>
-        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;
-        }
-        .editor-pane {
-            flex: 1 1 auto;
-            display: flex;
-            flex-direction: column;
-            height: 100%;
-            min-height: 0;
-        }
-        .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;
-        }
-        .footer {
-            flex-shrink: 0;
-            background: #222;
-            color: #eee;
-            padding: 12px 0 8px 0;
-            text-align: center;
-            width: 100%;
-            position: fixed;
-            left: 0;
-            bottom: 0;
-            z-index: 100;
-            transition: background 0.2s, color 0.2s;
-        }
-        body.light-theme .footer {
-            background: #eaeaea;
-            color: #222;
-        }
-        .footer ul {
-            list-style: none;
-            padding: 0;
-            margin: 8px 0 0 0;
-            display: flex;
-            justify-content: center;
-            gap: 2em;
-        }
-        .footer li {
-            display: inline;
-        }
-        .header {
-            background: #222;
-            color: #fff;
-            padding: 10px 0;
-            text-align: center;
-            font-size: 1.3em;
-            font-weight: bold;
-            position: relative;
-            transition: background 0.2s, color 0.2s;
-        }
-        body.light-theme .header {
-            background: #eaeaea;
-            color: #222;
-        }
-        .theme-switcher {
-            position: absolute;
-            right: 20px;
-            top: 10px;
-            background: #444;
-            color: #fff;
-            border: none;
-            border-radius: 4px;
-            padding: 6px 14px;
-            cursor: pointer;
-            font-size: 1em;
-            transition: background 0.2s, color 0.2s;
-        }
-        body.light-theme .theme-switcher {
-            background: #ddd;
-            color: #222;
-        }
-    </style>
+    <link rel="stylesheet" href="/static/editor.css">
 </head>
 <body>
     <div class="header">
-        TermWeb Editor
-        <button class="save-btn" id="save-btn" style="margin-right:12px;background:#4caf50;color:#fff;border:none;border-radius:4px;padding:6px 14px;cursor:pointer;font-size:1em;">Gravar</button>
-        <button class="theme-switcher" id="theme-switcher">Alternate to light theme</button>
+        <div class="header-title">TermWeb Editor</div>
+        <button class="theme-switcher" id="theme-switcher" title="Alternator tema">
+            <span id="theme-icon" aria-label="Switch theme" style="pointer-events:none;">🌙</span>
+        </button>
     </div>
+    <div class="footer">
+        <button class="save-btn" id="save-btn">Save</button>
+    </div>
+    <div id="save-popup" style="display:none;position:fixed;top:32px;right:32px;z-index:9999;background:#323b4c;color:#fff;padding:14px 28px;border-radius:8px;box-shadow:0 2px 12px #0007;font-size:1.1em;">Saved!</div>
     <div class="main">
         <div class="editor-pane">
             <textarea id="code" name="code"></textarea>
         </div>
     </div>
-    <div class="footer">
-        <div class="subtitle">
-            Desenvolvido por <a href="https://janito.dev" target="_blank">janito.dev</a> — agente de programação com IA
-        </div>
-        <ul>
-            <li>🌐 <a href="https://janito.dev" target="_blank">janito.dev</a></li>
-            <li>📚 <a href="https://docs.janito.dev" target="_blank">Documentation</a></li>
-            <li>💻 <a href="https://github.com/joaompinto/janito" target="_blank">GitHub</a></li>
-        </ul>
-        <span style="font-size:0.9em;opacity:0.7;">_generated by janito.dev_</span>
-    </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/codemirror.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/mode/python/python.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/theme/dracula.min.js"></script>
-    <script>
-    // --- Load file content via AJAX if ?path=... is present ---
-    function getQueryParam(name) {
-        const url = new URL(window.location.href);
-        return url.searchParams.get(name);
-    }
-    const filePath = getQueryParam('path');
-    let initialContent = `# Bem-vindo ao TermWeb!\n# Este é um editor CodeMirror ao vivo.\n\nprint("Olá, janito.dev!")`;
-    if (filePath) {
-        fetch(`/api/explorer/${encodeURIComponent(filePath)}`)
-            .then(resp => resp.json())
-            .then(data => {
-                if (data.type === 'file') {
-                    initialContent = data.content;
-                    if (window.editorInstance) {
-                        window.editorInstance.setValue(initialContent);
-                    }
-                } else if (data.error) {
-                    initialContent = '# Error: ' + data.error;
-                    if (window.editorInstance) {
-                        window.editorInstance.setValue(initialContent);
-                    }
-                }
-            })
-            .catch(err => {
-                initialContent = '# Error ao carregar arquivo: ' + err;
-                if (window.editorInstance) {
-                    window.editorInstance.setValue(initialContent);
-                }
-            });
-    }
-    document.addEventListener('DOMContentLoaded', function() {
-        var editorInstance = CodeMirror.fromTextArea(document.getElementById('code'), {
-            lineNumbers: true,
-            mode: 'python',
-            theme: 'dracula',
-            indentUnit: 4,
-            tabSize: 4,
-        });
-        window.editorInstance = editorInstance;
-        editorInstance.setSize('100%', 'calc(100vh - 60px - 70px)'); // header/footer height
-        editorInstance.setValue(initialContent);
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/addon/selection/active-line.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/addon/search/search.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/addon/search/searchcursor.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/addon/dialog/dialog.min.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.13/addon/dialog/dialog.min.css">
 
-        // Theme switcher logic
-        var themeSwitcher = document.getElementById('theme-switcher');
-        var isDark = true;
-        themeSwitcher.addEventListener('click', function() {
-            isDark = !isDark;
-            if (isDark) {
-                document.body.classList.remove('light-theme');
-                editorInstance.setOption('theme', 'dracula');
-                themeSwitcher.textContent = 'Alternate to light theme';
-            } else {
-                document.body.classList.add('light-theme');
-                editorInstance.setOption('theme', 'default');
-                themeSwitcher.textContent = 'Alternate to dark theme';
-            }
-        });
-        // Set initial state
-        document.body.classList.remove('light-theme');
-        editorInstance.setOption('theme', 'dracula');
-        themeSwitcher.textContent = 'Alternate to light theme';
-        // Botão de Gravar
-        var saveBtn = document.getElementById('save-btn');
-        saveBtn.addEventListener('click', function() {
-            if (!filePath) {
-                alert('Nenhum arquivo aberto para gravar.');
-                return;
-            }
-            const content = editorInstance.getValue();
-            fetch(`/api/explorer/${encodeURIComponent(filePath)}`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ content }),
-            })
-            .then(resp => resp.json())
-            .then(data => {
-                if (data.success) {
-                    saveBtn.textContent = 'Gravado!';
-                    setTimeout(() => saveBtn.textContent = 'Gravar', 1200);
-                } else {
-                    alert('Error saving: ' + (data.error || 'desconhecido'));
-                }
-            })
-            .catch(err => {
-                alert('Error saving: ' + err);
-            });
-        });
-    });
-    </script>
+    <script src="/static/editor.js"></script>
 </body>
 </html>