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

janito/termweb/static/termweb.js.bak.bak

@@ -0,0 +1,157 @@
+// Directory/File browser logic for explorer with right-side preview and URL sync (using /path)
+let explorerView = localStorage.getItem('explorerView') || 'list';
+let currentExplorerPath = '.';
+
+function getParentPath(path) {
+    // Normalize slashes
+    path = (path || '').replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
+    if (!path || path === '.' || path === '') return '.';
+    const parts = path.split('/');
+    if (parts.length <= 1) return '.';
+    parts.pop();
+    const parent = parts.join('/');
+    return parent === '' ? '.' : parent;
+}
+
+
+function setExplorerView(view) {
+    explorerView = view;
+    localStorage.setItem('explorerView', view);
+    document.getElementById('view-list').classList.toggle('active', view === 'list');
+    document.getElementById('view-icons').classList.toggle('active', view === 'icons');
+}
+
+function normalizeExplorerPath(path) {
+    if (!path || path === '/' || path === '' || path === '.') return '.';
+    return path.replace(/^\/+|\/+$/g, '');
+}
+
+function updateExplorerUrl(path, push=true) {
+    let url = '/';
+    if (path && path !== '.' && path !== '/') {
+        url = '/' + path.replace(/^\/+|\/+$/g, '');
+    }
+    if (push) {
+        console.log('[DEBUG] updateExplorerUrl: pushing url', url, 'for path', path);
+        window.history.pushState({ explorerPath: path }, '', url);
+    } else {
+        console.log('[DEBUG] updateExplorerUrl: not pushing, url would be', url, 'for path', path);
+    }
+}
+
+function renderExplorer(path, pushUrl=true) {
+    currentExplorerPath = normalizeExplorerPath(path);
+    console.log('[DEBUG] renderExplorer: path', path, 'normalized to', currentExplorerPath, 'pushUrl:', pushUrl);
+    fetch(`/api/explorer/${encodeURIComponent(currentExplorerPath)}`)
+        .then(resp => resp.json())
+        .then(data => {
+            const main = document.getElementById('explorer-main');
+            if (!main) return;
+            if (data.error) {
+                main.innerHTML = `<div class='error'>${data.error}</div>`;
+                return;
+            }
+            if (data.type === 'dir') {
+                let html = `<h3>Directory: ${data.path}</h3>`;
+                if (explorerView === 'list') {
+                    html += `<ul class='explorer-list'>`;
+                    if (data.path !== '.') {
+                        const parent = getParentPath(data.path);
+                        html += `<li><a href='#' data-path='${parent}' class='explorer-link'>(.. parent)</a></li>`;
+                    }
+                    for (const entry of data.entries) {
+                        const entryPath = data.path === '.' ? entry.name : data.path + '/' + entry.name;
+                        if (entry.is_dir) {
+                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link'>📁 ${entry.name}</a></li>`;
+                        } else {
+                            html += `<li><a href='#' data-path='${entryPath}' class='explorer-link file-link'>📄 ${entry.name}</a></li>`;
+                        }
+                    }
+                    html += '</ul>';
+                } else {
+                    html += `<div class='explorer-icons'>`;
+                    if (data.path !== '.') {
+                        const parent = getParentPath(data.path);
+                        html += `<div class='explorer-icon'><a href='#' data-path='${parent}' class='explorer-link' title='Parent'>(..)</a></div>`;
+                    }
+                    for (const entry of data.entries) {
+                        const entryPath = data.path === '.' ? entry.name : data.path + '/' + entry.name;
+                        if (entry.is_dir) {
+                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link' title='${entry.name}'>📁<br>${entry.name}</a></div>`;
+                        } else {
+                            html += `<div class='explorer-icon'><a href='#' data-path='${entryPath}' class='explorer-link file-link' title='${entry.name}'>📄<br>${entry.name}</a></div>`;
+                        }
+                    }
+                    html += '</div>';
+                }
+                main.innerHTML = html;
+                // Clear preview panel when changing directories
+                const preview = document.getElementById('explorer-preview');
+                if (preview) preview.innerHTML = '';
+                if (pushUrl) updateExplorerUrl(currentExplorerPath, true);
+            }
+            // Attach click handlers
+            document.querySelectorAll('.explorer-link').forEach(link => {
+                link.onclick = function(e) {
+                    e.preventDefault();
+                    const p = this.getAttribute('data-path');
+                    // If file, show preview; if dir, update explorer
+                    if (this.classList.contains('file-link')) {
+                        const preview = document.getElementById('explorer-preview');
+                        if (preview) {
+                            preview.innerHTML = `<div class='spinner' style='display:inline-block;vertical-align:middle;'></div> <span style='vertical-align:middle;'>Loading file...</span>`;
+                        }
+                        fetch(`/api/explorer/${encodeURIComponent(p)}`)
+                            .then(resp => resp.json())
+                            .then(fileData => {
+                                if (preview && fileData.type === 'file') {
+                                    preview.innerHTML = `<h3>File: ${fileData.path}</h3><pre class='explorer-file'>${escapeHtml(fileData.content)}</pre>`;
+                                }
+                            });
+                    } else {
+                        console.log('[DEBUG] explorer-link click: navigating to dir', p);
+                        renderExplorer(p, true);
+                    }
+                };
+            });
+        });
+}
+
+function escapeHtml(text) {
+    const map = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' };
+    return text.replace(/[&<>"']'/g, m => map[m]);
+}
+
+function getExplorerPathFromLocation() {
+    let path = window.location.pathname;
+    // Remove leading slash
+    if (path.startsWith('/')) path = path.slice(1);
+    // If empty, root, or dot, treat as '.'
+    if (!path || path === '' || path === '.' || path === '/') return '.';
+    // Remove trailing slashes
+    path = path.replace(/\/+$/g, '');
+    console.log('[DEBUG] getExplorerPathFromLocation: extracted', path, 'from', window.location.pathname);
+    return path;
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+    const initialPath = getExplorerPathFromLocation();
+    console.log('[DEBUG] DOMContentLoaded: initialPath', initialPath);
+    currentExplorerPath = initialPath; // Ensure currentExplorerPath matches URL
+    setExplorerView(localStorage.getItem('explorerView') || 'list');
+    renderExplorer(initialPath, false);
+    document.getElementById('view-list').onclick = function() {
+        setExplorerView('list');
+        renderExplorer(currentExplorerPath, false);
+    };
+    document.getElementById('view-icons').onclick = function() {
+        setExplorerView('icons');
+        renderExplorer(currentExplorerPath, false);
+    };
+});
+
+window.addEventListener('popstate', function(event) {
+    const path = (event.state && event.state.explorerPath) || getExplorerPathFromLocation();
+    console.log('[DEBUG] popstate: path', path, 'event.state:', event.state);
+    renderExplorer(path, false);
+});

janito/termweb/static/termweb_quickopen.js

@@ -0,0 +1,135 @@
+// Quick Open (Ctrl+P) modal logic for TermWeb
+(function() {
+    let allFiles = [];
+    let modal = document.getElementById('quickopen-modal');
+    let input = document.getElementById('quickopen-input');
+    let results = document.getElementById('quickopen-results');
+    let selectedIdx = -1;
+    let loaded = false;
+
+    // Recursively fetch all file paths from /api/explorer/
+    async function fetchAllFiles(path = '.') {
+        let files = [];
+        try {
+            let resp = await fetch(`/api/explorer/${encodeURIComponent(path)}`);
+            let data = await resp.json();
+            if (data.type === 'dir' && data.entries) {
+                for (const entry of data.entries) {
+                    const entryPath = path === '.' ? entry.name : path + '/' + entry.name;
+                    if (entry.is_dir) {
+                        files = files.concat(await fetchAllFiles(entryPath));
+                    } else {
+                        files.push(entryPath);
+                    }
+                }
+            }
+        } catch (e) { console.error('QuickOpen fetch error', e); }
+        return files;
+    }
+
+    async function ensureLoaded() {
+        if (!loaded) {
+            allFiles = await fetchAllFiles('.');
+            loaded = true;
+        }
+    }
+
+    function showModal() {
+        modal.style.display = 'flex';
+        input.value = '';
+        results.innerHTML = '';
+        selectedIdx = -1;
+        setTimeout(() => input.focus(), 50);
+    }
+    function hideModal() {
+        modal.style.display = 'none';
+    }
+
+    function renderResults(filtered) {
+        results.innerHTML = '';
+        filtered.slice(0, 15).forEach((file, idx) => {
+            let li = document.createElement('li');
+            li.textContent = file;
+            li.tabIndex = -1;
+            li.className = 'quickopen-result' + (idx === selectedIdx ? ' selected' : '');
+            li.onclick = () => openFile(file);
+            results.appendChild(li);
+        });
+    }
+
+    // Improved openFile: poll for file link and click when ready
+    function openFile(path) {
+        hideModal();
+        window.renderExplorer && window.renderExplorer(getParentPath(path), false);
+        const maxAttempts = 20; // 20 x 100ms = 2s max
+        let attempts = 0;
+        function tryClickFile() {
+            let fileLinks = document.querySelectorAll(`a.file-link[data-path='${path}']`);
+            if (fileLinks.length) {
+                fileLinks[0].click();
+                // Optionally, add a highlight class
+                fileLinks[0].classList.add('quickopen-selected');
+            } else if (attempts < maxAttempts) {
+                attempts++;
+                setTimeout(tryClickFile, 100);
+            }
+        }
+        tryClickFile();
+    }
+
+    input.addEventListener('input', async function() {
+        await ensureLoaded();
+        let q = input.value.trim().toLowerCase();
+        let filtered = allFiles.filter(f => f.toLowerCase().includes(q));
+        selectedIdx = -1;
+        renderResults(filtered);
+    });
+    input.addEventListener('keydown', function(e) {
+        let items = results.querySelectorAll('li');
+        if (e.key === 'ArrowDown') {
+            selectedIdx = Math.min(selectedIdx + 1, items.length - 1);
+            renderResults(Array.from(items).map(li => li.textContent));
+            e.preventDefault();
+        } else if (e.key === 'ArrowUp') {
+            selectedIdx = Math.max(selectedIdx - 1, 0);
+            renderResults(Array.from(items).map(li => li.textContent));
+            e.preventDefault();
+        } else if (e.key === 'Enter') {
+            if (selectedIdx >= 0 && items[selectedIdx]) {
+                openFile(items[selectedIdx].textContent);
+            } else if (items.length === 1) {
+                openFile(items[0].textContent);
+            }
+        } else if (e.key === 'Escape') {
+            hideModal();
+        }
+    });
+
+    document.addEventListener('keydown', function(e) {
+        if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'p' && !e.shiftKey && !e.altKey) {
+            showModal();
+            e.preventDefault();
+        } else if (e.key === 'Escape' && modal.style.display === 'flex') {
+            hideModal();
+        }
+    });
+    modal.addEventListener('mousedown', function(e) {
+        if (e.target === modal) hideModal();
+    });
+
+    // Helper: get parent path
+    function getParentPath(path) {
+        path = (path || '').replace(/\\/g, '/').replace(/^\/+/g, '').replace(/\/+$/g, '');
+        if (!path || path === '.' || path === '') return '.';
+        const parts = path.split('/');
+        if (parts.length <= 1) return '.';
+        parts.pop();
+        const parent = parts.join('/');
+        return parent === '' ? '.' : parent;
+    }
+
+    // Style for selected result and quickopen-selected file link
+    let style = document.createElement('style');
+    style.textContent = `.quickopen-result.selected { background:#333; color:#8be9fd; } .quickopen-result { padding:0.3em 0.7em; cursor:pointer; border-radius:0.3em; } .quickopen-result:hover { background:#222; } a.file-link.quickopen-selected { background:#444 !important; color:#8be9fd !important; border-radius:0.3em; }`;
+    document.head.appendChild(style);
+})();

janito/termweb/static/termweb_quickopen.js.bak

@@ -0,0 +1,125 @@
+// Quick Open (Ctrl+P) modal logic for TermWeb
+(function() {
+    let allFiles = [];
+    let modal = document.getElementById('quickopen-modal');
+    let input = document.getElementById('quickopen-input');
+    let results = document.getElementById('quickopen-results');
+    let selectedIdx = -1;
+    let loaded = false;
+
+    // Recursively fetch all file paths from /api/explorer/
+    async function fetchAllFiles(path = '.') {
+        let files = [];
+        try {
+            let resp = await fetch(`/api/explorer/${encodeURIComponent(path)}`);
+            let data = await resp.json();
+            if (data.type === 'dir' && data.entries) {
+                for (const entry of data.entries) {
+                    const entryPath = path === '.' ? entry.name : path + '/' + entry.name;
+                    if (entry.is_dir) {
+                        files = files.concat(await fetchAllFiles(entryPath));
+                    } else {
+                        files.push(entryPath);
+                    }
+                }
+            }
+        } catch (e) { console.error('QuickOpen fetch error', e); }
+        return files;
+    }
+
+    async function ensureLoaded() {
+        if (!loaded) {
+            allFiles = await fetchAllFiles('.');
+            loaded = true;
+        }
+    }
+
+    function showModal() {
+        modal.style.display = 'flex';
+        input.value = '';
+        results.innerHTML = '';
+        selectedIdx = -1;
+        setTimeout(() => input.focus(), 50);
+    }
+    function hideModal() {
+        modal.style.display = 'none';
+    }
+
+    function renderResults(filtered) {
+        results.innerHTML = '';
+        filtered.slice(0, 15).forEach((file, idx) => {
+            let li = document.createElement('li');
+            li.textContent = file;
+            li.tabIndex = -1;
+            li.className = 'quickopen-result' + (idx === selectedIdx ? ' selected' : '');
+            li.onclick = () => openFile(file);
+            results.appendChild(li);
+        });
+    }
+
+    function openFile(path) {
+        hideModal();
+        // Simulate clicking the file in explorer
+        window.renderExplorer && window.renderExplorer(getParentPath(path), false);
+        setTimeout(() => {
+            let fileLinks = document.querySelectorAll(`a.file-link[data-path='${path}']`);
+            if (fileLinks.length) fileLinks[0].click();
+        }, 250);
+    }
+
+    input.addEventListener('input', async function() {
+        await ensureLoaded();
+        let q = input.value.trim().toLowerCase();
+        let filtered = allFiles.filter(f => f.toLowerCase().includes(q));
+        selectedIdx = -1;
+        renderResults(filtered);
+    });
+    input.addEventListener('keydown', function(e) {
+        let items = results.querySelectorAll('li');
+        if (e.key === 'ArrowDown') {
+            selectedIdx = Math.min(selectedIdx + 1, items.length - 1);
+            renderResults(Array.from(items).map(li => li.textContent));
+            e.preventDefault();
+        } else if (e.key === 'ArrowUp') {
+            selectedIdx = Math.max(selectedIdx - 1, 0);
+            renderResults(Array.from(items).map(li => li.textContent));
+            e.preventDefault();
+        } else if (e.key === 'Enter') {
+            if (selectedIdx >= 0 && items[selectedIdx]) {
+                openFile(items[selectedIdx].textContent);
+            } else if (items.length === 1) {
+                openFile(items[0].textContent);
+            }
+        } else if (e.key === 'Escape') {
+            hideModal();
+        }
+    });
+
+    document.addEventListener('keydown', function(e) {
+        if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'p' && !e.shiftKey && !e.altKey) {
+            showModal();
+            e.preventDefault();
+        } else if (e.key === 'Escape' && modal.style.display === 'flex') {
+            hideModal();
+        }
+    });
+    modal.addEventListener('mousedown', function(e) {
+        if (e.target === modal) hideModal();
+    });
+
+    // Helper: get parent path
+    function getParentPath(path) {
+        path = (path || '').replace(/\\/g, '/').replace(/^\/+|\/+$/g, '');
+        if (!path || path === '.' || path === '') return '.';
+        const parts = path.split('/');
+        if (parts.length <= 1) return '.';
+        parts.pop();
+        const parent = parts.join('/');
+        return parent === '' ? '.' : parent;
+    }
+
+    // Style for selected result
+    let style = document.createElement('style');
+    style.textContent = `.quickopen-result.selected { background:#333; color:#8be9fd; } .quickopen-result { padding:0.3em 0.7em; cursor:pointer; border-radius:0.3em; } .quickopen-result:hover { background:#222; }`;
+    document.head.appendChild(style);
+})();

janito/web/app.py

@@ -9,14 +9,13 @@ from flask import (
 from queue import Queue
 import json
 from janito.agent.queued_message_handler import QueuedMessageHandler
-from janito.agent.openai_client import Agent
 from janito.agent.profile_manager import AgentProfileManager
 import os
 import threading
 import traceback
 import sys
 
-from janito.agent.runtime_config import unified_config
+from janito.agent.runtime_config import unified_config, runtime_config
 
 # Render system prompt from config
 role = unified_config.get("role", "software engineer")
@@ -28,14 +27,16 @@ else:
         api_key=unified_config.get("api_key"),
         model=unified_config.get("model"),
         role=role,
-        interaction_style=unified_config.get("interaction_style", "default"),
+        profile_name="base",
         interaction_mode=unified_config.get("interaction_mode", "prompt"),
-        verbose_tools=unified_config.get("verbose_tools", False),
+        verbose_tools=runtime_config.get("verbose_tools", False),
         base_url=unified_config.get("base_url", None),
-        azure_openai_api_version=unified_config.get("azure_openai_api_version", None),
+        azure_openai_api_version=unified_config.get(
+            "azure_openai_api_version", "2023-05-15"
+        ),
         use_azure_openai=unified_config.get("use_azure_openai", False),
     )
-system_prompt_template = profile_manager.render_prompt()
+system_prompt_template = profile_manager.system_prompt_template
 
 app = Flask(
     __name__,
@@ -60,11 +61,7 @@ stream_queue = Queue()
 message_handler = QueuedMessageHandler(stream_queue)
 
 # Instantiate the Agent with config-driven parameters (no tool_handler)
-agent = Agent(
-    api_key=unified_config.get("api_key"),
-    model=unified_config.get("model"),
-    base_url=unified_config.get("base_url"),
-)
+agent = profile_manager.agent
 
 
 @app.route("/get_config")
@@ -147,7 +144,7 @@ def index():
 def load_conversation():
     global conversation
     try:
-        with open(conversation_file, "r") as f:
+        with open(conversation_file, "r", encoding="utf-8") as f:
             conversation = json.load(f)
     except (FileNotFoundError, json.JSONDecodeError):
         conversation = []
@@ -187,7 +184,7 @@ def execute_stream():
                 )
             try:
                 os.makedirs(os.path.dirname(conversation_file), exist_ok=True)
-                with open(conversation_file, "w") as f:
+                with open(conversation_file, "w", encoding="utf-8") as f:
                     json.dump(conversation, f, indent=2)
             except Exception as e:
                 print(f"Error saving conversation: {e}")