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

janito/agent/tools/search_files.py

@@ -15,7 +15,6 @@ class SearchFilesTool(ToolBase):
         directories (list[str]): List of directories to search in.
         pattern (str): Plain text substring to search for in files. (Not a regular expression or glob pattern.)
         recursive (bool): Whether to search recursively in subdirectories. Defaults to True.
-        max_depth (int, optional): Maximum directory depth to search (0 = only top-level). If None, unlimited. Defaults to None.
     Returns:
         str: Matching lines from files as a newline-separated string, each formatted as 'filepath:lineno: line'. Example:
             - "/path/to/file.py:10: def my_function():"
@@ -27,7 +26,6 @@ class SearchFilesTool(ToolBase):
         directories: list[str],
         pattern: str,
         recursive: bool = True,
-        max_depth: int = None,
     ) -> str:
         if not pattern:
             self.report_warning(
@@ -49,12 +47,8 @@ class SearchFilesTool(ToolBase):
                 )
                 walker = [(directory, dirs, files)]
             for root, dirs, files in walker:
-                # Calculate depth
                 rel_path = os.path.relpath(root, directory)
                 depth = 0 if rel_path == "." else rel_path.count(os.sep) + 1
-                if max_depth is not None and depth > max_depth:
-                    dirs[:] = []
-                    continue
                 if not recursive and depth > 0:
                     break
                 dirs, files = filter_ignored(root, dirs, files)

janito/cli/_print_config.py

@@ -82,7 +82,7 @@ def print_full_config(
                 Path(__file__).parent
                 / "agent"
                 / "templates"
-                / "system_prompt_template.j2"
+                / "system_prompt_template_default.j2"
             )
             for key, value in default_items.items():
                 if key == "system_prompt_template" and value is None:

janito/cli/config_commands.py

@@ -175,7 +175,7 @@ def handle_config_commands(args):
                         Path(__file__).parent
                         / "agent"
                         / "templates"
-                        / "system_prompt_template.j2"
+                        / "system_prompt_template_default.j2"
                     )
                     print(
                         f"{key} = (default template path: {home_shorten(str(template_path))})"

janito/cli/main.py

@@ -3,7 +3,7 @@
 from janito.cli.arg_parser import create_parser
 from janito.cli.config_commands import handle_config_commands
 from janito.cli.logging_setup import setup_verbose_logging
-from janito.cli.runner import run_cli
+from janito.cli.runner.cli_main import run_cli
 
 # Ensure all tools are registered at startup
 import janito.agent.tools  # noqa: F401

janito/cli/runner/__init__.py

@@ -1,2 +0,0 @@
-from .cli_main import run_cli
-from .formatting import format_tokens

janito/cli/runner/cli_main.py

@@ -1,11 +1,9 @@
 import sys
-import os
 from rich.console import Console
 from janito.agent.profile_manager import AgentProfileManager
 from janito.agent.runtime_config import unified_config, runtime_config
 from janito.agent.config import get_api_key
 from janito import __version__
-from .formatting import format_tokens
 from .scan import scan_project
 from .config import get_system_prompt_template
 from janito.agent.conversation_exceptions import (
@@ -14,6 +12,7 @@ from janito.agent.conversation_exceptions import (
     ProviderError,
 )
 
+
 def run_cli(args):
     if args.version:
         print(f"janito version {__version__}")
@@ -24,14 +23,6 @@ def run_cli(args):
         scan_project()
         sys.exit(0)
 
-    # Check for .janito/tech.txt and print a tip if missing
-    tech_txt_path = os.path.join(".janito", "tech.txt")
-    if not os.path.exists(tech_txt_path):
-        print("⚠️  No tech.txt found in .janito.")
-        print(
-            "💡 Tip: Run with --scan first to auto-detect project tech/skills and improve results."
-        )
-
     role = args.role or unified_config.get("role", "software engineer")
 
     # Ensure runtime_config is updated so chat shell sees the role
@@ -127,8 +118,8 @@ def run_cli(args):
     messages.append({"role": "user", "content": prompt})
     try:
         try:
-            max_rounds = runtime_config.get("max_rounds", 50)
-            profile_manager.agent.handle_conversation(
+            max_rounds = 50
+            profile_manager.agent.chat(
                 messages,
                 message_handler=message_handler,
                 spinner=True,
@@ -136,7 +127,6 @@ def run_cli(args):
                 verbose_response=getattr(args, "verbose_response", False),
                 verbose_events=getattr(args, "verbose_events", False),
                 stream=getattr(args, "stream", False),
-                verbose_stream=getattr(args, "verbose_stream", False),
             )
         except MaxRoundsExceededError:
             console.print("[red]Max conversation rounds exceeded.[/red]")

janito/cli/runner/config.py

@@ -1,8 +1,8 @@
-import os
 from janito.agent.profile_manager import AgentProfileManager
 from janito.agent.runtime_config import unified_config, runtime_config
 from janito.agent.config import get_api_key
 
+
 def get_system_prompt_template(args, role):
     system_prompt_template = None
     if getattr(args, "system_prompt_template_file", None):
@@ -26,7 +26,9 @@ def get_system_prompt_template(args, role):
                 interaction_mode=unified_config.get("interaction_mode", "prompt"),
                 verbose_tools=unified_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()

janito/cli/runner/scan.py

@@ -1,30 +1,43 @@
 import os
-from janito.agent.openai_client import Agent
+from janito.agent.profile_manager import AgentProfileManager
 from janito.agent.runtime_config import unified_config
 from janito.agent.config import get_api_key
 
+
 def scan_project():
-    prompt_path = os.path.abspath(os.path.join(
-        os.path.dirname(__file__),
-        "..", "..", "agent", "templates", "detect_tech_prompt.j2"
-    ))
+    prompt_path = os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            "..",
+            "..",
+            "agent",
+            "templates",
+            "detect_tech_prompt.j2",
+        )
+    )
     with open(prompt_path, "r", encoding="utf-8") as f:
         detect_prompt = f.read()
     api_key = get_api_key()
     model = unified_config.get("model")
     base_url = unified_config.get("base_url", "https://openrouter.ai/api/v1")
-    azure_openai_api_version = unified_config.get("azure_openai_api_version", "2023-05-15")
+    azure_openai_api_version = unified_config.get(
+        "azure_openai_api_version", "2023-05-15"
+    )
     use_azure_openai = unified_config.get("use_azure_openai", False)
-    agent = Agent(
+    profile_manager = AgentProfileManager(
         api_key=api_key,
         model=model,
-        system_prompt_template=detect_prompt,
+        role=unified_config.get("role", "software engineer"),
+        interaction_style=unified_config.get("interaction_style", "default"),
+        interaction_mode=unified_config.get("interaction_mode", "prompt"),
         verbose_tools=True,
         base_url=base_url,
         azure_openai_api_version=azure_openai_api_version,
         use_azure_openai=use_azure_openai,
     )
+    agent = profile_manager.agent
     from janito.agent.rich_message_handler import RichMessageHandler
+
     message_handler = RichMessageHandler()
     messages = [{"role": "system", "content": detect_prompt}]
     print("🔍 Scanning project for relevant tech/skills...")
@@ -32,7 +45,7 @@ def scan_project():
         messages,
         message_handler=message_handler,
         spinner=True,
-        max_rounds=10,
+        max_rounds=50,
         verbose_response=False,
         verbose_events=False,
         stream=False,

janito/cli_chat_shell/chat_loop.py

@@ -1,5 +1,5 @@
 from janito.agent.rich_message_handler import RichMessageHandler
-from .chat_state import load_chat_state, save_chat_state
+from .chat_state import load_chat_state
 from .chat_ui import setup_prompt_session, print_welcome_message
 from .commands import handle_command
 from janito.agent.conversation_exceptions import EmptyResponseError, ProviderError
@@ -14,19 +14,23 @@ def start_chat_shell(profile_manager, continue_session=False, max_rounds=50):
     state = load_chat_state(continue_session)
     messages = state["messages"]
     mem_history = state["mem_history"]
-    last_usage_info = state["last_usage_info"]
+    last_usage_info_ref = {"value": state["last_usage_info"]}
     last_elapsed = state["last_elapsed"]
 
-    # Add system prompt if needed
-    if profile_manager.system_prompt_template and not any(
-        m.get("role") == "system" for m in messages
+    # Add system prompt if needed (skip in vanilla mode)
+    from janito.agent.runtime_config import runtime_config
+
+    if (
+        profile_manager.system_prompt_template
+        and not runtime_config.get("vanilla_mode", False)
+        and not any(m.get("role") == "system" for m in messages)
     ):
         messages.insert(0, {"role": "system", "content": agent.system_prompt_template})
 
     print_welcome_message(console, continued=continue_session)
 
     session = setup_prompt_session(
-        messages, last_usage_info, last_elapsed, mem_history, profile_manager, agent
+        messages, last_usage_info_ref, last_elapsed, mem_history, profile_manager, agent
     )
 
     while True:
@@ -96,7 +100,7 @@ def start_chat_shell(profile_manager, continue_session=False, max_rounds=50):
         start_time = time.time()
 
         try:
-            response = profile_manager.agent.handle_conversation(
+            response = profile_manager.agent.chat(
                 messages,
                 max_rounds=max_rounds,
                 message_handler=message_handler,
@@ -118,7 +122,7 @@ def start_chat_shell(profile_manager, continue_session=False, max_rounds=50):
         last_elapsed = time.time() - start_time
 
         usage = response.get("usage")
-        last_usage_info = usage
+        last_usage_info_ref["value"] = usage
 
         # Save conversation and input history
-        save_chat_state(messages, mem_history, last_usage_info)
+        # save_chat_state(messages, mem_history, last_usage_info)

janito/cli_chat_shell/chat_ui.py

@@ -5,7 +5,7 @@ from janito.agent.runtime_config import runtime_config
 
 
 def setup_prompt_session(
-    messages, last_usage_info, last_elapsed, mem_history, profile_manager, agent
+    messages, last_usage_info_ref, last_elapsed, mem_history, profile_manager, agent
 ):
     model_name = getattr(agent, "model", None)
 
@@ -13,7 +13,7 @@ def setup_prompt_session(
         return messages
 
     def get_usage():
-        return last_usage_info
+        return last_usage_info_ref["value"]
 
     def get_elapsed():
         return last_elapsed

janito/cli_chat_shell/commands/__init__.py

@@ -2,6 +2,7 @@ from .session import handle_continue, handle_history
 from .system import handle_system, handle_role, handle_style
 from .session_control import handle_exit, handle_restart
 from .utility import handle_help, handle_clear, handle_multi
+from .sum import handle_sum
 from .config import handle_reload
 from .history_reset import handle_reset
 from ..config_shell import handle_config_shell
@@ -23,6 +24,7 @@ if not runtime_config.get("vanilla_mode", False):
 
 COMMAND_HANDLERS.update(
     {
+        "/sum": handle_sum,
         "/clear": handle_clear,
         "/reset": handle_reset,
         "/config": handle_config_shell,

janito/cli_chat_shell/commands/sum.py

@@ -0,0 +1,49 @@
+def handle_sum(console, state, **kwargs):
+    """
+    Summarize the current chat history and replace it with a summary message.
+    """
+    agent = kwargs.get("agent")
+    if agent is None:
+        console.print("[bold red]Agent not provided to /sum command.[/bold red]")
+        return
+
+    messages = state.get("messages", [])
+    if not messages or len(messages) < 2:
+        console.print(
+            "[bold yellow]Not enough conversation to summarize.[/bold yellow]"
+        )
+        return
+
+    # Find the system message if present
+    system_msg = next((m for m in messages if m.get("role") == "system"), None)
+
+    # Prepare summary prompt
+    summary_prompt = {
+        "role": "user",
+        "content": "Summarize the following conversation in a concise paragraph for context. Only output the summary, do not include any tool calls or formatting.",
+    }
+    # Exclude system messages for the summary context
+    convo_for_summary = [m for m in messages if m.get("role") != "system"]
+    summary_messages = [summary_prompt] + convo_for_summary
+
+    try:
+        summary_response = agent.chat(summary_messages, spinner=True, max_tokens=256)
+        summary_text = (
+            summary_response["content"]
+            if isinstance(summary_response, dict)
+            else str(summary_response)
+        )
+    except Exception as e:
+        console.print(f"[bold red]Error during summarization: {e}[/bold red]")
+        return
+
+    # Rebuild conversation history
+    new_history = []
+    if system_msg:
+        new_history.append(system_msg)
+    new_history.append({"role": "assistant", "content": summary_text})
+    state["messages"] = new_history
+
+    console.print(
+        "[bold green]Conversation summarized and history replaced with summary.[/bold green]"
+    )

janito/cli_chat_shell/load_prompt.py

@@ -1,18 +1,57 @@
 import os
+import importlib.resources
 
 
 def load_prompt(filename=None):
     """
     Load the system prompt from a file. If filename is None, use the default prompt file.
     Returns the prompt string.
+    Tries source path first, then falls back to importlib.resources for installed packages.
     """
+    default_rel_path = os.path.normpath(
+        os.path.join(
+            os.path.dirname(__file__),
+            "../agent/templates/profiles/system_prompt_template_default.j2",
+        )
+    )
     if filename is None:
-        # Default prompt file path (can be customized)
-        filename = os.path.join(
-            os.path.dirname(__file__), "../agent/templates/system_prompt_template.j2"
+        filename = default_rel_path
+
+    # Try loading from source path first
+    abs_path = os.path.abspath(filename)
+    if os.path.exists(abs_path):
+        with open(abs_path, "r", encoding="utf-8") as f:
+            return f.read()
+
+    # If not found, try importlib.resources (for installed package)
+    try:
+        # Remove leading directories up to 'janito/agent/templates'
+        # and get the relative path inside the package
+        resource_path = filename
+        for marker in ["janito/agent/templates/", "agent/templates/"]:
+            idx = filename.replace("\\", "/").find(marker)
+            if idx != -1:
+                resource_path = filename[idx + len("janito/agent/templates/") :]
+                break
+
+        # Try loading from janito.agent.templates.profiles
+        if resource_path.startswith("profiles/"):
+            package = "janito.agent.templates.profiles"
+            resource = resource_path[len("profiles/") :]
+        elif resource_path.startswith("features/"):
+            package = "janito.agent.templates.features"
+            resource = resource_path[len("features/") :]
+        else:
+            package = "janito.agent.templates"
+            resource = resource_path
+
+        with (
+            importlib.resources.files(package)
+            .joinpath(resource)
+            .open("r", encoding="utf-8") as f
+        ):
+            return f.read()
+    except Exception as e:
+        raise FileNotFoundError(
+            f"Prompt file not found at '{abs_path}' or in package resources: {e}"
         )
-    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:
-        return f.read()

janito/cli_chat_shell/ui.py

@@ -151,12 +151,18 @@ def get_prompt_session(get_toolbar_func, mem_history):
     )
     kb = KeyBindings()
 
+    # F12 instruction rotation
+    _f12_instructions = ["proceed", "go ahead", "continue", "next", "okay"]
+    _f12_index = {"value": 0}
+
     @kb.add("f12")
     def _(event):
-        """When F12 is pressed, send 'proceed' as input immediately."""
+        """When F12 is pressed, rotate through a set of short instructions."""
         buf = event.app.current_buffer
-        buf.text = "proceed"
+        idx = _f12_index["value"]
+        buf.text = _f12_instructions[idx]
         buf.validate_and_handle()
+        _f12_index["value"] = (idx + 1) % len(_f12_instructions)
 
     session = PromptSession(
         multiline=False,

janito/web/app.py

@@ -9,7 +9,6 @@ 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
@@ -32,7 +31,9 @@ else:
         interaction_mode=unified_config.get("interaction_mode", "prompt"),
         verbose_tools=unified_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()
@@ -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}")

{janito-1.6.0.dist-info → janito-1.7.0.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 1.6.0
-Summary: A Natural Language Programming Agent,
+Version: 1.7.0
+Summary: Natural Language Coding Agent,
 Author-email: João Pinto <joao.pinto@gmail.com>
-License: MIT
-Project-URL: homepage, https://github.com/joaompinto/janito
+License-Expression: MIT
+Project-URL: homepage, https://janito.dev
 Project-URL: repository, https://github.com/joaompinto/janito
 Keywords: agent,framework,tools,automation
 Classifier: Programming Language :: Python :: 3.10
@@ -21,16 +21,24 @@ Requires-Dist: pathspec
 Requires-Dist: prompt_toolkit
 Requires-Dist: requests
 Requires-Dist: rich
+Requires-Dist: toml
+Provides-Extra: docs
+Requires-Dist: mkdocs>=1.5.3; extra == "docs"
+Requires-Dist: mkdocs-material>=9.4.8; extra == "docs"
 Dynamic: license-file
 
-# 🚀 Janito: Natural Language Programming Agent
+# 🚀 Janito: Natural Language Coding Agent
 
-**Current Version: 1.6.0**  
-See [CHANGELOG.md](./CHANGELOG.md) and [RELEASE_NOTES_1.6.md](./RELEASE_NOTES_1.6.md) for details on the latest release.
+**Current Version: 1.7.0**  
+See [CHANGELOG.md](./CHANGELOG.md) for details on the latest release.
 
 Janito is an AI-powered assistant for the command line and web that interprets natural language system_prompt_template to edit code, manage files, and analyze projects using patterns and tools designed by experienced software engineers. It prioritizes transparency, interactive clarification, and precise, reviewable changes.
 
-For a technical overview, see the [Architecture Guide](docs/ARCHITECTURE.md).
+For a technical overview, see the [Architecture Guide](docs/reference/architecture.md).
+
+## 📖 Full Documentation & Overview
+- For structured and in-depth guides, visit the [Janito Documentation Site](https://docs.janito.dev).
+- For a high-level, user-friendly overview, see [janito.dev](https://janito.dev).
 
 ---
 
@@ -144,7 +152,7 @@ The default template ensures the agent:
 - Provides concise plans before taking action
 - Documents any changes made
 
-For more details or to customize the prompt, see the template file at `janito/agent/templates/system_prompt_template.j2` and the architecture overview in [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md).
+For more details or to customize the prompt, see the template file at `janito/agent/templates/system_prompt_template.j2` and the architecture overview in [docs/reference/architecture.md](docs/reference/architecture.md).
 
 ---