bhai-cli 0.2.2__tar.gz → 0.2.4__tar.gz

{bhai_cli-0.2.2 → bhai_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bhai-cli
-Version: 0.2.2
+Version: 0.2.4
 Summary: BHAI — The Dual-Brain AI Coding Agent with Punjabi Swagger. Indic-native voice + universal LLM tool-calling.
 License: Apache-2.0
 License-File: LICENSE

{bhai_cli-0.2.2 → bhai_cli-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bhai-cli"
-version = "0.2.2"
+version = "0.2.4"
 description = "BHAI — The Dual-Brain AI Coding Agent with Punjabi Swagger. Indic-native voice + universal LLM tool-calling."
 authors = ["Madhav Kapila <smartatk04@gmail.com>"]
 readme = "README.md"

{bhai_cli-0.2.2 → bhai_cli-0.2.4}/src/bhai_cli/cli.py

@@ -30,6 +30,7 @@ from bhai_cli.config_manager import (
     CONFIG_DIR,
     _mask_key,
 )
+from bhai_cli.session_manager import get_all_sessions, delete_session
 
 console = Console()
 
@@ -99,22 +100,75 @@ def interactive_menu():
         console.print("  [2] 🎙️  Listen (Voice mode)")
         console.print("  [3] ⚙️  Setup Wizard")
         console.print("  [4] 📋 View Config")
-        console.print("  [5] ❌ Exit\n")
+        console.print("  [5] 🗂️  Sessions")
+        console.print("  [6] ❌ Exit\n")
         
-        choice = Prompt.ask("[bold green]Choose an option[/]", choices=["1", "2", "3", "4", "5"])
+        choice = Prompt.ask("[bold green]Choose an option[/]", choices=["1", "2", "3", "4", "5", "6"])
         
         if choice == "1":
-            text(prompt="", vibe_model=None, coder_model=None, interactive=False)
+            text(prompt="", vibe_model=None, coder_model=None, session_id=None, interactive=False)
         elif choice == "2":
-            listen(vibe_model=None, coder_model=None, file=None)
+            listen(vibe_model=None, coder_model=None, file=None, session_id=None)
         elif choice == "3":
             setup()
         elif choice == "4":
             config()
         elif choice == "5":
+            sessions_menu()
+        elif choice == "6":
             console.print("\n[bold yellow]BHAI:[/] Accha bhai, phir milenge! 🤙")
             sys.exit(0)
 
+def sessions_menu():
+    """Interactive menu to manage sessions."""
+    while True:
+        sessions = get_all_sessions()
+        console.print("\n[bold cyan]🗂️  Session Management[/]")
+        
+        if not sessions:
+            console.print("[dim]No past sessions found.[/]")
+        else:
+            table = Table(show_header=True, header_style="bold cyan")
+            table.add_column("No.", style="bold white")
+            table.add_column("Title", style="yellow")
+            table.add_column("Updated At", style="dim")
+            table.add_column("ID", style="dim")
+            
+            for idx, s in enumerate(sessions):
+                table.add_row(str(idx + 1), s["title"], s["updated_at"][:16], s["id"])
+            console.print(table)
+            
+        console.print("\nOptions: [bold green]N[/] (New Session) | [bold yellow]D <no>[/] (Delete) | [bold cyan]<no>[/] (Resume) | [bold red]B[/] (Back)")
+        choice = Prompt.ask("Select").strip().lower()
+        
+        if choice == "b" or choice == "back":
+            break
+        elif choice == "n" or choice == "new":
+            console.print("[bold green]Starting new session...[/]")
+            text(prompt="", vibe_model=None, coder_model=None, session_id=None, interactive=True)
+            break
+        elif choice.startswith("d "):
+            try:
+                idx = int(choice.split(" ")[1]) - 1
+                if 0 <= idx < len(sessions):
+                    s_id = sessions[idx]["id"]
+                    if delete_session(s_id):
+                        console.print(f"[green]Deleted session: {s_id}[/]")
+                    else:
+                        console.print("[red]Failed to delete session.[/]")
+            except ValueError:
+                console.print("[red]Invalid selection.[/]")
+        else:
+            try:
+                idx = int(choice) - 1
+                if 0 <= idx < len(sessions):
+                    s_id = sessions[idx]["id"]
+                    console.print(f"[bold green]Resuming session: {sessions[idx]['title']}[/]")
+                    text(prompt="", vibe_model=None, coder_model=None, session_id=s_id, interactive=True)
+                    break
+            except ValueError:
+                console.print("[red]Invalid selection.[/]")
+
 
 # ---------------------------------------------------------------------------
 # bhai-code setup
@@ -204,18 +258,21 @@ def text(
     prompt: str = typer.Argument("", help="Your message to BHAI. If empty, starts interactive mode."),
     vibe_model: Optional[str] = typer.Option(None, "--vibe-model", "-vm", help="Override VibeLLM model."),
     coder_model: Optional[str] = typer.Option(None, "--coder-model", "-cm", help="Override CoderAgent model."),
+    session_id: Optional[str] = typer.Option(None, "--session-id", "-s", help="Resume a specific session ID."),
     interactive: bool = typer.Option(False, "--interactive", "-i", help="Enter interactive chat mode (always active if prompt is empty)."),
 ) -> None:
     """[bold magenta]💬 text[/] — Send a text prompt to BHAI or start interactive session."""
     if not prompt:
         print_banner()
+        if session_id:
+            console.print(f"[bold cyan]Resuming Session: {session_id}[/]")
         console.print("[bold cyan]Welcome to BHAI Interactive Mode.[/]\n[dim]Type 'exit', 'quit', or 'nikal' to leave.[/]\n")
         interactive = True
 
     from bhai_cli.orchestrator import BhaiOrchestrator
 
     cfg = load_config(vibe_model_override=vibe_model, coder_model_override=coder_model)
-    orchestrator = BhaiOrchestrator(cfg)
+    orchestrator = BhaiOrchestrator(cfg, session_id=session_id)
 
     if prompt:
         asyncio.run(orchestrator.process(prompt))
@@ -229,6 +286,9 @@ def text(
                 if user_input.strip().lower() in ("exit", "quit", "bye", "chal hatja", "nikal"):
                     console.print("\n[bold yellow]BHAI:[/] Accha bhai, phir milenge! 🤙")
                     break
+                if user_input.strip().lower() == "/compress":
+                    asyncio.run(orchestrator.compress_context(manual=True))
+                    continue
                 asyncio.run(orchestrator.process(user_input))
             except (KeyboardInterrupt, EOFError):
                 console.print("\n[bold yellow]BHAI:[/] Theek hai boss, baad mein baat karte hain! 👋")
@@ -242,6 +302,7 @@ def text(
 def listen(
     vibe_model: Optional[str] = typer.Option(None, "--vibe-model", "-vm", help="Override VibeLLM model."),
     coder_model: Optional[str] = typer.Option(None, "--coder-model", "-cm", help="Override CoderAgent model."),
+    session_id: Optional[str] = typer.Option(None, "--session-id", "-s", help="Resume a specific session ID."),
     file: Optional[str] = typer.Option(None, "--file", "-f", help="Path to an audio file instead of live mic."),
 ) -> None:
     """[bold red]🎙️  listen[/] — Voice input — speak to BHAI in any Indian language."""
@@ -264,7 +325,7 @@ def listen(
         )
         raise typer.Exit(1)
 
-    orchestrator = BhaiOrchestrator(cfg)
+    orchestrator = BhaiOrchestrator(cfg, session_id=session_id)
     audio_bytes = None
     audio_file = file or cfg.audio_fallback_file
 

{bhai_cli-0.2.2 → bhai_cli-0.2.4}/src/bhai_cli/orchestrator.py

@@ -24,6 +24,7 @@ from rich.markdown import Markdown
 
 from bhai_cli.config_manager import BhaiConfig
 from bhai_cli.tools import TOOL_SCHEMAS, dispatch_tool
+from bhai_cli.session_manager import load_session, save_session, create_session_id
 
 console = Console()
 
@@ -39,10 +40,10 @@ VIBE_SYSTEM_PROMPT = (
     "Your job:\n"
     "1. Parse the user's intent (any Indian language, Hinglish, or English) into a clear "
     "English task description.\n"
-    "2. IMPORTANT: You control a CoderAgent that has tools to read/edit files, list directories, and run bash commands! "
-    "If the user asks to explain a file, run code, or do ANY system task, DO NOT ask them to upload or paste it. "
-    "Instead, output a JSON block to delegate it: {\"task\": \"Read HelloWorld.py and explain it, then run it with a=4 b=10\"}.\n"
-    "3. If strictly chatting with no system/code actions needed, respond conversationally with swagger.\n"
+    "2. IMPORTANT: You control a CoderAgent that has tools to read/edit files, list directories, run bash commands, and perform web searches! "
+    "If the user asks to explain a file, run code, get real-time info from the internet, or do ANY system task, DO NOT ask them to do it themselves or upload it. "
+    "Instead, output a JSON block to delegate it: {\"task\": \"Read HelloWorld.py and explain it\"} or {\"task\": \"Search the web for IPL 2026 points table\"}.\n"
+    "3. If strictly chatting with no system/code/search actions needed, respond conversationally with swagger.\n"
     "4. After CoderAgent results, review them and decide:\n"
     '   - If the task is COMPLETE, say "BHAI_DONE" somewhere in your response.\n'
     '   - If MORE WORK is needed, output another {"task": "next step description"}.\n\n'
@@ -61,7 +62,8 @@ CODER_SYSTEM_PROMPT = (
     "5. Use read_file to see exact file contents before edit_file.\n"
     "6. Use execute_bash for running tests, git, docker, and system commands.\n"
     "7. Verify your changes work by running relevant commands.\n"
-    "8. Report results factually — what you did, what worked, what failed.\n\n"
+    "8. Report results factually — what you did, what worked, what failed.\n"
+    "9. IMPORTANT: When you are done with a task or providing an explanation, simply output plain text. DO NOT format your explanation as a JSON tool call if no tools are needed.\n\n"
     "## Tools Available:\n"
     "- list_directory: Explore project structure\n"
     "- codebase_context: Get function/class signatures (AST-based)\n"
@@ -81,11 +83,39 @@ CODER_SYSTEM_PROMPT = (
 class BhaiOrchestrator:
     """Dual-brain agentic orchestrator for BHAI-CLI."""
 
-    def __init__(self, config: BhaiConfig):
+    def __init__(self, config: BhaiConfig, session_id: Optional[str] = None):
         self.config = config
-        self.conversation_history: list[dict] = []
+        self.session_id = session_id or create_session_id()
+        self.session_title, self.conversation_history = load_session(self.session_id)
         self._setup_litellm()
 
+    async def _generate_session_title(self, prompt: str) -> None:
+        """Generate a short title using VibeLLM."""
+        if self.session_title:
+            return
+            
+        messages = [
+            {"role": "system", "content": "Generate a very short title (max 5 words) for this chat based on the user's first prompt. Respond ONLY with the title string."},
+            {"role": "user", "content": prompt}
+        ]
+        try:
+            kwargs = {
+                "model": self.config.vibe.model,
+                "messages": messages,
+                "temperature": 0.5,
+                "max_tokens": 20,
+            }
+            if self.config.vibe.api_base:
+                kwargs["api_base"] = self.config.vibe.api_base
+            if self.config.vibe.api_key:
+                kwargs["api_key"] = self.config.vibe.api_key
+            response = await litellm.acompletion(**kwargs)
+            title = response.choices[0].message.content.strip().strip('"\'')
+            if title:
+                self.session_title = title
+        except Exception:
+            self.session_title = prompt[:30] + "..."
+
     def _setup_litellm(self) -> None:
         import os
         if self.config.vibe.api_key:
@@ -136,14 +166,24 @@ class BhaiOrchestrator:
         }
         if self.config.vibe.api_base:
             kwargs["api_base"] = self.config.vibe.api_base
+        if self.config.vibe.api_key:
+            kwargs["api_key"] = self.config.vibe.api_key
 
         try:
             response = await litellm.acompletion(**kwargs)
             content = response.choices[0].message.content or ""
             self.conversation_history.append({"role": "user", "content": user_input})
             self.conversation_history.append({"role": "assistant", "content": content})
-            if len(self.conversation_history) > 20:
-                self.conversation_history = self.conversation_history[-16:]
+            
+            # Auto-compress if history is getting too long (e.g. 30 messages)
+            if len(self.conversation_history) > 30:
+                await self.compress_context()
+                
+            if not self.session_title:
+                await self._generate_session_title(user_input)
+                
+            save_session(self.session_id, self.session_title, self.conversation_history)
+            
             task = self._extract_task(content)
             return task, content
         except Exception as e:
@@ -197,6 +237,8 @@ class BhaiOrchestrator:
             }
             if self.config.coder.api_base:
                 kwargs["api_base"] = self.config.coder.api_base
+            if self.config.coder.api_key:
+                kwargs["api_key"] = self.config.coder.api_key
 
             try:
                 response = await litellm.acompletion(**kwargs)
@@ -234,12 +276,82 @@ class BhaiOrchestrator:
                     })
 
             except Exception as e:
+                error_str = str(e)
+                if "failed_generation" in error_str:
+                    try:
+                        json_start = error_str.find("{")
+                        if json_start != -1:
+                            error_json = json.loads(error_str[json_start:])
+                            failed_gen = error_json.get("error", {}).get("failed_generation", "")
+                            if failed_gen:
+                                return failed_gen
+                    except Exception:
+                        pass
+
                 error = f"CoderAgent error ({type(e).__name__}): {e}"
                 console.print(f"[bold red]⚠ {error}[/]")
                 return error
 
         return "Max iterations reached.\n" + "\n".join(all_results)
 
+    async def compress_context(self, manual: bool = False) -> None:
+        """Summarize older messages to free up context window."""
+        if len(self.conversation_history) <= 4 and not manual:
+            return
+
+        # Keep the latest 10 messages, compress the rest. If manual, compress all but the last 2.
+        keep_count = 2 if manual else 10
+        if len(self.conversation_history) <= keep_count:
+            if manual:
+                console.print("[dim]Not enough history to compress.[/]")
+            return
+
+        messages_to_compress = self.conversation_history[:-keep_count]
+        retained_messages = self.conversation_history[-keep_count:]
+
+        history_text = ""
+        for msg in messages_to_compress:
+            role = msg.get("role", "unknown")
+            content = msg.get("content", "")
+            history_text += f"{role.upper()}: {content}\n\n"
+
+        prompt = (
+            "Summarize the following conversation history densely. "
+            "Retain all key technical facts, decisions, and context. "
+            "Ignore conversational filler. Be concise.\n\n"
+            f"{history_text}"
+        )
+
+        with console.status("[bold cyan]BHAI is compressing memory... 🗜️[/]"):
+            try:
+                kwargs = {
+                    "model": self.config.vibe.model,
+                    "messages": [{"role": "user", "content": prompt}],
+                    "temperature": 0.3,
+                    "max_tokens": 500,
+                }
+                if self.config.vibe.api_base:
+                    kwargs["api_base"] = self.config.vibe.api_base
+                if self.config.vibe.api_key:
+                    kwargs["api_key"] = self.config.vibe.api_key
+
+                response = await litellm.acompletion(**kwargs)
+                summary = (response.choices[0].message.content or "Conversation compressed.").strip()
+
+                self.conversation_history = [
+                    {"role": "system", "content": f"Previous Conversation Summary:\n{summary}"}
+                ] + retained_messages
+
+                save_session(self.session_id, self.session_title, self.conversation_history)
+
+                if manual:
+                    console.print(Panel(
+                        f"[bold green]✅ Context compressed successfully.[/]\n\n[dim]Summary:\n{summary}[/]",
+                        title="[bold cyan]Memory Compression[/]", border_style="cyan", padding=(1, 2)
+                    ))
+            except Exception as e:
+                console.print(f"[bold red]⚠ Compression failed:[/] {e}")
+
     # ── Agentic Pipeline ──
 
     async def process(self, user_input: str) -> str:

bhai_cli-0.2.4/src/bhai_cli/session_manager.py

@@ -0,0 +1,94 @@
+"""
+Session Manager for BHAI-CLI.
+
+Handles persistent conversation history across multiple sessions.
+Stores sessions as JSON files in ~/.config/bhai/sessions/.
+"""
+
+from __future__ import annotations
+
+import json
+import uuid
+import datetime
+from pathlib import Path
+
+from bhai_cli.config_manager import CONFIG_DIR
+
+SESSIONS_DIR = CONFIG_DIR / "sessions"
+
+def _get_sessions_dir() -> Path:
+    SESSIONS_DIR.mkdir(parents=True, exist_ok=True)
+    return SESSIONS_DIR
+
+def create_session_id() -> str:
+    """Generate a new short hash-based session ID."""
+    return uuid.uuid4().hex[:8]
+
+def get_all_sessions() -> list[dict]:
+    """
+    Retrieve metadata for all saved sessions.
+    Returns a list of dicts: {"id": str, "title": str, "updated_at": str}
+    sorted by updated_at descending.
+    """
+    sessions_dir = _get_sessions_dir()
+    sessions = []
+    
+    for file_path in sessions_dir.glob("*.json"):
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                data = json.load(f)
+                sessions.append({
+                    "id": data.get("id", file_path.stem),
+                    "title": data.get("title", "Untitled Session"),
+                    "updated_at": data.get("updated_at", ""),
+                })
+        except Exception:
+            pass
+            
+    sessions.sort(key=lambda x: x["updated_at"], reverse=True)
+    return sessions
+
+def load_session(session_id: str) -> tuple[str, list[dict]]:
+    """
+    Load a session from disk.
+    Returns (title, history).
+    If session_id doesn't exist, returns ("", []).
+    """
+    file_path = _get_sessions_dir() / f"{session_id}.json"
+    if not file_path.exists():
+        return "", []
+        
+    try:
+        with open(file_path, "r", encoding="utf-8") as f:
+            data = json.load(f)
+            return data.get("title", ""), data.get("history", [])
+    except Exception:
+        return "", []
+
+def save_session(session_id: str, title: str, history: list[dict]) -> None:
+    """
+    Save the session history and title to disk.
+    """
+    file_path = _get_sessions_dir() / f"{session_id}.json"
+    now_iso = datetime.datetime.now(datetime.timezone.utc).isoformat()
+    
+    data = {
+        "id": session_id,
+        "title": title or "Untitled Session",
+        "updated_at": now_iso,
+        "history": history,
+    }
+    
+    with open(file_path, "w", encoding="utf-8") as f:
+        json.dump(data, f, ensure_ascii=False, indent=2)
+
+def delete_session(session_id: str) -> bool:
+    """Delete a session file. Returns True if deleted, False otherwise."""
+    file_path = _get_sessions_dir() / f"{session_id}.json"
+    if file_path.exists():
+        try:
+            file_path.unlink()
+            return True
+        except Exception:
+            return False
+    return False

{bhai_cli-0.2.2 → bhai_cli-0.2.4}/src/bhai_cli/tools/__init__.py

@@ -86,7 +86,7 @@ TOOL_SCHEMAS: list[dict] = [
                     },
                     "include_content": {
                         "type": "boolean",
-                        "description": "If true, include full file content (use sparingly). Default: false.",
+                        "description": "If true, include full file content. Default: false. MUST BE A NATIVE JSON BOOLEAN (true/false), NOT A STRING.",
                     },
                     "max_depth": {
                         "type": "integer",
@@ -195,7 +195,7 @@ TOOL_SCHEMAS: list[dict] = [
                     },
                     "recursive": {
                         "type": "boolean",
-                        "description": "If true, list recursively. Default: false.",
+                        "description": "If true, list recursively. Default: false. MUST BE A NATIVE JSON BOOLEAN (true/false), NOT A STRING.",
                     },
                     "max_depth": {
                         "type": "integer",