mindroot 7.7.0__py3-none-any.whl → 8.2.0__py3-none-any.whl

mindroot/coreplugins/admin/static/js/server-control.js

@@ -5,7 +5,8 @@ class ServerControl extends BaseEl {
   static properties = {
     status: { type: String },
     loading: { type: Boolean },
-    method: { type: String }
+    method: { type: String },
+    monitorActive: { type: Boolean }
   };
 
   static styles = css`
@@ -96,6 +97,11 @@ class ServerControl extends BaseEl {
       margin-left: 0.5rem;
     }
 
+    .monitor-status {
+      font-style: italic;
+      margin-left: 0.5rem;
+    }
+
     @keyframes spin {
       100% { transform: rotate(360deg); }
     }
@@ -110,6 +116,56 @@ class ServerControl extends BaseEl {
     this.status = '';
     this.loading = false;
     this.method = '';
+    this.monitorActive = false;
+    this.monitorIntervalId = null;
+  }
+
+  // Function to check if server is online
+  async checkServerStatus() {
+    try {
+      const response = await fetch('/admin/server/ping', { 
+        method: 'GET',
+        cache: 'no-store',
+        headers: { 'Cache-Control': 'no-cache' }
+      });
+      return response.ok;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  // Start monitoring server status
+  startServerMonitor() {
+    if (this.monitorActive) return; // Don't start if already monitoring
+    
+    this.monitorActive = true;
+    let checkCount = 0;
+    const maxChecks = 120; // Maximum 2 minutes of checking
+    
+    this.monitorIntervalId = setInterval(async () => {
+      checkCount++;
+      this.status = `Checking server status${'.'.repeat(checkCount % 4)} (${checkCount}s)`;
+      
+      const isOnline = await this.checkServerStatus();
+      
+      if (isOnline) {
+        this.stopMonitoring();
+        this.status = 'Server is back online! Refreshing page...';
+        setTimeout(() => window.location.reload(), 1000);
+      } else if (checkCount >= maxChecks) {
+        this.stopMonitoring();
+        this.status = 'Server did not come back online after 2 minutes. Please refresh manually.';
+      }
+    }, 1000);
+  }
+
+  // Stop monitoring
+  stopMonitoring() {
+    if (this.monitorIntervalId) {
+      clearInterval(this.monitorIntervalId);
+      this.monitorIntervalId = null;
+    }
+    this.monitorActive = false;
   }
 
   async handleRestart() {
@@ -128,12 +184,9 @@ class ServerControl extends BaseEl {
         this.status = result.message;
         this.method = result.method;
         
-        // For PM2 and mindroot methods, we'll reload after a delay
+        // Start monitoring server status
         if (result.method === 'pm2' || result.method === 'mindroot') {
-          setTimeout(() => {
-            this.status = 'Attempting to reconnect...';
-            window.location.reload();
-          }, 5000);
+          this.startServerMonitor();
         }
       } else {
         throw new Error(`${result.message}${result.method ? ` (${result.method})` : ''}`);
@@ -146,6 +199,12 @@ class ServerControl extends BaseEl {
     }
   }
 
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    // Clean up interval when component is removed
+    this.stopMonitoring();
+  }
+
   async handleStop() {
     if (!confirm('Are you sure you want to stop the server? You will need to restart it manually unless using PM2.')) return;
     
@@ -200,7 +259,10 @@ class ServerControl extends BaseEl {
                 <span class="material-icons">${this.method === 'pm2' ? 'cloud_queue' : 'terminal'}</span>
                 ${this.method}
               </span>
+              ${this.monitorActive ? html`
+              <span class="monitor-status">Monitoring server status...</span>
             ` : ''}
+          ` : ''}
           </div>
         ` : ''}
       </div>

mindroot/coreplugins/agent/agent.py

@@ -275,6 +275,10 @@ class Agent:
             if buffer[0] == '{':
                 buffer = "[" + buffer
 
+            # happened with Qwen 3 for some reason
+            buffer = buffer.replace('}] <>\n\n[{','}, {')
+            buffer = buffer.replace('}] <>\n[{','}, {')
+
             commands, partial_cmd = parse_streaming_commands(buffer)
 
             if isinstance(commands, int):

mindroot/coreplugins/chat/models.py

@@ -21,4 +21,3 @@ class ImageMessagePart(BaseModel):
 
 # Use Union to create a discriminated union type
 MessageParts = Union[TextMessagePart, ImageMessagePart]
-

mindroot/coreplugins/chat/router.py

@@ -1,5 +1,6 @@
 from fastapi import APIRouter, HTTPException, Request, Response
 from fastapi.responses import HTMLResponse, RedirectResponse
+from fastapi import File, UploadFile, Form
 from sse_starlette.sse import EventSourceResponse
 from .models import MessageParts
 from lib.providers.services import service, service_manager
@@ -15,6 +16,8 @@ from lib.providers.services import service, service_manager
 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 shutil
 from pydantic import BaseModel
 
 router = APIRouter()
@@ -189,3 +192,31 @@ async def run_task_route(request: Request, agent_name: str, task_request: TaskRe
     return {"status": "ok", "results": task_result, "full_results": full_results, "log_id": log_id}
 
 
+@router.post("/chat/{log_id}/upload")
+async def upload_file(request: Request, log_id: str, file: UploadFile = File(...)):
+    """
+    Upload a file and store it in a user-specific directory.
+    Returns the file path that can be used in messages.
+    """
+    user = request.state.user.username
+    
+    # Create user uploads directory if it doesn't exist
+    user_upload_dir = f"data/users/{user}/uploads/{log_id}"
+    os.makedirs(user_upload_dir, exist_ok=True)
+    
+    # Generate a safe filename to prevent path traversal
+    filename = os.path.basename(file.filename)
+    file_path = os.path.join(user_upload_dir, filename)
+    
+    # Save the file
+    with open(file_path, "wb") as buffer:
+        shutil.copyfileobj(file.file, buffer)
+    
+    # Return the file information
+    return {
+        "status": "ok",
+        "filename": filename,
+        "path": file_path,
+        "mime_type": file.content_type
+    }
+

mindroot/coreplugins/chat/services.py

@@ -235,6 +235,10 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
                     img = dataurl_to_pil(part['data'])
                     img_msg = await context.format_image_message(img)
                     new_parts.append(img_msg)
+                elif part['type'] == 'text' and '[UPLOADED FILE]' in part['text']:
+                    # Ensure we don't duplicate file entries
+                    if not any('[UPLOADED FILE]' in p.get('text', '') for p in new_parts):
+                        new_parts.append(part)
                 else:
                     new_parts.append(part)
             msg_to_add= {"role": "user", "content": new_parts }
@@ -248,6 +252,10 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
         results = []
         full_results = []
 
+        invalid = "ERROR, invalid response format."
+        
+        consecutive_parse_errors = 0
+
         while continue_processing and iterations < max_iterations:
             iterations += 1
             continue_processing = False
@@ -256,7 +264,23 @@ async def send_message_to_agent(session_id: str, message: str | List[MessagePart
                     if 'llm' in context.data:
                         context.current_model = context.data['llm']
     
+                parse_error = False
+
                 results, full_cmds = await agent_.chat_commands(context.current_model, context, messages=context.chat_log.get_recent())
+                for result in results:
+                    if result['cmd'] == 'UNKNOWN':
+                        consecutive_parse_errors += 1
+                        parse_error = True
+
+                if not parse_error:
+                    consecutive_parse_errors = 0
+
+                if consecutive_parse_errors > 6:
+                    raise Exception("Too many consecutive parse errors, stopping processing.")
+
+                elif consecutive_parse_errors > 3: 
+                    results.append({"cmd": "UNKNOWN", "args": { "SYSTEM WARNING: Issue valid command list or task processing will be halted. Simplify output."}})
+
                 try:
                     tmp_data3 = { "results": full_cmds }
                     tmp_data3 = await pipeline_manager.process_results(tmp_data3, context=context)

mindroot/coreplugins/chat/static/css/dark.css

@@ -961,6 +961,41 @@ tbody tr {
   width: 32px;
 }
 
+/* File attachment styles */
+.file-attachment {
+  display: inline-flex;
+  align-items: center;
+  background: rgba(30, 30, 50, 0.6);
+  border-radius: 8px;
+  padding: 8px 12px;
+  margin: 5px 0;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.file-attachment a {
+  display: flex;
+  align-items: center;
+  color: #f0f0f0;
+  text-decoration: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-attachment svg {
+  margin-right: 8px;
+  flex-shrink: 0;
+}
+
+.file-attachment:hover {
+  background: rgba(40, 40, 70, 0.8);
+}
+
+.file-attachment a:hover {
+  text-decoration: underline;
+}
+
 .left-side {
   overflow-y: auto;
 }

mindroot/coreplugins/chat/static/css/default.css

@@ -961,6 +961,41 @@ tbody tr {
   width: 32px;
 }
 
+/* File attachment styles */
+.file-attachment {
+  display: inline-flex;
+  align-items: center;
+  background: rgba(30, 30, 50, 0.6);
+  border-radius: 8px;
+  padding: 8px 12px;
+  margin: 5px 0;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.file-attachment a {
+  display: flex;
+  align-items: center;
+  color: #f0f0f0;
+  text-decoration: none;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.file-attachment svg {
+  margin-right: 8px;
+  flex-shrink: 0;
+}
+
+.file-attachment:hover {
+  background: rgba(40, 40, 70, 0.8);
+}
+
+.file-attachment a:hover {
+  text-decoration: underline;
+}
+
 .left-side {
   overflow-y: auto;
 }

mindroot/coreplugins/chat/static/js/chatform.js

@@ -10,6 +10,7 @@ class ChatForm extends BaseEl {
   static properties = {
     sender: { type: String },
     message: { type: String },
+    uploadedFiles: { type: Array },
     taskid: { type: String },
     autoSizeInput: { type: Boolean, attribute: 'auto-size-input', reflect: true }
   }
@@ -109,6 +110,49 @@ class ChatForm extends BaseEl {
         font-size: 18px;
         padding: 0;
       }
+      .file-preview-container {
+        display: none;
+        margin-bottom: 10px;
+      }
+      .file-preview-container.has-files {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 8px;
+      }
+      .file-item {
+        position: relative;
+        display: flex;
+        align-items: center;
+        background: rgba(30, 30, 50, 0.6);
+        border-radius: 4px;
+        padding: 8px 12px;
+        margin-bottom: 5px;
+      }
+      .file-icon {
+        margin-right: 8px;
+      }
+      .file-name {
+        flex-grow: 1;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        max-width: 200px;
+      }
+      .remove-file {
+        position: relative;
+        width: 24px;
+        height: 24px;
+        background: rgba(0, 0, 0, 0.3);
+        color: white;
+        border: none;
+        border-radius: 50%;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 18px;
+        padding: 0;
+      }
       .upload-container {
         display: flex;
         align-items: center;
@@ -123,12 +167,23 @@ class ChatForm extends BaseEl {
         cursor: pointer;
         color: inherit;
       }
+      .file-upload-button {
+        background: none;
+        border: none;
+        padding: 0;
+        margin-left: 8px;
+        cursor: pointer;
+        color: inherit;
+      }
       .upload-button:hover {
         opacity: 0.8;
       }
       #imageUpload {
         display: none;
       }
+      #fileUpload {
+        display: none;
+      }
       .loading {
         opacity: 0.5;
         pointer-events: none;
@@ -159,6 +214,7 @@ class ChatForm extends BaseEl {
     this.message = ''
     this.autoSizeInput = true
     this.taskid = null
+    this.uploadedFiles = []
     this.selectedImages = []
     this.isLoading = false
   }
@@ -181,6 +237,52 @@ class ChatForm extends BaseEl {
       }
       await this._processImage(file)
     }
+    console.log('File upload complete, file preview container:', this.shadowRoot.querySelector('.file-preview-container'))
+  }
+
+  async _handleFileUpload(e) {
+    const files = e.target.files
+    console.log('File upload triggered with files:', files)
+    if (!files || files.length === 0) return
+    
+    this.isLoading = true
+    this.requestUpdate()
+    
+    for (let file of files) {
+      try {
+        console.log('Processing file:', file.name, file.type, file.size)
+        const formData = new FormData()
+        formData.append('file', file)
+        
+        const response = await authenticatedFetch(`/chat/${window.log_id}/upload`, {
+          method: 'POST',
+          body: formData
+        })
+        
+        const result = await response.json()
+        console.log('Upload result:', result)
+        if (result.status === 'ok') {
+          if (this.uploadedFiles.some(f => f.filename === result.filename)) {
+            console.log('File already uploaded:', result.filename)
+            continue
+          }
+          this.uploadedFiles.push({
+            filename: result.filename,
+            path: result.path,
+            mime_type: result.mime_type
+          })
+          console.log('Updated uploadedFiles:', this.uploadedFiles)
+        }
+      } catch (error) {
+        console.error('Error uploading file:', error)
+      }
+    }
+    
+    this._updateFilePreviews()
+    this.isLoading = false
+    this.requestUpdate()
+    e.target.value = '' // Reset file input
+    console.log('File upload complete, file preview container:', this.shadowRoot.querySelector('.file-preview-container'))
   }
 
   _resizeTextarea() {
@@ -249,6 +351,47 @@ class ChatForm extends BaseEl {
     }
   }
 
+  _updateFilePreviews() {
+    console.log('Updating file previews with files:', this.uploadedFiles)
+    const container = this.shadowRoot ? this.shadowRoot.querySelector('.file-preview-container') : null
+    if (!container) {
+      console.error('File preview container not found!')
+      return
+    } else {
+      container.style.display = 'block'  // Make sure the container is visible
+    }
+    
+    container.innerHTML = ''
+    
+    if (this.uploadedFiles.length > 0) {
+      container.classList.add('has-files')
+      this.uploadedFiles.forEach((file, index) => {
+        console.log('Creating file item for:', file.filename)
+        const fileItem = document.createElement('div')
+        fileItem.className = 'file-item'
+        fileItem.innerHTML = `
+          <div class="file-icon">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
+              <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+            </svg>
+          </div>
+          <div class="file-name">${file.filename}</div>
+          <button class="remove-file" data-index="${index}">×</button>
+        `
+        fileItem.querySelector('.remove-file').addEventListener('click', () => this._removeFile(index))
+        container.appendChild(fileItem)
+      })
+    } else {
+      container.style.display = 'none'  // Hide the container when empty
+      container.classList.remove('has-files')
+    }
+  }
+
+  _removeFile(index) {
+    this.uploadedFiles.splice(index, 1)
+    this._updateFilePreviews()
+  }
+
   _removeImage(index) {
     this.selectedImages.splice(index, 1)
     this._updateImagePreviews()
@@ -264,6 +407,24 @@ class ChatForm extends BaseEl {
   
   firstUpdated() {
     this.messageEl = this.shadowRoot.getElementById('inp_message');
+    this.fileUploadEl = this.shadowRoot.getElementById('fileUpload');
+    
+    // Initialize file preview container
+    const filePreviewContainer = this.shadowRoot.querySelector('.file-preview-container');
+    if (!filePreviewContainer) {
+      console.error('File preview container not found in firstUpdated!');
+    } else {
+      console.log('File preview container initialized:', filePreviewContainer);
+    }
+    
+    // Check if file upload input is properly initialized
+    if (!this.fileUploadEl) {
+      console.error('File upload input not found!');
+    } else {
+      console.log('File upload input initialized:', this.fileUploadEl);
+      this.fileUploadEl.addEventListener('change', this._handleFileUpload.bind(this));
+    }
+    
     this.sendButton = this.shadowRoot.querySelector('.send_msg');
     
     const observer = new MutationObserver(() => {
@@ -308,6 +469,18 @@ class ChatForm extends BaseEl {
       })
     }
     
+    // Only add one file entry to avoid duplication
+    if (this.uploadedFiles.length > 0) {
+      const file = this.uploadedFiles[0];
+      console.log('Adding file to message:', file);
+      
+      // Create a single file entry for all uploaded files
+      messageContent.push({
+        type: 'text',
+        text: `[UPLOADED FILE] Path: ${file.path}\nFilename: ${file.filename}\nType: ${file.mime_type}`
+      });
+    }
+    
     for (let imageData of this.selectedImages) {
       messageContent.push({
         type: 'image',
@@ -327,7 +500,9 @@ class ChatForm extends BaseEl {
     this.dispatch('addmessage', ev_)
     this.messageEl.value = ''
     this.selectedImages = []
+    this.uploadedFiles = []
     this._updateImagePreviews()
+    this._updateFilePreviews()
     this._resizeTextarea()
     this.requestUpdate()
   }
@@ -338,6 +513,7 @@ class ChatForm extends BaseEl {
 
       <div class="chat-entry flex py-2 ${this.isLoading ? 'loading' : ''}">
         <div class="message-container">
+          <div class="file-preview-container"></div>
           <div class="image-preview-container"></div>
           <div class="upload-container">
             <label class="upload-button" title="Upload image">
@@ -348,6 +524,15 @@ class ChatForm extends BaseEl {
                 <path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14zm-5-7l-3 3.72L9 13l-3 4h12l-4-5z"/>
               </svg>
             </label>
+            <label class="file-upload-button" title="Upload file">
+              <input type="file" id="fileUpload"
+                     @change=${this._handleFileUpload} 
+                     multiple>
+              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 16 16">
+                <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
+                <path d="M8 6.5a.5.5 0 0 1 .5.5v1.5H10a.5.5 0 0 1 0 1H8.5V11a.5.5 0 0 1-1 0V9.5H6a.5.5 0 0 1 0-1h1.5V7a.5.5 0 0 1 .5-.5z"/>
+              </svg>
+            </label>
           </div>
             <textarea id="inp_message" class="message-input"
               @keydown=${(e) => {

mindroot/coreplugins/env_manager/__init__.py

@@ -0,0 +1,3 @@
+# Import required modules for plugin to load properly
+from .mod import *
+from .router import router

mindroot/coreplugins/env_manager/inject/admin.jinja2

@@ -0,0 +1,16 @@
+{% block head %}
+<link rel="stylesheet" href="/env_manager/static/css/env-manager.css">
+<script type="module" src="/env_manager/static/js/env-manager.js"></script>
+{% endblock %}
+
+{% block content %}
+<details>
+  <summary>
+    <span class="material-icons">settings_applications</span>
+    <span>Environment Variables</span>
+  </summary>
+  <div class="details-content">
+    <env-manager theme="dark" scope="local"></env-manager>
+  </div>
+</details>
+{% endblock %}