cite-agent 1.2.12__tar.gz → 1.3.0__tar.gz

{cite_agent-1.2.12/cite_agent.egg-info → cite_agent-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cite-agent
-Version: 1.2.12
+Version: 1.3.0
 Summary: Terminal AI assistant for academic research with citation verification
 Home-page: https://github.com/Spectating101/cite-agent
 Author: Cite-Agent Team

cite_agent-1.3.0/cite_agent/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.3.0"

{cite_agent-1.2.12 → cite_agent-1.3.0}/cite_agent/enhanced_ai_agent.py

@@ -2705,120 +2705,110 @@ class EnhancedNocturnalAgent:
                         if debug_mode:
                             print(f"🔍 Web search failed: {e}")
             
-            # PRODUCTION MODE: Check for shell/code execution needs FIRST
+            # PRODUCTION MODE: Use small LLM to plan shell commands (smarter than hardcoded patterns)
             if self.client is None:
-                # Check if query needs directory/file info or exploration
+                # Ask small LLM: What shell command should we run?
+                planner_prompt = f"""You are a shell command planner. Given the user's query, determine what shell command(s) to run.
+
+User query: "{request.question}"
+Previous conversation context: {json.dumps(self.conversation_history[-2:]) if self.conversation_history else "None"}
+
+Respond with JSON:
+{{
+  "action": "pwd|ls|find|none",
+  "search_target": "directory/file name to search for (if action=find)",
+  "search_path": "~/Downloads or ~/Documents or ~ (if action=find)",
+  "target_path": "/full/path (if referring to previous result)"
+}}
+
+Examples:
+Query: "where am i?" → {{"action": "pwd"}}
+Query: "what files are here?" → {{"action": "ls"}}
+Query: "find cm522 in downloads" → {{"action": "find", "search_target": "cm522", "search_path": "~/Downloads"}}
+Query: "can you look into it?" + Previous: "Found /home/user/Downloads/cm522-main" → {{"action": "ls", "target_path": "/home/user/Downloads/cm522-main"}}
+Query: "what's the capital of France?" → {{"action": "none"}}
+
+JSON:"""
+
                 question_lower = request.question.lower()
-                
-                # Basic info queries
-                needs_shell_info = any(phrase in question_lower for phrase in [
-                    'directory', 'folder', 'where am i', 'pwd', 'current location',
-                    'list files', 'what files', 'ls', 'files in', 'show files',
-                    'data files', 'csv files', 'check if file', 'file exists'
-                ])
-                
-                # Fuzzy search queries (find similar directories/files)
-                needs_find = any(phrase in question_lower for phrase in [
-                    'looking for', 'find', 'search for', 'similar to',
-                    'go to', 'cd to', 'navigate to', 'or something', 'forgot the name',
-                    'look into', 'check what', 'what\'s in'
+                needs_shell = any(word in question_lower for word in [
+                    'directory', 'folder', 'where', 'find', 'list', 'files', 'look', 'search', 'check'
                 ])
                 
-                if (needs_shell_info or needs_find) and self.shell_session:
-                    # Execute exploration commands
+                if needs_shell and self.shell_session:
                     try:
+                        # Use small LLM to plan shell command (smarter than regex)
+                        plan_response = await self.call_backend_query(
+                            query=planner_prompt,
+                            conversation_history=[],
+                            api_results={},
+                            tools_used=[]
+                        )
+                        
+                        # Parse JSON plan
+                        import json as json_module
+                        plan_text = plan_response.response.strip()
+                        # Extract JSON if wrapped in markdown
+                        if '```' in plan_text:
+                            plan_text = plan_text.split('```')[1].replace('json', '').strip()
+                        
+                        plan = json_module.loads(plan_text)
+                        
+                        debug_mode = os.getenv("NOCTURNAL_DEBUG", "").lower() == "1"
+                        if debug_mode:
+                            print(f"🔍 LLM PLAN: {plan}")
+                        
                         api_results["shell_info"] = {}
                         
-                        # Always include current location
-                        pwd_output = self.execute_command("pwd")
-                        api_results["shell_info"]["current_directory"] = pwd_output.strip()
+                        # Execute based on plan
+                        action = plan.get("action", "none")
+                        
+                        if action == "pwd":
+                            pwd_output = self.execute_command("pwd")
+                            api_results["shell_info"]["current_directory"] = pwd_output.strip()
+                            tools_used.append("shell_execution")
                         
-                        if needs_shell_info and not needs_find:
-                            # Just list current directory
-                            ls_output = self.execute_command("ls -lah")
+                        elif action == "ls":
+                            target = plan.get("target_path")
+                            if target:
+                                # List specific directory
+                                ls_output = self.execute_command(f"ls -lah {target}")
+                            else:
+                                # List current directory
+                                ls_output = self.execute_command("ls -lah")
                             api_results["shell_info"]["directory_contents"] = ls_output
+                            if target:
+                                api_results["shell_info"]["target_path"] = target
+                            tools_used.append("shell_execution")
                         
-                        if needs_find:
-                            # Smart search: extract directory name and location hints
-                            import re
+                        elif action == "find":
+                            search_target = plan.get("search_target", "")
+                            search_path = plan.get("search_path", "~")
                             
-                            # Check if user is referring to previous context ("it", "there")
-                            has_pronoun = any(word in question_lower for word in ['it', 'there', 'that folder', 'that directory'])
-                            pronoun_resolved = False
-                            
-                            if has_pronoun and len(self.conversation_history) > 0:
-                                # Look for directory path in last assistant message
-                                last_assistant = None
-                                for msg in reversed(self.conversation_history):
-                                    if msg.get('role') == 'assistant':
-                                        last_assistant = msg.get('content', '')
-                                        break
-                                
-                                if last_assistant:
-                                    # Extract paths like /home/user/Downloads/cm522-main
-                                    paths = re.findall(r'(/[\w/.-]+)', last_assistant)
-                                    if paths:
-                                        # List contents of the first path found
-                                        target_path = paths[0]
-                                        ls_output = self.execute_command(f"ls -lah {target_path}")
-                                        api_results["shell_info"]["directory_contents"] = ls_output
-                                        api_results["shell_info"]["target_path"] = target_path
-                                        tools_used.append("shell_execution")
-                                        pronoun_resolved = True
-                            
-                            # Generic search if no pronoun or pronoun not resolved
-                            if not pronoun_resolved:
-                                # Common words to ignore (add prepositions and articles)
-                                ignore_words = {
-                                    'looking', 'find', 'folder', 'directory', 'called', 'something',
-                                    'forgot', 'name', 'think', 'can', 'you', 'look', 'for', 'somewhere',
-                                    'computer', 'downloads', 'the', 'this', 'that', 'class', 'investment',
-                                    'check', 'what', 'into', 'in', 'on', 'at', 'to', 'from', 'with',
-                                    'and', 'or', 'is', 'it', 'my', 'me', 'there', 'here'
-                                }
-                                
-                                # Extract potential target names
-                                # Filter: must be 3+ chars (avoid "in", "to") AND not in ignore list
-                                all_words = re.findall(r'\b([a-zA-Z0-9_-]+)\b', request.question)
-                                potential_names = [w for w in all_words if len(w) >= 3 and w.lower() not in ignore_words]
-                                
-                                # Detect location hints
-                                search_path = "~"  # Default to home
-                                if 'downloads' in question_lower:
-                                    search_path = "~/Downloads"
-                                elif 'documents' in question_lower:
-                                    search_path = "~/Documents"
-                                
-                                search_results = []
-                                searched_terms = []
-                                
-                                for name in potential_names[:2]:  # Limit to 2 best candidates
-                                    if name in searched_terms:
-                                        continue
-                                    searched_terms.append(name)
-                                    
-                                # Search with increasing depth if needed
-                                find_cmd = f"find {search_path} -maxdepth 4 -type d -iname '*{name}*' 2>/dev/null | head -20"
+                            if search_target:
+                                find_cmd = f"find {search_path} -maxdepth 4 -type d -iname '*{search_target}*' 2>/dev/null | head -20"
                                 find_output = self.execute_command(find_cmd)
                                 
-                                # DEBUG: Log exact output
-                                debug_mode = os.getenv("NOCTURNAL_DEBUG", "").lower() == "1"
                                 if debug_mode:
                                     print(f"🔍 FIND EXECUTED: {find_cmd}")
                                     print(f"🔍 FIND OUTPUT: {repr(find_output)}")
                                 
                                 if find_output.strip():
-                                    search_results.append(f"Searched for '*{name}*' in {search_path}:\n{find_output}")
-                                
-                                if search_results:
-                                    api_results["shell_info"]["search_results"] = "\n\n".join(search_results)
-                                elif potential_names:
-                                    api_results["shell_info"]["search_results"] = f"No directories matching '{', '.join(searched_terms)}' found in {search_path}"
+                                    api_results["shell_info"]["search_results"] = f"Searched for '*{search_target}*' in {search_path}:\n{find_output}"
+                                else:
+                                    api_results["shell_info"]["search_results"] = f"No directories matching '{search_target}' found in {search_path}"
+                                tools_used.append("shell_execution")
                         
-                        tools_used.append("shell_execution")
+                        # Always include current directory
+                        pwd_output = self.execute_command("pwd")
+                        api_results["shell_info"]["current_directory"] = pwd_output.strip()
+                    
                     except Exception as e:
+                        # LLM planner failed, skip shell execution
+                        debug_mode = os.getenv("NOCTURNAL_DEBUG", "").lower() == "1"
                         if debug_mode:
-                            print(f"🔍 Shell execution failed: {e}")
+                            print(f"🔍 Shell planner failed: {e}")
+                
                 
                 # DEBUG: Log exactly what we're sending to backend
                 debug_mode = os.getenv("NOCTURNAL_DEBUG", "").lower() == "1"

{cite_agent-1.2.12 → cite_agent-1.3.0/cite_agent.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cite-agent
-Version: 1.2.12
+Version: 1.3.0
 Summary: Terminal AI assistant for academic research with citation verification
 Home-page: https://github.com/Spectating101/cite-agent
 Author: Cite-Agent Team

{cite_agent-1.2.12 → cite_agent-1.3.0}/setup.py

@@ -7,7 +7,7 @@ long_description = readme_path.read_text() if readme_path.exists() else "Termina
 
 setup(
     name="cite-agent",
-    version="1.2.12",
+    version="1.3.0",
     author="Cite-Agent Team",
     author_email="contact@citeagent.dev",
     description="Terminal AI assistant for academic research with citation verification",

cite_agent-1.2.12/cite_agent/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.2.12"