mindroot 8.10.0__py3-none-any.whl → 8.11.0__py3-none-any.whl

mindroot/coreplugins/admin/plugin_manager.py

@@ -199,6 +199,19 @@ async def scan_directory(request: DirectoryRequest):
         discovered_plugins = discover_plugins(directory)
         manifest = load_plugin_manifest()
         print("discoverd_plugins", discovered_plugins)
+        
+        # Analyze plugins for index compatibility
+        addable_count = 0
+        for plugin_name, plugin_info in discovered_plugins.items():
+            # Check if plugin has GitHub info
+            has_github = (
+                plugin_info.get('github_url') or 
+                plugin_info.get('remote_source') or
+                (plugin_info.get('metadata', {}).get('github_url'))
+            )
+            if has_github:
+                addable_count += 1
+        
         # Update installed plugins from discovered ones
         for plugin_name, plugin_info in discovered_plugins.items():
             plugin_info['source'] = 'local'
@@ -218,9 +231,14 @@ async def scan_directory(request: DirectoryRequest):
         } for name, info in discovered_plugins.items()]
         
         save_plugin_manifest(manifest)
-        return {"success": True, 
-                "message": f"Scanned {len(discovered_plugins)} plugins in {directory}",
-                "plugins": plugins_list}
+        
+        response = {"success": True, 
+                   "message": f"Scanned {len(discovered_plugins)} plugins in {directory}",
+                   "plugins": plugins_list,
+                   "addable_to_index": addable_count}
+        if addable_count < len(discovered_plugins):
+            response["warning"] = f"{len(discovered_plugins) - addable_count} plugins missing GitHub info and cannot be added to indices"
+        return response
     except Exception as e:
         trace = traceback.format_exc()
         return {"success": False, "message": f"Error during scan: {str(e)}\n\n{trace}"}

mindroot/coreplugins/admin/static/js/plugin-advanced-install.js

@@ -187,6 +187,14 @@ export class PluginAdvancedInstall extends PluginBase {
       if (response.success) {
         this.installDialog.addOutput(response.message, 'success');
         
+        // Show index compatibility info
+        if (response.addable_to_index !== undefined) {
+          this.installDialog.addOutput(`Index-compatible plugins: ${response.addable_to_index}/${response.plugins.length}`, 'info');
+        }
+        if (response.warning) {
+          this.installDialog.addOutput(response.warning, 'warning');
+        }
+        
         // If plugins were found, list them
         if (response.plugins && response.plugins.length > 0) {
           this.installDialog.addOutput('Found plugins:', 'info');

mindroot/coreplugins/index/default.json

@@ -11,44 +11,50 @@
       "version": "1.0.0",
       "description": "Simple Google search functionality",
       "source": "github",
-      "github_url": "runvnc/ah_google",
+      "github_url": "https://github.com/runvnc/ah_google",
       "commands": ["google", "fetch_webpage"],
       "services": [],
       "dependencies": []
     },
     {
-      "name": "Think (Chain-of-Thought)",
+      "name": "ah_think",
       "version": "0.0.1",
       "description": "Chain of thought reasoning capability",
-      "source": "local",
-      "source_path": "/xfiles/plugins_ah/ah_think",
+      "source": "github",
+      "github_url": "https://github.com/runvnc/ah_think",
       "commands": ["think"],
       "services": [],
       "dependencies": []
     },
     {
-      "name": "Look at PDF/Image",
+      "name": "ah_look_at",
       "version": "0.0.1",
       "description": "PDF and image examination tools",
-      "source": "local",
-      "source_path": "/xfiles/plugins_ah/ah_look_at",
+      "source": "github",
+      "github_url": "https://github.com/runvnc/ah_look_at",
       "commands": ["examine_pdf", "examine_image"],
       "services": [],
       "dependencies": []
     },
     {
-      "enabled": true,
-      "source": "github",
-      "source_path": "runvnc/ah_anthropic",
+      "name": "ah_anthropic",
       "version": "0.0.1",
-      "name": "Anthropic (Claude)"
+      "description": "Anthropic Claude AI integration",
+      "source": "github",
+      "github_url": "https://github.com/runvnc/ah_anthropic",
+      "commands": [],
+      "services": [],
+      "dependencies": []
     },
     {
-      "enabled": true,
-      "source": "github",
-      "source_path": "runvnc/ah_shell",
+      "name": "ah_shell",
       "version": "0.0.1",
-      "name": "Shell"
+      "description": "Shell command execution",
+      "source": "github",
+      "github_url": "https://github.com/runvnc/ah_shell",
+      "commands": ["execute_command"],
+      "services": [],
+      "dependencies": []
     }
   ],
   "agents": [

mindroot/coreplugins/index/handlers/plugin_ops.py

@@ -82,6 +82,19 @@ async def add_plugin(INDEX_DIR: Path, index_name: str, plugin: PluginEntry):
         if not index_file.exists():
             return JSONResponse({'success': False, 'message': 'Index not found'})
 
+        # Early validation - check for required GitHub info
+        has_github_info = (
+            plugin.remote_source or 
+            plugin.github_url or 
+            getattr(plugin, 'metadata', {}).get('github_url')
+        )
+        
+        if not has_github_info:
+            return JSONResponse({
+                'success': False,
+                'message': 'Plugin missing GitHub repository information. Cannot add to index.'
+            })
+        
         # Check if plugin is local
         if plugin.source == 'local':
             return JSONResponse({

mindroot/coreplugins/index/indices/default/index.json

@@ -346,8 +346,9 @@
       "flags": [],
       "uncensored": false,
       "commands": [
-        "say",
-        "json_encoded_md",
+        "wait_for_user_reply",
+        "tell_and_continue",
+        "markdown_await_user",
         "read",
         "write",
         "dir",
@@ -369,8 +370,9 @@
       "persona": "Dr_Alex_Morgan",
       "instructions": "### Clinical Approach\\n\\nDr. Alex Morgan uses a client-centered approach, focusing on creating a safe and non-judgmental space. The primary techniques include cognitive restructuring, behavioral activation, exposure therapy, mindfulness, and goal setting.\\n\\n### Key CBT Skills and Techniques\\n\\n#### Cognitive Restructuring\\n- **Identify Negative Thoughts:** Use thought diaries to track negative thoughts.\\n- **Examine Evidence:** Evaluate evidence for and against negative thoughts.\\n- **Challenge Thoughts:** Use Socratic questioning (e.g., \\\"What is the evidence for this thought?\\\").\\n- **Replace Thoughts:** Develop balanced and realistic thoughts.\\n- **Practice:** Encourage regular practice of cognitive restructuring.\\n\\n#### Behavioral Activation\\n- **Activity Monitoring:** Track daily activities and mood.\\n- **Activity Scheduling:** Schedule enjoyable and meaningful activities.\\n- **Gradual Task Assignment:** Start with small tasks and gradually increase difficulty.\\n- **Review and Adjust:** Regularly review progress and adjust the plan.\\n- **Reinforce Positive Behavior:** Celebrate achievements to reinforce positive behavior.\\n\\n#### Goal Setting\\n- **SMART Goals:** Ensure goals are Specific, Measurable, Achievable, Relevant, and Time-bound.\\n- **Break Down Goals:** Divide larger goals into smaller steps.\\n- **Action Plan:** Create a detailed action plan with tasks and deadlines.\\n- **Monitor Progress:** Regularly review progress and provide feedback.\\n- **Celebrate Successes:** Acknowledge and celebrate achievements.\\n\\n### Overall Process\\n\\n1. **Initial Consultation:** Assess client's history, issues, and goals.\\n2. **Treatment Planning:** Develop a personalized treatment plan.\\n3. **Therapy Sessions:** Conduct regular sessions using CBT techniques.\\n4. **Progress Monitoring:** Review progress and adjust the plan.\\n5. **Termination and Follow-Up:** Gradually reduce sessions and develop a relapse prevention plan.\\n\\n### Per-Session Process\\n\\n1. **Check-In:** Discuss client's current mood and experiences.\\n2. **Review Homework:** Discuss homework assignments.\\n3. **Agenda Setting:** Set the session's agenda.\\n4. **CBT Interventions:** Implement CBT techniques.\\n5. **Skill Building:** Teach and practice new CBT skills.\\n6. **Homework Assignment:** Assign tasks for practice.\\n7. **Session Summary:** Summarize key points and provide feedback.\\n8. **Planning for Next Session:** Discuss focus and goals for the next session.",
       "commands": [
-        "say",
-        "json_encoded_md"
+        "wait_for_user_reply",
+        "tell_and_continue",
+        "markdown_await_user"
       ],
       "flags": [],
       "added_at": "2024-12-08T17:08:22.219537",
@@ -381,8 +383,9 @@
       "name": "Mindroot Engineering Expert",
       "persona": "Assistant",
       "commands": [
-        "say",
-        "json_encoded_md",
+        "wait_for_user_reply",
+        "tell_and_continue",
+        "markdown_await_user",
         "think",
         "memory_add",
         "memory_update",

mindroot/coreplugins/index/static/js/plugin-section.js

@@ -96,6 +96,18 @@ class PluginSection extends BaseEl {
       opacity: 0.5;
       cursor: not-allowed;
     }
+
+    .plugin-warning {
+      font-size: 0.8rem;
+      color: #f39c12;
+      margin-top: 4px;
+    }
+
+    .disabled {
+      background: #555 !important;
+      color: #999 !important;
+      cursor: not-allowed !important;
+    }
   `;
 
   constructor() {
@@ -103,6 +115,22 @@ class PluginSection extends BaseEl {
     this.searchTerm = '';
   }
 
+  isPluginAddable(plugin) {
+    // Must have GitHub source info
+    const hasGitHubInfo = plugin.remote_source || 
+                         plugin.github_url || 
+                         (plugin.metadata && plugin.metadata.github_url);
+    
+    // Must not be local source
+    const isNotLocal = plugin.source !== 'local';
+    
+    // Must have basic metadata
+    const hasMetadata = plugin.metadata && 
+                       (plugin.metadata.commands || plugin.metadata.services);
+    
+    return hasGitHubInfo && isNotLocal && hasMetadata;
+  }
+
   filterPlugins(plugins) {
     if (!plugins) return [];
     const searchLower = this.searchTerm?.toLowerCase() || '';
@@ -165,6 +193,9 @@ class PluginSection extends BaseEl {
                 <div class="plugin-description">${plugin.description}</div>
               ` : ''}
               <div class="plugin-source">Source: ${plugin.source}</div>
+              ${!this.isPluginAddable(plugin) ? html`
+                <div class="plugin-warning">⚠️ Missing GitHub info - cannot add to index</div>
+              ` : ''}
             </div>
             ${isIndexPlugins ? html`
               <button class="action-button remove-button"
@@ -172,11 +203,17 @@ class PluginSection extends BaseEl {
                 Remove
               </button>
             ` : html`
-              <button class="action-button add-button"
-                      ?disabled=${this.selectedIndex?.plugins?.some(p => p.name === plugin.name)}
-                      @click=${() => this.handleAddPlugin(plugin)}>
-                Add
-              </button>
+              ${this.isPluginAddable(plugin) ? html`
+                <button class="action-button add-button"
+                        ?disabled=${this.selectedIndex?.plugins?.some(p => p.name === plugin.name)}
+                        @click=${() => this.handleAddPlugin(plugin)}>
+                  Add
+                </button>
+              ` : html`
+                <button class="action-button disabled" disabled title="Missing GitHub repository information">
+                  Cannot Add
+                </button>
+              `}
             `}
           </div>
         `)}

mindroot/coreplugins/login/templates/login.jinja2

@@ -50,6 +50,7 @@
             background-color: #45a049;
         }
     </style>
+    {% block head_extra %}{% endblock %}
     <script>
         async function handleLogin(event) {
             event.preventDefault();
@@ -78,8 +79,10 @@
             <input type="password" name="password" placeholder="Password" required>
             <button type="submit">Log In</button>
         </form>
+        {% block content %}{% endblock %}
         <div>
             <p>Don't have an account? <a href="/signup">Sign Up</a></p>
+        </div>
     </div>
 </body>
-</html>
+</html>

mindroot/lib/chatlog_optimized.py

@@ -0,0 +1,509 @@
+import os
+import json
+from typing import List, Dict, Set, Optional, Tuple
+import sys
+import traceback
+import re
+import time
+from mindroot.lib.utils.debug import debug_box
+from collections import defaultdict
+import threading
+
+# Global cache for directory structure and parent-child relationships
+_log_index_cache = {
+    'log_paths': {},  # log_id -> full_path
+    'parent_children': defaultdict(set),  # parent_log_id -> set of child_log_ids
+    'log_metadata': {},  # log_id -> {parent_log_id, agent, user, mtime}
+    'last_scan': 0,
+    'scan_lock': threading.Lock()
+}
+
+class ChatLog:
+    def __init__(self, log_id=0, agent=None, parent_log_id=None, context_length: int = 4096, user: str = None):
+        self.log_id = log_id
+        self.messages = []
+        self.parent_log_id = parent_log_id
+        self.agent = agent
+        if user is None or user == '' or user == 'None':
+            raise ValueError('User must be provided')
+        # make sure user is string
+        if not isinstance(user, str):
+            # does it have a username?
+            if hasattr(user, 'username'):
+                user = user.username
+            else:
+                # throw an error
+                raise ValueError('ChatLog(): user must be a string or have username field')
+        self.user = user
+        if agent is None or agent == '':
+            raise ValueError('Agent must be provided')
+        self.context_length = context_length
+        self.log_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
+        self.log_dir = os.path.join(self.log_dir, self.user)
+        self.log_dir = os.path.join(self.log_dir, self.agent)
+        if not os.path.exists(self.log_dir):
+            os.makedirs(self.log_dir)
+        self.load_log()
+        
+    def _get_log_data(self) -> Dict[str, any]:
+        return {
+            'agent': self.agent,
+            'log_id': self.log_id,
+            'messages': self.messages,
+            'parent_log_id': self.parent_log_id
+        }
+
+    def _calculate_message_length(self, message: Dict[str, str]) -> int:
+        return len(json.dumps(message)) // 3
+
+    def add_message(self, message: Dict[str, str]) -> None:
+        if len(self.messages)>0 and self.messages[-1]['role'] == message['role']:
+            print("found repeat role")
+            # check if messasge is str
+            # if so, convert to dict with type 'text':
+            if type(message['content']) == str:
+                message['content'] = [{'type':'text', 'text': message['content']}]
+            elif type(message['content']) == list:
+                for part in message['content']:
+                    if part['type'] == 'image':
+                        print("found image")
+                        self.messages.append(message)
+                        self.save_log()
+                        return
+
+            try:
+                cmd_list = json.loads(self.messages[-1]['content'][0]['text'])
+                if type(cmd_list) != list:
+                    debug_box("1")
+                    cmd_list = [cmd_list]
+                new_json = json.loads(message['content'][0]['text'])
+                if type(new_json) != list:
+                    debug_box("2")
+                    new_json = [new_json]
+                new_cmd_list = cmd_list + new_json
+                debug_box("3")
+                self.messages[-1]['content'] = [{ 'type': 'text', 'text': json.dumps(new_cmd_list) }]
+            except Exception as e:
+                # assume previous mesage was not a command, was a string
+                debug_box("4")
+                print("Could not combine commands, probably normal if user message and previous system output, assuming string", e)
+                if type(self.messages[-1]['content']) == str:
+                    new_msg_text = self.messages[-1]['content'] + message['content'][0]['text']
+                else:
+                    new_msg_text = self.messages[-1]['content'][0]['text'] + message['content'][0]['text']
+                self.messages.append({'role': message['role'], 'content': [{'type': 'text', 'text': new_msg_text}]})
+        else:
+            if len(self.messages)>0:
+                print('roles do not repeat, last message role is ', self.messages[-1]['role'], 'new message role is ', message['role'])
+            debug_box("5")
+            self.messages.append(message)
+        self.save_log()
+
+    def get_history(self) -> List[Dict[str, str]]:
+        return self.messages
+
+    def get_recent(self, max_tokens: int = 4096) -> List[Dict[str, str]]:
+        recent_messages = []
+        total_length = 0
+        json_messages = json.dumps(self.messages)
+        return json.loads(json_messages)
+
+    def save_log(self) -> None:
+        log_file = os.path.join(self.log_dir, f'chatlog_{self.log_id}.json')
+        with open(log_file, 'w') as f:
+            json.dump(self._get_log_data(), f, indent=2)
+        # Invalidate cache when log is saved
+        _invalidate_log_cache()
+        
+
+    def load_log(self, log_id = None) -> None:
+        if log_id is None:
+            log_id = self.log_id
+        self.log_id = log_id
+        log_file = os.path.join(self.log_dir, f'chatlog_{log_id}.json')
+        if os.path.exists(log_file):
+            with open(log_file, 'r') as f:
+                log_data = json.load(f)
+                self.agent = log_data.get('agent')
+                self.messages = log_data.get('messages', [])
+                self.parent_log_id = log_data.get('parent_log_id', None)
+            print("Loaded log file at ", log_file)
+            print("Message length: ", len(self.messages))
+        else:
+            print("Could not find log file at ", log_file)
+            self.messages = []
+
+    def count_tokens(self) -> Dict[str, int]:
+        input_tokens_sequence = 0
+        output_tokens_sequence = 0
+        input_tokens_total = 0
+        
+        for i, message in enumerate(self.messages):
+            message_tokens = len(json.dumps(message)) // 4
+            
+            if message['role'] == 'assistant':
+                output_tokens_sequence += message_tokens
+            else:
+                input_tokens_sequence += message_tokens
+            
+            if message['role'] == 'assistant':
+                request_input_tokens = 0
+                for j in range(i):
+                    request_input_tokens += len(json.dumps(self.messages[j])) // 4
+                input_tokens_total += request_input_tokens
+        
+        return {
+            'input_tokens_sequence': input_tokens_sequence,
+            'output_tokens_sequence': output_tokens_sequence,
+            'input_tokens_total': input_tokens_total
+        }
+
+def _invalidate_log_cache():
+    """Invalidate the log index cache"""
+    global _log_index_cache
+    with _log_index_cache['scan_lock']:
+        _log_index_cache['last_scan'] = 0
+
+def _build_log_index(force_refresh: bool = False) -> None:
+    """
+    Build an index of all chat logs and their relationships.
+    This replaces the inefficient os.walk() calls with a single scan.
+    """
+    global _log_index_cache
+    
+    with _log_index_cache['scan_lock']:
+        current_time = time.time()
+        
+        # Only rebuild if cache is older than 5 minutes or forced
+        if not force_refresh and (current_time - _log_index_cache['last_scan']) < 300:
+            return
+        
+        print("Building log index cache...")
+        start_time = time.time()
+        
+        # Clear existing cache
+        _log_index_cache['log_paths'].clear()
+        _log_index_cache['parent_children'].clear()
+        _log_index_cache['log_metadata'].clear()
+        
+        chat_dir = os.environ.get('CHATLOG_DIR', 'data/chat')
+        if not os.path.exists(chat_dir):
+            _log_index_cache['last_scan'] = current_time
+            return
+        
+        # Single directory walk to build complete index
+        for root, dirs, files in os.walk(chat_dir):
+            for file in files:
+                if file.startswith("chatlog_") and file.endswith(".json"):
+                    # Extract log_id from filename
+                    log_id = file[8:-5]  # Remove 'chatlog_' prefix and '.json' suffix
+                    full_path = os.path.join(root, file)
+                    
+                    try:
+                        # Get file modification time
+                        mtime = os.path.getmtime(full_path)
+                        
+                        # Parse user and agent from path
+                        rel_path = os.path.relpath(full_path, chat_dir)
+                        path_parts = rel_path.split(os.sep)
+                        user = path_parts[0] if len(path_parts) > 0 else 'unknown'
+                        agent = path_parts[1] if len(path_parts) > 1 else 'unknown'
+                        
+                        # Store path mapping
+                        _log_index_cache['log_paths'][log_id] = full_path
+                        
+                        # Read log data to get parent relationship
+                        try:
+                            with open(full_path, 'r') as f:
+                                log_data = json.load(f)
+                                parent_log_id = log_data.get('parent_log_id')
+                                
+                                # Store metadata
+                                _log_index_cache['log_metadata'][log_id] = {
+                                    'parent_log_id': parent_log_id,
+                                    'agent': agent,
+                                    'user': user,
+                                    'mtime': mtime
+                                }
+                                
+                                # Build parent-child relationships
+                                if parent_log_id:
+                                    _log_index_cache['parent_children'][parent_log_id].add(log_id)
+                                    
+                        except (json.JSONDecodeError, KeyError) as e:
+                            print(f"Error reading log file {full_path}: {e}")
+                            continue
+                            
+                    except OSError as e:
+                        print(f"Error accessing file {full_path}: {e}")
+                        continue
+        
+        _log_index_cache['last_scan'] = current_time
+        elapsed = time.time() - start_time
+        print(f"Log index built in {elapsed:.2f}s. Found {len(_log_index_cache['log_paths'])} logs.")
+
+def find_chatlog_file(log_id: str) -> Optional[str]:
+    """
+    Find a chatlog file by its log_id using the cached index.
+    
+    Args:
+        log_id: The log ID to search for
+        
+    Returns:
+        The full path to the chatlog file if found, None otherwise
+    """
+    _build_log_index()
+    return _log_index_cache['log_paths'].get(log_id)
+
+def find_child_logs_by_parent_id(parent_log_id: str) -> List[str]:
+    """
+    Find all chat logs that have the given parent_log_id using the cached index.
+    
+    Args:
+        parent_log_id: The parent log ID to search for
+        
+    Returns:
+        List of log IDs that have this parent_log_id
+    """
+    _build_log_index()
+    return list(_log_index_cache['parent_children'].get(parent_log_id, set()))
+
+def extract_delegate_task_log_ids(messages: List[Dict]) -> List[str]:
+    """
+    Extract log IDs from delegate_task commands in messages.
+    
+    Args:
+        messages: List of chat messages
+        
+    Returns:
+        List of log IDs found in delegate_task commands
+    """
+    log_ids = []
+    
+    for message in messages:
+        if message['role'] == 'assistant':
+            content = message['content']
+            # Handle both string and list content formats
+            if isinstance(content, str):
+                text = content
+            elif isinstance(content, list) and len(content) > 0 and 'text' in content[0]:
+                text = content[0]['text']
+            else:
+                continue
+                
+            # Try to parse as JSON
+            try:
+                commands = json.loads(text)
+                if not isinstance(commands, list):
+                    commands = [commands]
+                    
+                for cmd in commands:
+                    for key, value in cmd.items():
+                        if key == 'delegate_task' and 'log_id' in value:
+                            log_ids.append(value['log_id'])
+            except (json.JSONDecodeError, TypeError, KeyError):
+                # If not JSON, try regex to find log_ids in delegate_task commands
+                matches = re.findall(r'"delegate_task"\s*:\s*{\s*"log_id"\s*:\s*"([^"]+)"', text)
+                log_ids.extend(matches)
+    
+    return log_ids
+
+def get_cache_dir() -> str:
+    """
+    Get the directory for token count cache files.
+    Creates the directory if it doesn't exist.
+    """
+    cache_dir = os.environ.get('TOKEN_CACHE_DIR', 'data/token_cache')
+    if not os.path.exists(cache_dir):
+        os.makedirs(cache_dir)
+    return cache_dir
+
+def get_cache_path(log_id: str) -> str:
+    """
+    Get the path to the cache file for a specific log_id.
+    """
+    cache_dir = get_cache_dir()
+    return os.path.join(cache_dir, f"tokens_{log_id}.json")
+
+def get_cached_token_counts(log_id: str, log_path: str) -> Dict[str, int]:
+    """
+    Get cached token counts if available and valid.
+    
+    Args:
+        log_id: The log ID
+        log_path: Path to the actual log file
+        
+    Returns:
+        Cached token counts if valid, None otherwise
+    """
+    cache_path = get_cache_path(log_id)
+    
+    # If cache doesn't exist, return None
+    if not os.path.exists(cache_path):
+        return None
+    
+    try:
+        # Get modification times
+        log_mtime = os.path.getmtime(log_path)
+        cache_mtime = os.path.getmtime(cache_path)
+        current_time = time.time()
+        
+        # If log was modified after cache was created, cache is invalid
+        if log_mtime > cache_mtime:
+            return None
+        
+        # Don't recalculate sooner than 3 minutes after last calculation
+        if current_time - cache_mtime < 180:  # 3 minutes in seconds
+            with open(cache_path, 'r') as f:
+                return json.load(f)
+                
+        # For logs that haven't been modified in over an hour, consider them "finished"
+        # and use the cache regardless of when it was last calculated
+        if current_time - log_mtime > 3600:  # 1 hour in seconds
+            with open(cache_path, 'r') as f:
+                return json.load(f)
+    
+    except (json.JSONDecodeError, IOError) as e:
+        print(f"Error reading token cache: {e}")
+    
+    return None
+
+def save_token_counts_to_cache(log_id: str, token_counts: Dict[str, int]) -> None:
+    """
+    Save token counts to cache.
+    """
+    cache_path = get_cache_path(log_id)
+    with open(cache_path, 'w') as f:
+        json.dump(token_counts, f)
+
+def count_tokens_for_log_id_optimized(log_id: str) -> Dict[str, int]:
+    """
+    Optimized version of count_tokens_for_log_id that uses caching and batch operations.
+    
+    Args:
+        log_id: The log ID to count tokens for
+        
+    Returns:
+        Dictionary with token counts or None if log not found
+    """
+    # Find the chatlog file using cached index
+    chatlog_path = find_chatlog_file(log_id)
+    if not chatlog_path:
+        return None
+    
+    # Check cache first
+    cached_counts = get_cached_token_counts(log_id, chatlog_path)
+    if cached_counts:
+        print(f"Using cached token counts for {log_id}")
+        return cached_counts
+    
+    print(f"Calculating token counts for {log_id}")
+    
+    # Use batch processing to get all related logs at once
+    all_related_logs = _get_all_related_logs_batch(log_id)
+    
+    # Calculate tokens for all logs in batch
+    token_results = {}
+    for related_log_id, log_data in all_related_logs.items():
+        # Create a temporary ChatLog instance to count tokens
+        temp_log = ChatLog(log_id=related_log_id, user="system", agent=log_data.get('agent', 'unknown'))
+        temp_log.messages = log_data.get('messages', [])
+        
+        # Count tokens for this log
+        token_results[related_log_id] = temp_log.count_tokens()
+    
+    # Build the hierarchical token counts
+    main_counts = token_results.get(log_id, {
+        'input_tokens_sequence': 0,
+        'output_tokens_sequence': 0,
+        'input_tokens_total': 0
+    })
+    
+    # Sum up all child tokens
+    combined_counts = {
+        'input_tokens_sequence': main_counts['input_tokens_sequence'],
+        'output_tokens_sequence': main_counts['output_tokens_sequence'],
+        'input_tokens_total': main_counts['input_tokens_total']
+    }
+    
+    # Add child log tokens
+    for related_log_id, counts in token_results.items():
+        if related_log_id != log_id:  # Don't double-count the main log
+            combined_counts['input_tokens_sequence'] += counts['input_tokens_sequence']
+            combined_counts['output_tokens_sequence'] += counts['output_tokens_sequence']
+            combined_counts['input_tokens_total'] += counts['input_tokens_total']
+    
+    # Create final result
+    final_token_counts = {
+        # Parent session only counts
+        'input_tokens_sequence': main_counts['input_tokens_sequence'],
+        'output_tokens_sequence': main_counts['output_tokens_sequence'],
+        'input_tokens_total': main_counts['input_tokens_total'],
+        # Combined counts (parent + all subtasks)
+        'combined_input_tokens_sequence': combined_counts['input_tokens_sequence'],
+        'combined_output_tokens_sequence': combined_counts['output_tokens_sequence'],
+        'combined_input_tokens_total': combined_counts['input_tokens_total']
+    }
+    
+    # Save to cache
+    save_token_counts_to_cache(log_id, final_token_counts)
+    
+    return final_token_counts
+
+def _get_all_related_logs_batch(log_id: str) -> Dict[str, Dict]:
+    """
+    Get all related logs (parent and children) in a single batch operation.
+    This avoids multiple directory traversals and file reads.
+    """
+    # Ensure index is built
+    _build_log_index()
+    
+    # Find all related log IDs
+    related_log_ids = set([log_id])
+    to_process = [log_id]
+    
+    while to_process:
+        current_id = to_process.pop()
+        
+        # Add children
+        children = _log_index_cache['parent_children'].get(current_id, set())
+        for child_id in children:
+            if child_id not in related_log_ids:
+                related_log_ids.add(child_id)
+                to_process.append(child_id)
+    
+    # Also check for delegated tasks in the main log
+    main_log_path = _log_index_cache['log_paths'].get(log_id)
+    if main_log_path:
+        try:
+            with open(main_log_path, 'r') as f:
+                log_data = json.load(f)
+                delegated_ids = extract_delegate_task_log_ids(log_data.get('messages', []))
+                for delegated_id in delegated_ids:
+                    if delegated_id not in related_log_ids:
+                        related_log_ids.add(delegated_id)
+                        to_process.append(delegated_id)
+        except (json.JSONDecodeError, IOError):
+            pass
+    
+    # Batch read all related logs
+    result = {}
+    for related_id in related_log_ids:
+        log_path = _log_index_cache['log_paths'].get(related_id)
+        if log_path:
+            try:
+                with open(log_path, 'r') as f:
+                    result[related_id] = json.load(f)
+            except (json.JSONDecodeError, IOError) as e:
+                print(f"Error reading log {related_id}: {e}")
+                continue
+    
+    return result
+
+# Backward compatibility - keep the original function name but use optimized version
+def count_tokens_for_log_id(log_id: str) -> Dict[str, int]:
+    """
+    Count tokens for a chat log identified by log_id, including any delegated tasks.
+    This is the optimized version that uses caching and batch operations.
+    """
+    return count_tokens_for_log_id_optimized(log_id)

mindroot/lib/plugins/default_plugin_manifest.json

@@ -62,7 +62,7 @@
           "source": "core"
       },
       "credits": {
-          "enabled": true,
+          "enabled": false,
           "source": "core"
       },
       "startup": {

{mindroot-8.10.0.dist-info → mindroot-8.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 8.10.0
+Version: 8.11.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE

{mindroot-8.10.0.dist-info → mindroot-8.11.0.dist-info}/RECORD

@@ -6,7 +6,7 @@ mindroot/coreplugins/admin/agent_router.py,sha256=mstYUURNRb9MpfNwqMYC7WY3FOQJ-5
 mindroot/coreplugins/admin/command_router.py,sha256=nhNkurIb9w7itgQ5nBtDYM-W2q69cYpLAq9HLrK-0Bk,6567
 mindroot/coreplugins/admin/persona_handler.py,sha256=eRYmmOmupLJuiujWN35SS2nwRgo0lbbXug-chZ_WmjU,2862
 mindroot/coreplugins/admin/persona_router.py,sha256=tyPxBe-pRnntHo_xyazvnwKZxHmvEI5_Fsu0YkZbrXA,6036
-mindroot/coreplugins/admin/plugin_manager.py,sha256=k_buWtxh1JGb7j_NMILxJlZ_ZU5VVuXQpw4_Qp1Zjjo,14587
+mindroot/coreplugins/admin/plugin_manager.py,sha256=ZXzxSNY6Y0_PXvnZSsSK3WDTkgDJNDuDlFP8y-F72h8,15355
 mindroot/coreplugins/admin/plugin_manager_backup.py,sha256=pUnh-EW4BMOrL2tYUq1X2BC65aoTBhDM-o2-mlDYXfU,24583
 mindroot/coreplugins/admin/plugin_router.py,sha256=EEDIM0MMPhqeej8Lu8cazYgzaXH1sKZLy_6kBOwrUgY,1020
 mindroot/coreplugins/admin/router.py,sha256=Wzeri92Rv39YKTYflMZ3E1pnYy959KHWRjS8D4Xgaao,1580
@@ -51,7 +51,7 @@ mindroot/coreplugins/admin/static/js/missing-commands.js,sha256=adNF9GWN981_KX7H
 mindroot/coreplugins/admin/static/js/model-preferences.js,sha256=J0G7gcGACaPyslWJO42urf5wbZZsqO0LyPicAu-uV_Y,3365
 mindroot/coreplugins/admin/static/js/notification.js,sha256=296rVCr6MNtzvzdzW3bGiMa231-BnWJtwZZ_sDWX-3c,5633
 mindroot/coreplugins/admin/static/js/persona-editor.js,sha256=xO2jobJXwqGY7Uajj3vQxyERubsHZovIPF_8FHpvzFE,8604
-mindroot/coreplugins/admin/static/js/plugin-advanced-install.js,sha256=nrCpHlQTd9c_SRIqR0MNqsqgocUPL1K7_yfA99f-MlM,7679
+mindroot/coreplugins/admin/static/js/plugin-advanced-install.js,sha256=-HDJ3lVuDwj6R-74TfVUo4dUxB8efl13m3R_sUicnJI,8038
 mindroot/coreplugins/admin/static/js/plugin-base.js,sha256=KWp5DqueHtyTxYKbuHMoFpoFXrfMbIjzK4M1ulAR9m8,5095
 mindroot/coreplugins/admin/static/js/plugin-index-browser.js,sha256=P-V4wqlYGxjr7oF2LiD5ti8Is3wtSsKPwpRgRJpT0VI,10028
 mindroot/coreplugins/admin/static/js/plugin-install-dialog.js,sha256=ty_dZ9dZcpp9El1j3eY4Z6Wp8iZ5WNkf_lHSV-W1IhA,8216
@@ -923,11 +923,6 @@ mindroot/coreplugins/events/mod.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329N
 mindroot/coreplugins/events/router.py,sha256=a-77306_fQPNHPXP5aYtbpfC0gbqMBNRu04aYOh75L4,3587
 mindroot/coreplugins/events/backup/mod.py,sha256=9QeJpg6WKwxRdjiKVHD1froguTe86FS2-2wWm1B9xa8,1832
 mindroot/coreplugins/events/backup/router_backup.py,sha256=ImU8xoxdSd45V1yOFVqdtDQ614V6CMsDZQ1gtJj0Mnk,254
-mindroot/coreplugins/google_auth/README.md,sha256=9BTSYrU-k22RshkKDsszZwrB40xFu-1JUBi34QD52I8,2801
-mindroot/coreplugins/google_auth/__init__.py,sha256=qw8b_7YoN67q1kEdXYXmQkXycF1NaYb3dMbjP-6FsUs,19
-mindroot/coreplugins/google_auth/mod.py,sha256=wVhrOK7gw7kTjGRCS3nlhbELHPxydUqKMDQcjdGIUfU,61
-mindroot/coreplugins/google_auth/router.py,sha256=15ix01TVTexfhgGRAhkNiQeHZamj-jqNDBNVQm1yqW4,5519
-mindroot/coreplugins/google_auth/inject/login.jinja2,sha256=Vlihmk8vgxup0Y6Pvi5nzvbZUQyhUzZH0I5qREW_Vj8,1944
 mindroot/coreplugins/home/mod.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2
 mindroot/coreplugins/home/router.py,sha256=kzPg2eIimG_2Qa1bZ0gKCmoo2uzd8GurrePODOO1How,1982
 mindroot/coreplugins/home/static/css/dark.css,sha256=Q9FHaEsf9xeJjtouyKgr1Su6vTzsN07NHxxqDrDfyx8,14259
@@ -1307,7 +1302,7 @@ mindroot/coreplugins/home/static/js/lit-html/node/directives/when.js.map,sha256=
 mindroot/coreplugins/home/templates/home.jinja2,sha256=wVaXYgaNK3Kn7wmrKEyBT24Az2l4_o7ctVbDhHPXgEw,2088
 mindroot/coreplugins/index/.gitignore,sha256=r_urXBxUYZhSuWyYzpRcAz5rHR0gVTERMrTI_gbBmCM,9
 mindroot/coreplugins/index/__init__.py,sha256=WU5revQym2nu-vAV-o5cdAXpuRlb_Juu0lzc9s6lIFU,74
-mindroot/coreplugins/index/default.json,sha256=E3Rj8gCAcFeppbS4CtXoGwXL94E7jFJQcNflDp4xrJg,2030
+mindroot/coreplugins/index/default.json,sha256=nFZXpsAFlTCGN_lfqJIewCd_o-fMEpjaUixBbnynWfA,2288
 mindroot/coreplugins/index/mod.py,sha256=F_2PBZIjOOKID36m_DK8fvN92zEkTHQeBm9M6gJ84Tw,554
 mindroot/coreplugins/index/models.py,sha256=WXG4pslFwq-iUld4-7dZlbHTsiFkVq9RghE0AVDzR_M,1044
 mindroot/coreplugins/index/router.py,sha256=z8TlbcN_9i6Q5XgLxcbV6H_PAGqK9H0tJdrQ3oqkCcY,2085
@@ -1315,9 +1310,9 @@ mindroot/coreplugins/index/utils.py,sha256=UF30B_XM3FNHjwn_BnxaW9yEjwZl-TjyDBcUD
 mindroot/coreplugins/index/handlers/__init__.py,sha256=MPoCNJooyIGXwD9lXyIR8RQwUE5MrPj4wFpJVIzPCtM,421
 mindroot/coreplugins/index/handlers/agent_ops.py,sha256=6faXdvDwZfZSsev5BLlKxJkDo4BNskVNAstWt3_T6kA,3849
 mindroot/coreplugins/index/handlers/index_ops.py,sha256=VvGev9qKMtXK0LJnyO4s0fKeJwFLlXIBI3SPgYIGMD8,3898
-mindroot/coreplugins/index/handlers/plugin_ops.py,sha256=lDC4RtSiZ27w_rW6aj_VkoLhq2vIhs1GktyHvDOYdTs,5139
+mindroot/coreplugins/index/handlers/plugin_ops.py,sha256=KT5Ga8Q42rBfkaqyDd4VPtu3x1Ax7mEApS8a-xIhq2E,5599
 mindroot/coreplugins/index/handlers/publish.py,sha256=J4SiDSvaXpYV7My66nFjD1jHTVeDsV986iIwUAUlLok,4684
-mindroot/coreplugins/index/indices/default/index.json,sha256=zC44bA-WnHfkzx-BCzzycwPtD7QggLCvGzvLPYCWRPI,37844
+mindroot/coreplugins/index/indices/default/index.json,sha256=2zR869dAVESvpGuRATZXaaQkh7n2oqkjc3DY2VcqXgc,37991
 mindroot/coreplugins/index/indices/default/personas/Assistant/avatar.png,sha256=AsT2_jjGpZvEhzTEwSVhEShSYaIBhcUDrlj_bAG_HVY,1169266
 mindroot/coreplugins/index/indices/default/personas/Assistant/faceref.png,sha256=AsT2_jjGpZvEhzTEwSVhEShSYaIBhcUDrlj_bAG_HVY,1169266
 mindroot/coreplugins/index/indices/default/personas/Assistant/persona.json,sha256=BwVSL8E1VkFtxPEN_6fjULxK2SufaE2Dsi0_Mfs4Mhw,244
@@ -1332,7 +1327,7 @@ mindroot/coreplugins/index/static/js/index-list.js,sha256=7nE7Taeppc1NaxyojOncgv
 mindroot/coreplugins/index/static/js/index-manager.js,sha256=UFTCwT21ZB0I1YRgeJWwRBUiCcKvHWZvuebopHKyTcA,6453
 mindroot/coreplugins/index/static/js/index-metadata.js,sha256=sLFV1P0XLd887PQkwpjZMK25BQUqT5QGF60dvRwAQc8,2640
 mindroot/coreplugins/index/static/js/lit-core.min.js,sha256=wHslYF0J77niIj1xfYyYjSvnU6Mkq-QRiNffiOb6xz8,15443
-mindroot/coreplugins/index/static/js/plugin-section.js,sha256=bXE0w6Npq0Z77sBOPv0kUU7r48-sgdHmyXFWTwPZtew,5333
+mindroot/coreplugins/index/static/js/plugin-section.js,sha256=bwYiWCuYdWbMdS8lociS72k8_6dBLMS2wyBgG3f6DGA,6551
 mindroot/coreplugins/index/static/js/components/publish-button.js,sha256=REEvOYv0uPe2jPeGkmI9WHscHIwMoAXOQTO67Aux9nU,3367
 mindroot/coreplugins/index/static/js/components/upload-area.js,sha256=MqoVKaTnwm8Gce1_qjqZxF7x3NKVKORHoECBTKGpP0o,4056
 mindroot/coreplugins/index/static/js/lit-html/LICENSE,sha256=K2b5OQr94p7f5DFNr_k_AfsYLhF4BT4igSAXiYfl23U,1518
@@ -1705,7 +1700,7 @@ mindroot/coreplugins/jwt_auth/role_checks.py,sha256=bruZIIBSOvXNWB1YZ2s5btrbbXNf
 mindroot/coreplugins/jwt_auth/router.py,sha256=ecXYao_UG33UjQF15Hi-tf_X0eFsqLEldyqGpt7JNSw,1162
 mindroot/coreplugins/login/mod.py,sha256=4W8VliAYUP1KY2gLJ_YDy2TmcXYVm-PY7XikQD_bFwA,2
 mindroot/coreplugins/login/router.py,sha256=vyxBNkrVguRn3SmoR5JTYjkI_Oiv74DMkLbYSSK4ju4,2722
-mindroot/coreplugins/login/templates/login.jinja2,sha256=PZa85CmQeROc8ABQ6s5S9llH9xy2i6JtTWRKLR5FUZs,2513
+mindroot/coreplugins/login/templates/login.jinja2,sha256=sxZL8G52hv3T364k9pylXz8g6H9xludXfziHGTruKw8,2610
 mindroot/coreplugins/persona/README.md,sha256=YZWBU9O3i8Edvuldd3_9mplAd3hIU7c5ueSO3ssTo8s,826
 mindroot/coreplugins/persona/__init__.py,sha256=qw8b_7YoN67q1kEdXYXmQkXycF1NaYb3dMbjP-6FsUs,19
 mindroot/coreplugins/persona/init_persona.py,sha256=4ZXy9LrmOI8xFgr2gsz4VPvwWBMd1oB04uhAWrRbp8A,410
@@ -1778,6 +1773,7 @@ mindroot/lib/buchatlog2.py,sha256=Va9FteBWePEjWD9OZcw-OtQfEb-IoCVGTmJeMRaX9is,13
 mindroot/lib/butemplates.py,sha256=gfHGPTOjvoEenXsR7xokNuqMjOAPuC2DawheH1Ae4bU,12196
 mindroot/lib/chatcontext.py,sha256=yJQOC0lhS-M7sk0oHet8W3B8urxUZBRwEkvQlDUpsws,11702
 mindroot/lib/chatlog.py,sha256=F5rKxiDotLvJnZVjHlbUrChRLdFkbS4V2gNcAQ-XE-s,16176
+mindroot/lib/chatlog_optimized.py,sha256=rL7KBP-V4_cGgMLihxPm3HoKcjFEyA1uEtPtqvkOa3A,20011
 mindroot/lib/json_escape.py,sha256=5cAmAdNbnYX2uyfQcnse2fFtNI0CdB-AfZ23RwaDm-k,884
 mindroot/lib/model_selector.py,sha256=Wz-8NZoiclmnhLeCNnI3WCuKFmjsO5HE4bK5F8GpZzU,1397
 mindroot/lib/parent_templates.py,sha256=elcQFFwrFtfAYfQOSTs06aiDDigN1f1R2f8I1V-wj6Q,2731
@@ -1800,7 +1796,7 @@ mindroot/lib/logging/logfiles_prev.py,sha256=Dqya4VlqXh5Wx7HC6uydkwkb5SLpcl6HQ46
 mindroot/lib/pipelines/pipe.py,sha256=zlVI8BTjDaI87UZO61uVvXyZIbs_pPipi-zGVgDoCwk,527
 mindroot/lib/pipelines/pipelines.py,sha256=Uv83Xvnpt34u6J0h0f1mef4M53ifgFco65nMECBJeMM,2654
 mindroot/lib/plugins/__init__.py,sha256=ZpIgOKsGjyvAe9KenqZ_5ppxaQ7br9EmU7RBI_VXaBw,1318
-mindroot/lib/plugins/default_plugin_manifest.json,sha256=vVgFY_vIn5NFsj2dbERg9m_iiaSOOfLdSRlgNfAI5H0,1405
+mindroot/lib/plugins/default_plugin_manifest.json,sha256=lg3mIQmQPU6nkOKjClstvXGC82tNP9RuV-LLQVIJAIw,1406
 mindroot/lib/plugins/installation.py,sha256=Ju3gD3cv9I5qIY0hrL7-4t5xYeivEtEgUveWIiE1oqM,15360
 mindroot/lib/plugins/loader.py,sha256=OhBzfzHuZCwxVtloVrgkHUJCaLG3_n4k9lDLMIuuZsg,9541
 mindroot/lib/plugins/manifest.py,sha256=DOCpwZRFCbk4fAhXlh67uDunYGMBD-OK6_W4E9tf-_k,3955
@@ -1825,9 +1821,9 @@ mindroot/protocols/services/stream_chat.py,sha256=fMnPfwaB5fdNMBLTEg8BXKAGvrELKH
 mindroot/registry/__init__.py,sha256=40Xy9bmPHsgdIrOzbtBGzf4XMqXVi9P8oZTJhn0r654,151
 mindroot/registry/component_manager.py,sha256=WZFNPg4SNvpqsM5NFiC2DpgmrJQCyR9cNhrCBpp30Qk,995
 mindroot/registry/data_access.py,sha256=NgNMamxIjaKeYxzxnVaQz1Y-Rm0AI51si3788_JHUTM,5316
-mindroot-8.10.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
-mindroot-8.10.0.dist-info/METADATA,sha256=hZ6UII6f1aM5Dhvh2mN7Rst9znemJwqt_CO2suVYO58,892
-mindroot-8.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mindroot-8.10.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
-mindroot-8.10.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
-mindroot-8.10.0.dist-info/RECORD,,
+mindroot-8.11.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
+mindroot-8.11.0.dist-info/METADATA,sha256=wef7mud8dSSLBdP0uNYhmySIvcexiy-Hth-h4Tk471U,892
+mindroot-8.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mindroot-8.11.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
+mindroot-8.11.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
+mindroot-8.11.0.dist-info/RECORD,,

mindroot/coreplugins/google_auth/README.md

@@ -1,76 +0,0 @@
-# Google OAuth Authentication Plugin
-
-This plugin adds Google Sign-In functionality to MindRoot, allowing users to authenticate using their Google accounts.
-
-## Setup Instructions
-
-### 1. Create Google OAuth Credentials
-
-1. Go to the [Google Cloud Console](https://console.cloud.google.com/)
-2. Create a new project or select an existing one
-3. Enable the Google+ API for your project
-4. Go to "Credentials" in the left sidebar
-5. Click "Create Credentials" > "OAuth client ID"
-6. Select "Web application" as the application type
-7. Add your redirect URI (e.g., `http://localhost:8000/google_auth/callback` for local development)
-8. Save your Client ID and Client Secret
-
-### 2. Configure Environment Variables
-
-Add the following to your `.env` file in the MindRoot root directory:
-
-```bash
-# Google OAuth Configuration
-GOOGLE_CLIENT_ID=your-client-id-here
-GOOGLE_CLIENT_SECRET=your-client-secret-here
-GOOGLE_REDIRECT_URI=http://localhost:8000/google_auth/callback
-```
-
-For production, update `GOOGLE_REDIRECT_URI` to your actual domain:
-```bash
-GOOGLE_REDIRECT_URI=https://yourdomain.com/google_auth/callback
-```
-
-### 3. Update Google OAuth Authorized Redirect URIs
-
-Make sure to add your redirect URI to the authorized redirect URIs in your Google OAuth client settings.
-
-## How It Works
-
-1. Users click "Sign in with Google" on the login page
-2. They are redirected to Google's OAuth consent screen
-3. After authorization, Google redirects back to `/google_auth/callback`
-4. The plugin:
-   - Verifies the OAuth response
-   - Creates a new user account if needed (username: `google_[partial_google_id]`)
-   - Sets the same JWT token used by the regular login system
-   - Redirects to the home page
-
-## User Data
-
-When a user signs in with Google:
-- A new user account is created with a generated username
-- Their Google email is stored
-- Email is automatically verified if Google has verified it
-- Additional Google profile info is stored in `google_info.json`
-
-## Security Notes
-
-- State tokens are used to prevent CSRF attacks
-- Google ID tokens are verified server-side
-- Users get the same JWT tokens as regular login
-- Passwords for OAuth users are randomly generated and not used
-
-## Troubleshooting
-
-1. **"Google OAuth not configured" error**: Make sure you've set the environment variables
-2. **Redirect URI mismatch**: Ensure the redirect URI in your `.env` matches exactly what's configured in Google Cloud Console
-3. **Invalid state token**: This is a security feature - just try signing in again
-
-## Integration with Existing System
-
-The plugin integrates seamlessly with MindRoot's existing authentication:
-- Uses the same JWT token system
-- Compatible with existing middleware
-- Users can access all the same features
-- Admin can manage Google-authenticated users like any other users

mindroot/coreplugins/google_auth/__init__.py

@@ -1 +0,0 @@
-from .mod import *

mindroot/coreplugins/google_auth/inject/login.jinja2

@@ -1,69 +0,0 @@
-{% block head_extra %}
-<style>
-    .google-signin-btn {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        padding: 0.5rem;
-        margin-top: 1rem;
-        background-color: #4285f4;
-        color: white;
-        border: none;
-        border-radius: 4px;
-        cursor: pointer;
-        text-decoration: none;
-        font-size: 14px;
-        transition: background-color 0.3s;
-    }
-    
-    .google-signin-btn:hover {
-        background-color: #357ae8;
-    }
-    
-    .google-signin-btn svg {
-        width: 18px;
-        height: 18px;
-        margin-right: 8px;
-    }
-    
-    .divider {
-        text-align: center;
-        margin: 1rem 0;
-        position: relative;
-    }
-    
-    .divider::before {
-        content: '';
-        position: absolute;
-        top: 50%;
-        left: 0;
-        right: 0;
-        height: 1px;
-        background-color: #555;
-    }
-    
-    .divider span {
-        background-color: #2a2a2a;
-        padding: 0 10px;
-        position: relative;
-        color: #888;
-        font-size: 14px;
-    }
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="divider">
-    <span>OR</span>
-</div>
-<a href="/google_auth/login" class="google-signin-btn">
-    <svg viewBox="0 0 24 24" fill="currentColor">
-        <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"/>
-        <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"/>
-        <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"/>
-        <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"/>
-    </svg>
-    Sign in with Google
-</a>
-{% endblock %}

mindroot/coreplugins/google_auth/mod.py

@@ -1 +0,0 @@
-# Google Auth plugin - provides Google OAuth2 authentication

mindroot/coreplugins/google_auth/router.py

@@ -1,170 +0,0 @@
-from fastapi import APIRouter, Request, HTTPException
-from fastapi.responses import RedirectResponse, HTMLResponse
-from lib.route_decorators import public_route
-from lib.providers.services import service_manager
-from mindroot.coreplugins.jwt_auth.middleware import create_access_token
-from mindroot.coreplugins.user_service.models import UserCreate
-from google.auth.transport import requests
-from google.oauth2 import id_token
-import google_auth_oauthlib.flow
-import os
-import secrets
-import json
-from typing import Optional
-
-router = APIRouter()
-
-# OAuth 2.0 configuration
-CLIENT_ID = os.environ.get('GOOGLE_CLIENT_ID')
-CLIENT_SECRET = os.environ.get('GOOGLE_CLIENT_SECRET')
-REDIRECT_URI = os.environ.get('GOOGLE_REDIRECT_URI', 'http://localhost:8000/google_auth/callback')
-
-# OAuth2 flow configuration
-CLIENT_CONFIG = {
-    "web": {
-        "client_id": CLIENT_ID,
-        "client_secret": CLIENT_SECRET,
-        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-        "token_uri": "https://oauth2.googleapis.com/token",
-        "redirect_uris": [REDIRECT_URI]
-    }
-}
-
-SCOPES = ['openid', 'email', 'profile']
-
-# Store state tokens temporarily (in production, use Redis or similar)
-state_tokens = {}
-
-@router.get("/google_auth/login")
-@public_route()
-async def google_login(request: Request):
-    """Initiate Google OAuth2 login flow"""
-    if not CLIENT_ID or not CLIENT_SECRET:
-        raise HTTPException(status_code=500, detail="Google OAuth not configured")
-    
-    # Create flow instance
-    flow = google_auth_oauthlib.flow.Flow.from_client_config(
-        CLIENT_CONFIG,
-        scopes=SCOPES
-    )
-    flow.redirect_uri = REDIRECT_URI
-    
-    # Generate state token for CSRF protection
-    state = secrets.token_urlsafe(32)
-    authorization_url, _ = flow.authorization_url(
-        access_type='offline',
-        state=state,
-        prompt='select_account'
-    )
-    
-    # Store state token
-    state_tokens[state] = True
-    
-    return RedirectResponse(url=authorization_url)
-
-@router.get("/google_auth/callback")
-@public_route()
-async def google_callback(request: Request, code: str, state: str):
-    """Handle Google OAuth2 callback"""
-    # Verify state token
-    if state not in state_tokens:
-        return RedirectResponse(url="/login?error=Invalid+state+token")
-    
-    # Remove used state token
-    del state_tokens[state]
-    
-    try:
-        # Create flow instance
-        flow = google_auth_oauthlib.flow.Flow.from_client_config(
-            CLIENT_CONFIG,
-            scopes=SCOPES,
-            state=state
-        )
-        flow.redirect_uri = REDIRECT_URI
-        
-        # Exchange authorization code for tokens
-        flow.fetch_token(code=code)
-        
-        # Get user info from ID token
-        credentials = flow.credentials
-        request_session = requests.Request()
-        id_info = id_token.verify_oauth2_token(
-            credentials.id_token,
-            request_session,
-            CLIENT_ID
-        )
-        
-        # Extract user information
-        google_id = id_info['sub']
-        email = id_info['email']
-        name = id_info.get('name', email.split('@')[0])
-        email_verified = id_info.get('email_verified', False)
-        
-        # Create username from email or name
-        username = f"google_{google_id[:8]}"
-        
-        # Check if user exists
-        existing_user = await service_manager.get_user_data(username)
-        
-        if not existing_user:
-            # Create new user
-            user_data = UserCreate(
-                username=username,
-                email=email,
-                password=secrets.token_urlsafe(32)  # Random password for OAuth users
-            )
-            
-            # Create user with email already verified if Google verified it
-            await service_manager.create_user(
-                user_data,
-                roles=["user"],
-                skip_verification=email_verified
-            )
-            
-            # Update user metadata with Google info
-            user_dir = os.path.join("data/users", username)
-            google_info = {
-                "google_id": google_id,
-                "name": name,
-                "picture": id_info.get('picture', ''),
-                "locale": id_info.get('locale', ''),
-                "auth_method": "google_oauth"
-            }
-            with open(os.path.join(user_dir, "google_info.json"), 'w') as f:
-                json.dump(google_info, f, indent=2)
-        
-        # Create JWT token
-        user_data = await service_manager.get_user_data(username)
-        access_token = create_access_token(data={"sub": username, **user_data.dict()})
-        
-        # Create response with redirect
-        response = RedirectResponse(url="/", status_code=303)
-        
-        # Set cookie
-        response.set_cookie(
-            key="access_token",
-            value=access_token,
-            max_age=604800,  # 1 week
-            httponly=True,
-            samesite="Lax"
-        )
-        
-        return response
-        
-    except Exception as e:
-        print(f"Google OAuth error: {e}")
-        import traceback
-        traceback.print_exc()
-        return RedirectResponse(
-            url="/login?error=Google+authentication+failed",
-            status_code=303
-        )
-
-@router.get("/google_auth/config_check")
-@public_route()
-async def config_check():
-    """Check if Google OAuth is configured"""
-    return {
-        "configured": bool(CLIENT_ID and CLIENT_SECRET),
-        "redirect_uri": REDIRECT_URI
-    }