mindroot 8.8.0__tar.gz → 8.10.0__tar.gz

{mindroot-8.8.0 → mindroot-8.10.0}/MANIFEST.in

@@ -32,3 +32,4 @@ recursive-include src/mindroot/coreplugins/api_keys *
 recursive-include src/mindroot/coreplugins/env_manager *
 recursive-include src/mindroot/lib/plugins *.json
 
+recursive-include src/mindroot/coreplugins/google_auth *

{mindroot-8.8.0/src/mindroot.egg-info → mindroot-8.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindroot
-Version: 8.8.0
+Version: 8.10.0
 Summary: MindRoot AI Agent Framework
 Requires-Python: >=3.9
 License-File: LICENSE
@@ -30,4 +30,7 @@ Requires-Dist: bcrypt
 Requires-Dist: rich
 Requires-Dist: colorama
 Requires-Dist: python-dotenv
+Requires-Dist: google-auth
+Requires-Dist: google-auth-oauthlib
+Requires-Dist: google-auth-httplib2
 Dynamic: license-file

{mindroot-8.8.0 → mindroot-8.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mindroot"
-version = "8.8.0"
+version = "8.10.0"
 description = "MindRoot AI Agent Framework"
 requires-python = ">=3.9"
 dependencies = [
@@ -33,9 +33,11 @@ dependencies = [
     "bcrypt",
     "rich",
     "colorama",
-    "python-dotenv"
+    "python-dotenv",
+    "google-auth",
+    "google-auth-oauthlib",
+    "google-auth-httplib2"
 ]
 
 [project.scripts]
 mindroot = "mindroot.server:main"
-

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/admin/static/js/agent-form.js

@@ -67,6 +67,10 @@ class AgentForm extends BaseEl {
       background: rgba(255, 255, 255, 0.02);
     }
 
+    .form-hidden-when-no-agent {
+      display: none !important;
+    }
+
     .form-group {
       margin-bottom: 15px;
     }
@@ -1030,13 +1034,26 @@ class AgentForm extends BaseEl {
   }
 
   _render() {
+    // Default structure for rendering when this.agent is null
+    // This ensures the DOM structure is present but hidden.
+    const agentForRender = this.agent || {
+      name: '',
+      persona: '',
+      instructions: '',
+      technicalInstructions: '',
+      uncensored: false,
+      thinking_level: 'off',
+      // commands, preferred_providers, etc., are handled by helper functions
+      // which use optional chaining (this.agent?.property) and are safe.
+    };
+
     return html`
       <div class="agent-selector">
         <select @change=${this.handleAgentChange} 
                 .value=${this.selectedAgentName || ''}>
           <option value="">Select an agent</option>
           ${this.agents.map(agent => html`
-            <option value=${agent.name} ?selected=${agent.name === this.selectedAgentName}>${agent.name}</option>
+            <option .value=${agent.name} ?selected=${agent.name === this.selectedAgentName}>${agent.name}</option>
           `)}
         </select>
         <button class="btn btn-secondary" @click=${this.handleNewAgent}>
@@ -1044,23 +1061,22 @@ class AgentForm extends BaseEl {
         </button>
       </div>
 
-      ${this.agent ? html`
-        <form class="agent-form" @submit=${this.handleSubmit}>
+      <form class="agent-form ${!this.agent ? 'form-hidden-when-no-agent' : ''}" @submit=${this.handleSubmit}>
           <div class="form-group">
             <label class="required">Name:</label>
             <input type="text" name="name" 
-                   .value=${this.agent.name || ''} 
+                   .value=${agentForRender.name || ''} 
                    @input=${this.handleInputChange}>
           </div>
 
           <div class="form-group">
             <label class="required">Persona:</label>
             <select name="persona" 
-                    value=${this.agent.persona || ''}
+                    .value=${agentForRender.persona || ''}
                     @change=${this.handleInputChange}>
               <option value="">Select a persona</option>
               ${this.personas.map(persona => html`
-                <option value="${persona.name}" ?selected=${persona.name === this.agent.persona}>${persona.name}</option>
+                <option value="${persona.name}" ?selected=${persona.name === agentForRender.persona}>${persona.name}</option>
               `)}
             </select>
           </div>
@@ -1084,11 +1100,11 @@ class AgentForm extends BaseEl {
             </div>
             ${this.showInstructionsEditor ? html`
               <textarea name="instructions" 
-                      .value=${this.agent.instructions || ''}
+                      .value=${agentForRender.instructions || ''}
                       @input=${this.handleInputChange}></textarea>
             ` : html`
               <div class="markdown-preview">
-                ${unsafeHTML(this.renderMarkdown(this.agent.instructions || ''))}
+                ${unsafeHTML(this.renderMarkdown(agentForRender.instructions || ''))}
               </div>
             `}
           </div>
@@ -1112,11 +1128,11 @@ class AgentForm extends BaseEl {
             </div>
             ${this.showTechnicalInstructionsEditor ? html`
               <textarea name="technicalInstructions" 
-                      .value=${this.agent.technicalInstructions || ''}
+                      .value=${agentForRender.technicalInstructions || ''}
                       @input=${this.handleInputChange}></textarea>
             ` : html`
               <div class="markdown-preview">
-                ${unsafeHTML(this.renderMarkdown(this.agent.technicalInstructions || ''))}
+                ${unsafeHTML(this.renderMarkdown(agentForRender.technicalInstructions || ''))}
               </div>
             `}
           </div>
@@ -1125,7 +1141,7 @@ class AgentForm extends BaseEl {
             <label>
               Uncensored:
               <toggle-switch 
-                .checked=${this.agent.uncensored || false}
+                .checked=${agentForRender.uncensored || false}
                 @toggle-change=${(e) => this.handleInputChange({ 
                   target: { 
                     name: 'uncensored', 
@@ -1140,22 +1156,22 @@ class AgentForm extends BaseEl {
           <div class="form-group reasoning-level-group">
             <label>Reasoning Effort:</label>
             <select name="thinking_level" 
-                   value=${this.agent.thinking_level || 'off'}
+                   .value=${agentForRender.thinking_level || 'off'}
                    @change=${this.handleInputChange}>
               <option value="off" 
-                     ?selected=${(this.agent.thinking_level || 'off') === 'off'}>
+                     ?selected=${(agentForRender.thinking_level || 'off') === 'off'}>
                 Off
               </option> 
               <option value="low" 
-                     ?selected=${(this.agent.thinking_level || 'off') === 'low'}>
+                     ?selected=${(agentForRender.thinking_level || 'off') === 'low'}>
                 Low
               </option>
               <option value="medium" 
-                     ?selected=${(this.agent.thinking_level || 'off') === 'medium'}>
+                     ?selected=${(agentForRender.thinking_level || 'off') === 'medium'}>
                 Medium
               </option>
               <option value="high" 
-                     ?selected=${(this.agent.thinking_level || 'off') === 'high'}>
+                     ?selected=${(agentForRender.thinking_level || 'off') === 'high'}>
                 High
               </option>
             </select>
@@ -1184,11 +1200,11 @@ class AgentForm extends BaseEl {
             </details>
           </div>
 
-          ${this.agent.name && this.missingCommands && Object.keys(this.missingCommands).length > 0 ? html`
+          ${this.agent?.name && this.missingCommands && Object.keys(this.missingCommands).length > 0 ? html`
             <div class="form-group commands-section">
               <details>
                 <summary>Missing Commands (${Object.keys(this.missingCommands).length})</summary>
-                <missing-commands .agentName=${this.agent.name}></missing-commands>
+                <missing-commands .agentName=${this.agent.name}></missing-commands> <!-- this.agent.name is safe due to condition -->
               </details>
             </div>
           ` : ''}
@@ -1203,13 +1219,13 @@ class AgentForm extends BaseEl {
           <button class="btn" type="submit" ?disabled=${this.loading}>
             ${this.loading ? 'Saving...' : 'Save'}
           </button>
-          
-        </form>
-      ` : html`
+      </form>
+
+      ${!this.agent ? html`
         <div class="no-agent-message">
           Select an agent from the dropdown above or click "New Agent" to create one.
         </div>
-      `}
+      ` : ''}
     `;
    }
 }

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/admin/static/js/plugin-advanced-install.js

@@ -112,8 +112,19 @@ export class PluginAdvancedInstall extends PluginBase {
       return;
     }
 
-    // Extract repo name from URL
-    const repoName = githubUrl.split('/').pop();
+    // Extract repo name from URL - handle various GitHub URL formats
+    let repoPath = githubUrl;
+    
+    // Handle full GitHub URLs
+    if (githubUrl.includes('github.com/')) {
+      const match = githubUrl.match(/github\.com\/([^/]+\/[^/]+)/);
+      if (match) {
+        repoPath = match[1];
+      }
+    }
+    
+    // Extract just the repo name for display
+    const repoName = repoPath.split('/').pop();
 
     try {
       // Close the modal
@@ -122,27 +133,39 @@ export class PluginAdvancedInstall extends PluginBase {
       // Open the installation dialog
       this.installDialog.open(repoName || 'GitHub Plugin', 'GitHub');
       
-      // Show initial message
-      this.installDialog.addOutput(`Starting installation of ${repoName} from GitHub...`, 'info');
+      // Connect to SSE endpoint for streaming GitHub installation
+      // Build URL with properly encoded parameters
+      const params = new URLSearchParams();
+      params.append('plugin', repoName || 'plugin');
+      params.append('source', 'github');
+      params.append('source_path', repoPath);
       
-      try {
-        // Use the existing GitHub installation endpoint which handles the download and extraction
-        await this.apiCall('/plugin-manager/install-x-github-plugin', 'POST', {
-          plugin: repoName || 'plugin',
-          url: githubUrl
-        });
-        
-        // Show success message
-        this.installDialog.addOutput(`Plugin ${repoName} installed successfully from GitHub`, 'success');
+      const eventSource = new EventSource(`/plugin-manager/stream-install-plugin?${params.toString()}`);
+      
+      eventSource.addEventListener('message', (event) => {
+        this.installDialog.addOutput(event.data, 'info');
+      });
+      
+      eventSource.addEventListener('error', (event) => {
+        this.installDialog.addOutput(event.data, 'error');
+      });
+      
+      eventSource.addEventListener('warning', (event) => {
+        this.installDialog.addOutput(event.data, 'warning');
+      });
+      
+      eventSource.addEventListener('complete', (event) => {
+        this.installDialog.addOutput(event.data, 'success');
         this.installDialog.setComplete(false);
-        
-        // Notify parent components to refresh their lists
-        this.dispatch('plugin-installed');
-      } catch (error) {
-        // Show error message
-        this.installDialog.addOutput(`Failed to install plugin from GitHub: ${error.message}`, 'error');
+        eventSource.close();
+        // Dispatch event for parent components to refresh their lists
+        this.dispatch('plugin-installed', { plugin: { name: repoName, source: 'github' } });
+      });
+      
+      eventSource.onerror = () => {
+        eventSource.close();
         this.installDialog.setComplete(true);
-      }
+      };
     } catch (error) {
       this.installDialog.addOutput(`Failed to install plugin from GitHub: ${error.message}`, 'error');
       this.installDialog.setComplete(true);

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/agent/templates/system.jinja2

@@ -357,3 +357,21 @@ If you do not do this, then your reasoning will not make it into the chat histor
 and you will end up repeating the same thought process after every command!
 
 {% endblock %}
+
+{% block reasoning_reminder_3 %}
+
+# Reasonable Reasoning for Commands
+
+IMPORTANT: 
+
+If you have a built-in thinking/reasoning stage and are handling a multiple step
+or iterative process, **DO NOT TRY TO PLAN THE DETAILS OF ALL STEPS IN ADVANCE**.
+Your built-in reasoning efforts are discarded after each batch of commands you output.
+So planning all of the remaining steps in advance each time is very wasteful.
+Instead, you should **only plan for the next few commands that you need to execute**.
+Then you can adjust based on the output of your commands which will be returned
+by the system.
+
+{% endblock %}
+
+

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/chat/commands.py

@@ -127,7 +127,15 @@ async def delegate_task(instructions: str, agent_name, log_id=None, retries=3, c
     Note: do not specify any other arguments than those in the example.
     In particular, 'context' is not a valid argument!
 
-    Use something unique for the log_id.
+    log_id is optional, if you specify it you must use something unique.
+
+    You can also let the system assign log_id automatically:
+
+    Example:
+
+    { "delegate_task": { "instructions": "Write a poem about the moon", "agent_name": "poet" } }
+
+
     """
     print("in delegate task, context is:")
     print(context)
@@ -140,8 +148,9 @@ async def delegate_task(instructions: str, agent_name, log_id=None, retries=3, c
         elif 'llm' in context.data:
             llm = context.data['llm']
     (text, full_results, xx) = await service_manager.run_task(instructions, user=context.username, log_id=log_id,
+                                                              parent_log_id = context.log_id,
                                                               llm=llm, agent_name=agent_name, retries=retries, context=None)
-    return f"""<a href="/session/{agent_name}/{log_id}" target="_blank">Task completed in log ID: {log_id}</a>\nResults:\n\n{text}"""
+    return f"""<a href="/session/{agent_name}/{log_id}" target="_blank">Task completed with log ID: {log_id}</a>\nResults:\n\n{text}"""
 
 
 @command()

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/chat/router.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, HTTPException, Request, Response
+from fastapi import APIRouter, HTTPException, Request, Response, Depends
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi import File, UploadFile, Form
 from sse_starlette.sse import EventSourceResponse
@@ -6,6 +6,7 @@ from .models import MessageParts
 from lib.providers.services import service, service_manager
 from .services import init_chat_session, send_message_to_agent, subscribe_to_agent_messages, get_chat_history, run_task
 from lib.templates import render
+from lib.auth.auth import require_user
 from lib.plugins import list_enabled
 import nanoid
 from lib.providers.commands import *
@@ -17,6 +18,8 @@ from lib.providers.commands import command_manager
 from lib.utils.debug import debug_box
 from lib.session_files import load_session_data, save_session_data
 import os
+import json
+from lib.chatcontext import ChatContext
 import shutil
 from pydantic import BaseModel
 
@@ -241,6 +244,50 @@ async def get_token_count(request: Request, log_id: str):
     
     return {"status": "ok", "token_counts": token_counts}
 
+@router.get("/chat/del_session/{log_id}")
+async def delete_chat_session(request: Request, log_id: str, user=Depends(require_user)):
+    """
+    Delete a chat session by log_id, including chat logs, context files, and all child sessions.
+    
+    Parameters:
+    - log_id: The log ID of the session to delete
+    
+    Returns:
+    - JSON with success status and message
+    """
+    try:
+        # Try to determine the agent name from the context file first
+        agent_name = "unknown"
+        context_file_path = f"data/context/{user.username}/context_{log_id}.json"
+        
+        if os.path.exists(context_file_path):
+            try:
+                with open(context_file_path, 'r') as f:
+                    context_data = json.load(f)
+                    agent_name = context_data.get('agent_name', 'unknown')
+                    print(f"Found agent name '{agent_name}' from context file for log_id {log_id}")
+            except Exception as e:
+                print(f"Error reading context file {context_file_path}: {e}")
+        
+        # If we still don't have the agent name, try to find the chatlog file
+        if agent_name == "unknown":
+            from lib.chatlog import find_chatlog_file
+            chatlog_path = find_chatlog_file(log_id)
+            if chatlog_path:
+                # Extract agent from path: data/chat/{user}/{agent}/chatlog_{log_id}.json
+                path_parts = chatlog_path.split(os.sep)
+                if len(path_parts) >= 3:
+                    agent_name = path_parts[-2]  # Agent is the second-to-last part
+                    print(f"Found agent name '{agent_name}' from chatlog file path for log_id {log_id}")
+        
+        await ChatContext.delete_session_by_id(log_id=log_id, user=user.username, agent=agent_name, cascade=True)
+        
+        return {"status": "ok", "message": f"Chat session {log_id} deleted successfully"}
+    except Exception as e:
+        print(f"Error deleting chat session {log_id}: {e}")
+        raise HTTPException(status_code=500, detail=f"Error deleting chat session: {str(e)}")
+
+
 @router.get("/chat/{log_id}/tokens")
 async def get_token_count(request: Request, log_id: str):
     """

{mindroot-8.8.0 → mindroot-8.10.0}/src/mindroot/coreplugins/chat/services.py

@@ -50,7 +50,8 @@ def results_text_output(results):
 
     
 @service()
-async def run_task(instructions: str, agent_name:str = None, user:str = None, log_id=None, llm=None, retries=3, context=None):
+async def run_task(instructions: str, agent_name:str = None, user:str = None, log_id=None, 
+                   parent_log_id=None, llm=None, retries=3, context=None):
     """
     Run a task with the given instructions
     IMPORTANT NOTE: agent must have the task_result() command enabled.
@@ -70,10 +71,11 @@ async def run_task(instructions: str, agent_name:str = None, user:str = None, lo
         context.username = user
         context.name = agent_name
         context.log_id = log_id
+        context.parent_log_id = parent_log_id
         context.agent = await service_manager.get_agent_data(agent_name)
         context.data['llm'] = llm
         context.current_model = llm
-        context.chat_log = ChatLog(log_id=log_id, agent=agent_name, user=user)
+        context.chat_log = ChatLog(log_id=log_id, agent=agent_name, user=user, parent_log_id=parent_log_id)
         context.save_context()
     else:
         debug_box("Context is not none")

mindroot-8.10.0/src/mindroot/coreplugins/google_auth/README.md

@@ -0,0 +1,76 @@
+# 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-8.10.0/src/mindroot/coreplugins/google_auth/inject/login.jinja2

@@ -0,0 +1,69 @@
+{% 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-8.10.0/src/mindroot/coreplugins/google_auth/mod.py

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