mindroot 9.6.0__py3-none-any.whl → 9.8.0__py3-none-any.whl

mindroot/coreplugins/admin/router.py

@@ -29,6 +29,12 @@ async def get_admin_html():
     html = await render('admin', {"log_id": log_id})
     return html
 
+@admin_router.get("/admin/model-preferences-v2", response_class=HTMLResponse)
+async def get_model_preferences_v2_html():
+    """Serve the new Model Preferences V2 page"""
+    html = await render('model-preferences-v2', {})
+    return html
+
 @admin_router.post("/admin/get-version-info")
 async def get_version_info():
     """Get version information, trying git first, then falling back to cached file."""

mindroot/coreplugins/admin/settings_router.py

@@ -10,6 +10,12 @@ from lib.db.organize_models import organize_for_display
 from copy import deepcopy
 from .service_models import get_service_models_from_providers
 
+# Import the new v2 preferences system with try/except for backward compatibility
+try:
+    from lib.providers.model_preferences_v2 import ModelPreferencesV2
+except ImportError:
+    ModelPreferencesV2 = None
+
 router = APIRouter()
 
 SETTINGS_FILE_PATH = 'data/preferred_models.json'
@@ -160,3 +166,77 @@ async def get_organized_models():
 async def get_equivalent_flags():
     return read_equivalent_flags()
 
+# NEW V2 ENDPOINTS - These are additive and don't affect existing functionality
+
+@router.get('/settings_v2', response_model=Dict[str, List[List[str]]])
+async def get_settings_v2():
+    """Get preferences in new v2 format: {service: [[provider, model], ...]}"""
+    if ModelPreferencesV2 is None:
+        raise HTTPException(status_code=501, detail="Model Preferences V2 not available")
+    
+    try:
+        prefs_manager = ModelPreferencesV2()
+        return prefs_manager.get_preferences()
+    except Exception as e:
+        print(f"Error getting v2 preferences: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.post('/settings_v2')
+async def save_settings_v2(request: Request):
+    """Save preferences in new v2 format."""
+    if ModelPreferencesV2 is None:
+        raise HTTPException(status_code=501, detail="Model Preferences V2 not available")
+    
+    try:
+        body = await request.json()
+        print(f"Received v2 preferences: {body}")
+        
+        # Validate format: should be {service: [[provider, model], ...]}
+        if not isinstance(body, dict):
+            raise ValueError("Preferences must be a dictionary")
+        
+        for service, provider_model_pairs in body.items():
+            if not isinstance(provider_model_pairs, list):
+                raise ValueError(f"Service '{service}' must have a list of provider/model pairs")
+            
+            for pair in provider_model_pairs:
+                if not isinstance(pair, list) or len(pair) != 2:
+                    raise ValueError(f"Each provider/model pair must be a list of exactly 2 items")
+                if not all(isinstance(item, str) for item in pair):
+                    raise ValueError(f"Provider and model names must be strings")
+        
+        prefs_manager = ModelPreferencesV2()
+        prefs_manager.save_preferences(body)
+        
+        return {"success": True, "message": "Preferences saved successfully"}
+        
+    except Exception as e:
+        print(f"Error saving v2 preferences: {e}")
+        raise HTTPException(status_code=422, detail=str(e))
+
+@router.post('/migrate_settings')
+async def migrate_settings():
+    """One-time migration from old format to new v2 format."""
+    if ModelPreferencesV2 is None:
+        raise HTTPException(status_code=501, detail="Model Preferences V2 not available")
+    
+    try:
+        # Get old format preferences
+        old_preferences = read_settings()
+        
+        # Convert to new format
+        prefs_manager = ModelPreferencesV2()
+        new_preferences = prefs_manager.migrate_from_old_format(old_preferences)
+        
+        # Save new format
+        prefs_manager.save_preferences(new_preferences)
+        
+        return {
+            "success": True, 
+            "message": f"Migrated {len(old_preferences)} old preferences to new format",
+            "migrated_preferences": new_preferences
+        }
+        
+    except Exception as e:
+        print(f"Error migrating preferences: {e}")
+        raise HTTPException(status_code=500, detail=str(e))

mindroot/coreplugins/admin/static/js/model-preferences-v2.js

@@ -0,0 +1,587 @@
+import { LitElement, html, css } from './lit-core.min.js';
+import { BaseEl } from './base.js';
+
+class ModelPreferencesV2 extends BaseEl {
+  static properties = {
+    preferences: { type: Object },
+    serviceModels: { type: Object },
+    loading: { type: Boolean },
+    saving: { type: Boolean },
+    selectedService: { type: String },
+    availableServices: { type: Array }
+  };
+
+  static styles = css`
+    :host {
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
+
+    .preferences-v2-container {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      max-width: 1200px;
+      margin: 0 auto;
+      gap: 20px;
+    }
+
+    .section {
+      background: rgb(10, 10, 25);
+      border-radius: 8px;
+      padding: 1rem;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+    }
+
+    .section h3 {
+      margin: 0 0 1rem 0;
+      color: #fff;
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+    }
+
+    .service-selector {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      margin-bottom: 1rem;
+    }
+
+    .service-selector select {
+      background: #2a2a40;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.5rem;
+      border-radius: 4px;
+      min-width: 150px;
+    }
+
+    .provider-list {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+    }
+
+    .provider-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      padding: 0.75rem;
+      background: rgba(0, 0, 0, 0.2);
+      border-radius: 4px;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+    }
+
+    .provider-item.dragging {
+      opacity: 0.5;
+    }
+
+    .drag-handle {
+      cursor: grab;
+      color: #888;
+      font-size: 1.2em;
+    }
+
+    .drag-handle:active {
+      cursor: grabbing;
+    }
+
+    .provider-info {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+    }
+
+    .provider-name {
+      font-weight: 500;
+      color: #fff;
+      min-width: 120px;
+    }
+
+    .model-select {
+      background: #2a2a40;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.5rem;
+      border-radius: 4px;
+      min-width: 200px;
+    }
+
+    .order-controls {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+    }
+
+    .order-btn {
+      background: #2a2a40;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.25rem 0.5rem;
+      border-radius: 2px;
+      cursor: pointer;
+      font-size: 0.8em;
+    }
+
+    .order-btn:hover {
+      background: #3a3a50;
+    }
+
+    .order-btn:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+
+    .remove-btn {
+      background: #402a2a;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.5rem;
+      border-radius: 4px;
+      cursor: pointer;
+    }
+
+    .remove-btn:hover {
+      background: #503a3a;
+    }
+
+    .add-provider {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      margin-top: 1rem;
+      padding: 1rem;
+      background: rgba(0, 0, 0, 0.1);
+      border-radius: 4px;
+      border: 1px dashed rgba(255, 255, 255, 0.2);
+    }
+
+    .add-provider select {
+      background: #2a2a40;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.5rem;
+      border-radius: 4px;
+    }
+
+    .add-btn {
+      background: #2a402a;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      cursor: pointer;
+    }
+
+    .add-btn:hover {
+      background: #3a503a;
+    }
+
+    .actions {
+      display: flex;
+      gap: 10px;
+      justify-content: flex-end;
+    }
+
+    .save-btn {
+      background: #2a402a;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.75rem 1.5rem;
+      border-radius: 4px;
+      cursor: pointer;
+      font-weight: 500;
+    }
+
+    .save-btn:hover {
+      background: #3a503a;
+    }
+
+    .save-btn:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+
+    .migrate-btn {
+      background: #403a2a;
+      color: #fff;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      padding: 0.75rem 1.5rem;
+      border-radius: 4px;
+      cursor: pointer;
+    }
+
+    .migrate-btn:hover {
+      background: #504a3a;
+    }
+
+    .loading {
+      text-align: center;
+      color: #888;
+      padding: 2rem;
+    }
+
+    .error {
+      color: #ff6b6b;
+      background: rgba(255, 107, 107, 0.1);
+      padding: 1rem;
+      border-radius: 4px;
+      margin-bottom: 1rem;
+    }
+
+    .success {
+      color: #51cf66;
+      background: rgba(81, 207, 102, 0.1);
+      padding: 1rem;
+      border-radius: 4px;
+      margin-bottom: 1rem;
+    }
+  `;
+
+  constructor() {
+    super();
+    this.preferences = {};
+    this.serviceModels = {};
+    this.loading = true;
+    this.saving = false;
+    this.selectedService = '';
+    this.availableServices = [];
+    this.fetchData();
+  }
+
+  async fetchData() {
+    this.loading = true;
+    try {
+      await Promise.all([
+        this.fetchPreferences(),
+        this.fetchServiceModels()
+      ]);
+      this.updateAvailableServices();
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  async fetchPreferences() {
+    try {
+      const response = await fetch('/settings_v2');
+      if (response.ok) {
+        this.preferences = await response.json();
+      } else {
+        console.log('V2 preferences not available, using empty preferences');
+        this.preferences = {};
+      }
+    } catch (error) {
+      console.error('Error fetching v2 preferences:', error);
+      this.preferences = {};
+    }
+  }
+
+  async fetchServiceModels() {
+    try {
+      const response = await fetch('/service-models');
+      this.serviceModels = await response.json();
+    } catch (error) {
+      console.error('Error fetching service models:', error);
+      this.serviceModels = {};
+    }
+  }
+
+  updateAvailableServices() {
+    const services = new Set();
+    
+    // Add services from current preferences
+    Object.keys(this.preferences).forEach(service => services.add(service));
+    
+    // Add services from available service models
+    Object.keys(this.serviceModels).forEach(service => services.add(service));
+    
+    this.availableServices = Array.from(services).sort();
+    
+    if (!this.selectedService && this.availableServices.length > 0) {
+      this.selectedService = this.availableServices[0];
+    }
+  }
+
+  handleServiceChange(event) {
+    this.selectedService = event.target.value;
+  }
+
+  moveProviderUp(index) {
+    if (index === 0) return;
+    
+    const servicePrefs = [...(this.preferences[this.selectedService] || [])];
+    [servicePrefs[index - 1], servicePrefs[index]] = [servicePrefs[index], servicePrefs[index - 1]];
+    
+    this.preferences = {
+      ...this.preferences,
+      [this.selectedService]: servicePrefs
+    };
+  }
+
+  moveProviderDown(index) {
+    const servicePrefs = this.preferences[this.selectedService] || [];
+    if (index === servicePrefs.length - 1) return;
+    
+    const newPrefs = [...servicePrefs];
+    [newPrefs[index], newPrefs[index + 1]] = [newPrefs[index + 1], newPrefs[index]];
+    
+    this.preferences = {
+      ...this.preferences,
+      [this.selectedService]: newPrefs
+    };
+  }
+
+  removeProvider(index) {
+    const servicePrefs = [...(this.preferences[this.selectedService] || [])];
+    servicePrefs.splice(index, 1);
+    
+    this.preferences = {
+      ...this.preferences,
+      [this.selectedService]: servicePrefs
+    };
+  }
+
+  updateProviderModel(index, newModel) {
+    const servicePrefs = [...(this.preferences[this.selectedService] || [])];
+    if (servicePrefs[index]) {
+      servicePrefs[index] = [servicePrefs[index][0], newModel];
+      
+      this.preferences = {
+        ...this.preferences,
+        [this.selectedService]: servicePrefs
+      };
+    }
+  }
+
+  addProvider() {
+    const providerSelect = this.shadowRoot.querySelector('.add-provider-select');
+    const modelSelect = this.shadowRoot.querySelector('.add-model-select');
+    
+    const provider = providerSelect.value;
+    const model = modelSelect.value;
+    
+    if (!provider || !model) return;
+    
+    const servicePrefs = [...(this.preferences[this.selectedService] || [])];
+    
+    // Check if this provider/model combination already exists
+    const exists = servicePrefs.some(([p, m]) => p === provider && m === model);
+    if (exists) return;
+    
+    servicePrefs.push([provider, model]);
+    
+    this.preferences = {
+      ...this.preferences,
+      [this.selectedService]: servicePrefs
+    };
+    
+    // Reset selects
+    providerSelect.value = '';
+    modelSelect.value = '';
+  }
+
+  async savePreferences() {
+    this.saving = true;
+    try {
+      const response = await fetch('/settings_v2', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(this.preferences)
+      });
+      
+      if (response.ok) {
+        this.showMessage('Preferences saved successfully!', 'success');
+      } else {
+        const error = await response.text();
+        this.showMessage(`Error saving preferences: ${error}`, 'error');
+      }
+    } catch (error) {
+      this.showMessage(`Error saving preferences: ${error.message}`, 'error');
+    } finally {
+      this.saving = false;
+    }
+  }
+
+  async migrateFromOld() {
+    try {
+      const response = await fetch('/migrate_settings', {
+        method: 'POST'
+      });
+      
+      if (response.ok) {
+        const result = await response.json();
+        this.showMessage(result.message, 'success');
+        await this.fetchPreferences();
+      } else {
+        const error = await response.text();
+        this.showMessage(`Migration failed: ${error}`, 'error');
+      }
+    } catch (error) {
+      this.showMessage(`Migration failed: ${error.message}`, 'error');
+    }
+  }
+
+  showMessage(message, type) {
+    // Simple message display - could be enhanced with a proper notification system
+    const messageEl = document.createElement('div');
+    messageEl.className = type;
+    messageEl.textContent = message;
+    
+    const container = this.shadowRoot.querySelector('.preferences-v2-container');
+    container.insertBefore(messageEl, container.firstChild);
+    
+    setTimeout(() => {
+      messageEl.remove();
+    }, 5000);
+  }
+
+  getAvailableProviders() {
+    if (!this.selectedService || !this.serviceModels[this.selectedService]) {
+      return [];
+    }
+    return Object.keys(this.serviceModels[this.selectedService]);
+  }
+
+  getAvailableModels(provider) {
+    if (!this.selectedService || !this.serviceModels[this.selectedService] || !provider) {
+      return [];
+    }
+    return this.serviceModels[this.selectedService][provider] || [];
+  }
+
+  _render() {
+    if (this.loading) {
+      return html`<div class="loading">Loading preferences...</div>`;
+    }
+
+    const currentServicePrefs = this.preferences[this.selectedService] || [];
+    const availableProviders = this.getAvailableProviders();
+
+    return html`
+      <div class="preferences-v2-container">
+        <div class="section">
+          <h3>
+            <span class="material-icons">tune</span>
+            Model Preferences V2 (Ordered Fallback)
+          </h3>
+          
+          <div class="service-selector">
+            <label>Service:</label>
+            <select @change=${this.handleServiceChange} .value=${this.selectedService}>
+              ${this.availableServices.map(service => html`
+                <option value="${service}">${service}</option>
+              `)}
+            </select>
+          </div>
+
+          ${this.selectedService ? html`
+            <div class="provider-list">
+              ${currentServicePrefs.map((providerModel, index) => {
+                const [provider, model] = providerModel;
+                const availableModels = this.getAvailableModels(provider);
+                
+                return html`
+                  <div class="provider-item">
+                    <span class="drag-handle material-icons">drag_indicator</span>
+                    
+                    <div class="provider-info">
+                      <span class="provider-name">${provider}</span>
+                      <select 
+                        class="model-select" 
+                        .value=${model}
+                        @change=${(e) => this.updateProviderModel(index, e.target.value)}
+                      >
+                        ${availableModels.map(availableModel => html`
+                          <option value="${availableModel}" ?selected=${availableModel === model}>
+                            ${availableModel}
+                          </option>
+                        `)}
+                      </select>
+                    </div>
+                    
+                    <div class="order-controls">
+                      <button 
+                        class="order-btn" 
+                        ?disabled=${index === 0}
+                        @click=${() => this.moveProviderUp(index)}
+                      >↑</button>
+                      <button 
+                        class="order-btn" 
+                        ?disabled=${index === currentServicePrefs.length - 1}
+                        @click=${() => this.moveProviderDown(index)}
+                      >↓</button>
+                    </div>
+                    
+                    <button class="remove-btn" @click=${() => this.removeProvider(index)}>
+                      <span class="material-icons">delete</span>
+                    </button>
+                  </div>
+                `;
+              })}
+            </div>
+
+            <div class="add-provider">
+              <label>Add Provider:</label>
+              <select class="add-provider-select">
+                <option value="">Select Provider</option>
+                ${availableProviders.map(provider => html`
+                  <option value="${provider}">${provider}</option>
+                `)}
+              </select>
+              
+              <label>Model:</label>
+              <select class="add-model-select">
+                <option value="">Select Model</option>
+              </select>
+              
+              <button class="add-btn" @click=${this.addProvider}>Add</button>
+            </div>
+          ` : html`<p>Select a service to configure preferences.</p>`}
+        </div>
+
+        <div class="actions">
+          <button class="migrate-btn" @click=${this.migrateFromOld}>
+            Migrate from Old Format
+          </button>
+          <button 
+            class="save-btn" 
+            ?disabled=${this.saving}
+            @click=${this.savePreferences}
+          >
+            ${this.saving ? 'Saving...' : 'Save Preferences'}
+          </button>
+        </div>
+      </div>
+    `;
+  }
+
+  updated(changedProperties) {
+    super.updated(changedProperties);
+    
+    // Update model dropdown when provider changes
+    if (changedProperties.has('selectedService')) {
+      const providerSelect = this.shadowRoot.querySelector('.add-provider-select');
+      const modelSelect = this.shadowRoot.querySelector('.add-model-select');
+      
+      if (providerSelect && modelSelect) {
+        providerSelect.addEventListener('change', (e) => {
+          const selectedProvider = e.target.value;
+          const availableModels = this.getAvailableModels(selectedProvider);
+          
+          modelSelect.innerHTML = '<option value="">Select Model</option>' +
+            availableModels.map(model => `<option value="${model}">${model}</option>`).join('');
+        });
+      }
+    }
+  }
+}
+
+customElements.define('model-preferences-v2', ModelPreferencesV2);

mindroot/coreplugins/admin/templates/admin.jinja2

@@ -20,7 +20,7 @@
   <script type="module" src="/admin/static/js/persona-editor.js"></script>
   <script type="module" src="/admin/static/js/plugin-toggle.js"></script>
   <script type="module" src="/admin/static/js/agent-editor.js"></script>
-  <script type="module" src="/admin/static/js/model-preferences.js"></script>
+  <script type="module" src="/admin/static/js/model-preferences-v2.js"></script>
   <script type="module" src="/admin/static/js/plugin-manager.js"></script>
   <script type="module" src="/admin/static/js/server-control.js"></script>
   <script type="module" src="/admin/static/js/about-info.js"></script>
@@ -119,11 +119,11 @@
 
       <details>
         <summary>
-          <span class="material-icons">settings</span>
+          <span class="material-icons">tune</span>
           <span>Model Preferences</span>
         </summary>
         <div class="details-content">
-          <model-preferences theme="dark" scope="local"></model-preferences>
+          <model-preferences-v2 theme="dark" scope="local"></model-preferences-v2>
         </div>
       </details>
     </details>
@@ -367,4 +367,4 @@ document.addEventListener('DOMContentLoaded', function() {
   {% block footer %}
   {% endblock %}
 </body>
-</html>
+</html>

mindroot/coreplugins/admin/templates/model-preferences-v2.jinja2

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Model Preferences V2</title>
+  <link rel="stylesheet" href="/admin/static/css/reset.css">
+  <link rel="stylesheet" href="/admin/static/css/default.css">
+  <link rel="stylesheet" href="/admin/static/css/admin-custom.css">
+  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
+  <script type="module" src="/admin/static/js/model-preferences-v2.js"></script>
+</head>
+<body>
+  <header class="admin-header">
+    <a href="/admin" class="logo">
+      <img src="/imgs/logo.png" class="logo"/>
+    </a>
+    <nav>
+      <a href="/admin">← Back to Admin</a>
+    </nav>
+  </header>
+  
+  <div class="admin-container">
+    <model-preferences-v2 theme="dark" scope="local"></model-preferences-v2>
+  </div>
+</body>
+</html>

mindroot/coreplugins/agent/SysAdmin/agent.json

@@ -0,0 +1,33 @@
+{
+  "name": "SysAdmin",
+  "description": "This is a sysadmin for Ubuntu Linux",
+  "hashver": "ea5e",
+  "commands": [
+    "tell_and_continue",
+    "wait_for_user_reply",
+    "markdown_await_user",
+    "append",
+    "write",
+    "read",
+    "dir",
+    "apply_udiff",
+    "execute_command",
+    "mkdir",
+    "think",
+    "task_complete"
+  ],
+  "preferred_providers": [],
+  "thinking_level": "off",
+  "persona": "Assistant",
+  "recommended_plugins": [],
+  "instructions": "\n\nYou are a sysadmin for an Ubuntu Linux system. You have root access. You are installed on a VPS.\n\nThe user may request your help with things that they might alternatively have used a control panel like Plesk for (there is no Plesk unless you install it), or for setting up libraries for software development, making nginx config files, or any system administration task.\n\nKeep track of your system info and changes etc. in /var/lib/ai-sysadmin/system-state.md . Make sure to read that at the start of each session. You can use commands like read(), write(), append(), and apply_udiff() (if necessary) as appropriate. Always double check apply_udiff() edits because they can be problematic.  If you have to rebuild the file and it's a little longer than 400 lines, use write() for the first part followed by chunks in append() (but you should be able to just put details in other files and keep this file more compact).\n\nTry to keep the file under 400 lines or so and if necessary keep supplementary files with extra details for particular in the same directory or refer to system configuration files.\n\nYou should be cautious about system changes that could render the system inoperable if they do not complete properly, because the user is relying on you to update the system. If the system stops operating due to a configuration problem, they will not be able to access your chat interface, and may not be able to recover. If you are not sure, make a backup of key files and ask the user for confirmation. \n\nHowever, for tasks that seem routine and you do not have a reason to suspect they will break the system, go ahead and execute them.\n\n## System state file\n\n/var/lib/ai-sysadmin/system-state.md\n\nNote: if this file does not exist or is blank, start by populating it concisely with key system statistics and information.\n\n## Last command\n\nBefore doing significant changes you can record what you are about to do in /var/lib/ai-sysadmin/last-change.md . This way in case there is a problem there will be a record of the last specific modification made or attempted to help with rolling it back (in addition to the backup you made of any config files edited).\n\n",
+  "technicalInstructions": "",
+  "service_models": {
+    "stream_chat": {
+      "provider": "ah_anthropic",
+      "model": "claude-opus-4-1-20250805"
+    }
+  },
+  "flags": [],
+  "required_plugins": []
+}

mindroot/coreplugins/agent/init_models.py

@@ -24,6 +24,9 @@ def init_agents():
         os.makedirs(agents_path)
     if not (agents_path / "Assistant").exists():
         shutil.copytree(assistant, agents_path / "Assistant")
+    sysadmin = script_path / "SysAdmin"
+    if not (agents_path / "SysAdmin").exists():
+        shutil.copytree(sysadmin, agents_path / "SysAdmin")
 
 init_models_and_providers()
 init_agents()

mindroot/coreplugins/jwt_auth/middleware.py

@@ -178,7 +178,7 @@ async def middleware(request: Request, call_next):
             filename = path_parts[-1]
             print(f"Checking for static file: {plugin_name} {static_part} {filename}")
             if static_part == 'static':
-                if filename.endswith('.js') or filename.endswith('.css') or filename.endswith('.png') or filename.endswith('.mp4'):
+                if filename.endswith('.js') or filename.endswith('.css') or filename.endswith('.png') or filename.endswith('.mp4') or filename.endswith('.gif'):
                     print('Static file requested:', filename)
                     return await call_next(request)
         except Exception as e:

mindroot/lib/providers/__init__.py

@@ -11,6 +11,12 @@ import sys
 import nanoid
 from termcolor import colored
 
+# Import the new v2 preferences system with try/except for backward compatibility
+try:
+    from .model_preferences_v2 import ModelPreferencesV2
+except ImportError:
+    ModelPreferencesV2 = None
+
 class ProviderManager:
 
     def __init__(self):
@@ -71,6 +77,16 @@ class ProviderManager:
 
         need_model = await uses_models(name)
 
+        # DEBUG: Check what we have for model selection
+        print(f"\n=== MODEL SELECTION DEBUG for {name} ===")
+        print(f"args[0]: {args[0] if len(args) > 0 else 'N/A'}")
+        print(f"kwargs.get('model'): {kwargs.get('model', 'N/A')}")
+        if context and hasattr(context, 'agent') and context.agent:
+            print(f"Agent service_models: {context.agent.get('service_models', 'N/A')}")
+        else:
+            print("No agent context or service_models")
+        print("=== END DEBUG ===")
+
         if (len(args) > 0 and args[0] is None) and not 'model' in kwargs or ('model' in kwargs and kwargs['model'] is None):
             print("No model specified, checking service_models")
             if context is not None and context.agent is not None and 'service_models' in context.agent:
@@ -86,6 +102,36 @@ class ProviderManager:
             else:
                 print("did not find service_models in agent")
                 print('context.agent:', context.agent)
+                
+                # NEW V2 PREFERENCES LOGIC - Only as fallback when no agent-specific model
+                if ModelPreferencesV2 is not None:
+                    try:
+                        print("No agent-specific model found, trying V2 system preferences...")
+                        prefs_manager = ModelPreferencesV2()
+                        ordered_providers = prefs_manager.get_ordered_providers_for_service(name)
+                        
+                        if ordered_providers:
+                            print(f"Found V2 preferences for {name}: {ordered_providers}")
+                            
+                            for provider_name, model_name in ordered_providers:
+                                # Check if this provider is available for this function
+                                if name in self.functions:
+                                    for func_info in self.functions[name]:
+                                        if func_info['provider'] == provider_name:
+                                            try:
+                                                print(f"Trying V2 provider {provider_name} with model {model_name}")
+                                                # Set the model as first argument if needed
+                                                if len(args) > 0 and (args[0] is None or not args[0]):
+                                                    args = (model_name, *args[1:])
+                                                elif 'model' not in kwargs:
+                                                    kwargs['model'] = model_name
+                                                
+                                                return await func_info['implementation'](*args, **kwargs)
+                                            except Exception as e:
+                                                print(f"V2 provider {provider_name} failed: {e}, trying next...")
+                                                continue
+                    except Exception as e:
+                        print(f"V2 preferences failed: {e}, continuing with existing logic")
         else:
             print("Found possible model in zeroth arg:")
             if len(args) > 0:

mindroot/lib/providers/model_preferences_v2.py

@@ -0,0 +1,165 @@
+import json
+import os
+import shutil
+from typing import Dict, List, Tuple, Optional
+from pathlib import Path
+
+class ModelPreferencesV2:
+    """New model preferences system supporting ordered provider/model pairs for fallback selection."""
+    
+    def __init__(self):
+        # Use current working directory for data (supports multiple installations)
+        self.data_dir = Path.cwd() / 'data'
+        self.preferences_file = self.data_dir / 'preferred_models_v2.json'
+        
+        # Locate template file relative to this script's location
+        script_dir = Path(__file__).parent.parent.parent / 'coreplugins' / 'admin'
+        self.template_file = script_dir / 'default_preferred_models.json'
+        
+    def ensure_preferences_exist(self) -> None:
+        """Copy template preferences file to data directory if it doesn't exist."""
+        # Ensure data directory exists
+        self.data_dir.mkdir(exist_ok=True)
+        
+        # If preferences file doesn't exist, copy from template
+        if not self.preferences_file.exists():
+            if self.template_file.exists():
+                shutil.copy2(self.template_file, self.preferences_file)
+            else:
+                # Create minimal default if template doesn't exist
+                default_prefs = {
+                    "stream_chat": [
+                        ["ah_anthropic", "claude-3-5-sonnet-20240620"],
+                        ["ah_openai", "gpt-4o"]
+                    ],
+                    "text_to_image": [
+                        ["ah_flux", "flux-dev"]
+                    ]
+                }
+                self.save_preferences(default_prefs)
+    
+    def get_preferences(self) -> Dict[str, List[List[str]]]:
+        """Get preferences in new format: {service: [[provider, model], ...]}"""
+        self.ensure_preferences_exist()
+        
+        try:
+            with open(self.preferences_file, 'r') as f:
+                return json.load(f)
+        except (FileNotFoundError, json.JSONDecodeError) as e:
+            print(f"Error reading preferences v2: {e}")
+            return {}
+    
+    def save_preferences(self, preferences: Dict[str, List[List[str]]]) -> None:
+        """Save preferences in new format."""
+        
+        # Ensure data directory exists before saving
+        self.data_dir.mkdir(exist_ok=True)
+        
+        try:
+            with open(self.preferences_file, 'w') as f:
+                json.dump(preferences, f, indent=2)
+        except Exception as e:
+            print(f"Error saving preferences v2: {e}")
+            raise
+    
+    def get_ordered_providers_for_service(self, service_name: str) -> List[Tuple[str, str]]:
+        """Get ordered list of (provider, model) pairs for a service."""
+        preferences = self.get_preferences()
+        
+        if service_name not in preferences:
+            return []
+        
+        # Convert list of lists to list of tuples
+        return [(provider, model) for provider, model in preferences[service_name]]
+    
+    def migrate_from_old_format(self, old_preferences: List[Dict]) -> Dict[str, List[List[str]]]:
+        """Convert old format preferences to new format.
+        
+        Old format: [{"service_or_command_name": "stream_chat", "flag": "default", "model": "claude-3"}]
+        New format: {"stream_chat": [["ah_anthropic", "claude-3.5-sonnet"]]}
+        """
+        new_preferences = {}
+        
+        for old_pref in old_preferences:
+            service = old_pref.get('service_or_command_name')
+            model = old_pref.get('model')
+            
+            if not service or not model:
+                continue
+            
+            # For migration, we'll need to guess the provider based on model name
+            # This is a best-effort conversion
+            provider = self._guess_provider_from_model(model)
+            
+            if service not in new_preferences:
+                new_preferences[service] = []
+            
+            # Add if not already present
+            provider_model_pair = [provider, model]
+            if provider_model_pair not in new_preferences[service]:
+                new_preferences[service].append(provider_model_pair)
+        
+        return new_preferences
+    
+    def _guess_provider_from_model(self, model_name: str) -> str:
+        """Best-effort guess of provider based on model name."""
+        model_lower = model_name.lower()
+        
+        # Common model name patterns
+        if 'claude' in model_lower:
+            return 'ah_anthropic'
+        elif 'gpt' in model_lower or 'chatgpt' in model_lower:
+            return 'ah_openai'
+        elif 'gemini' in model_lower:
+            return 'mr_gemini'
+        elif 'llama' in model_lower:
+            return 'ah_together'  # or another llama provider
+        elif 'flux' in model_lower:
+            return 'ah_flux'
+        elif 'stable' in model_lower or 'sd' in model_lower:
+            return 'ah_stability'
+        else:
+            # Default fallback
+            return 'unknown_provider'
+    
+    def add_preference(self, service: str, provider: str, model: str, position: Optional[int] = None) -> None:
+        """Add a provider/model preference for a service at specified position (or end)."""
+        preferences = self.get_preferences()
+        
+        if service not in preferences:
+            preferences[service] = []
+        
+        provider_model_pair = [provider, model]
+        
+        # Remove if already exists
+        preferences[service] = [pm for pm in preferences[service] if pm != provider_model_pair]
+        
+        # Add at specified position or end
+        if position is not None and 0 <= position <= len(preferences[service]):
+            preferences[service].insert(position, provider_model_pair)
+        else:
+            preferences[service].append(provider_model_pair)
+        
+        self.save_preferences(preferences)
+    
+    def remove_preference(self, service: str, provider: str, model: str) -> bool:
+        """Remove a provider/model preference for a service. Returns True if removed."""
+        preferences = self.get_preferences()
+        
+        if service not in preferences:
+            return False
+        
+        provider_model_pair = [provider, model]
+        
+        if provider_model_pair in preferences[service]:
+            preferences[service].remove(provider_model_pair)
+            self.save_preferences(preferences)
+            return True
+        
+        return False
+    
+    def reorder_preferences(self, service: str, ordered_pairs: List[List[str]]) -> None:
+        """Set the complete ordered list of provider/model pairs for a service."""
+        preferences = self.get_preferences()
+        preferences[service] = ordered_pairs
+        self.save_preferences(preferences)

{mindroot-9.6.0.dist-info → mindroot-9.8.0.dist-info}/METADATA

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

{mindroot-9.6.0.dist-info → mindroot-9.8.0.dist-info}/RECORD

@@ -22,10 +22,10 @@ mindroot/coreplugins/admin/plugin_router_fixed.py,sha256=LQAOOi4WdYBP4udOkVciOny
 mindroot/coreplugins/admin/plugin_router_new_not_working.py,sha256=IkmVLv9T28s0kz-rdjqdgQQIEvAYic0zjTS0HXvsi9A,5865
 mindroot/coreplugins/admin/plugin_routes.py,sha256=qthJjndFxd_PelKf2OuKXukfv1X-v-O53hDRpNLtqJA,3918
 mindroot/coreplugins/admin/registry_settings_routes.py,sha256=x739599dkE_A5uM1qQkmouo3Yzm28y7cCa2HsIpfi6U,4869
-mindroot/coreplugins/admin/router.py,sha256=FjiCZpjRQqGrmEMM_aD57NJzKGR0zmZ7ZbJlxuehq74,5683
+mindroot/coreplugins/admin/router.py,sha256=MuGRPO-v8B7QkbnOOjiRvmzrXzDS-xFtHyjj_qzJfQ0,5923
 mindroot/coreplugins/admin/server_router.py,sha256=aZ5v7QBcK1LJ2yiciUA4elY26iSGl-8m03L1h3ogvP4,4533
 mindroot/coreplugins/admin/service_models.py,sha256=53Whq4X1Ci3D4FuzG_Eyrmz66LxnyQek-mOYw38qQm8,3355
-mindroot/coreplugins/admin/settings_router.py,sha256=N2h9BY0V4VqGzcx2VBBx4aIRacF3jSsbGejPcFAk23A,5533
+mindroot/coreplugins/admin/settings_router.py,sha256=C3zhQuumSvoZXkhsCsQ3H0B3AARtyRLXBo8aiArwWsk,8794
 mindroot/coreplugins/admin/static/logo.png,sha256=YejLvBHILjTPkOBYE2t37BD8sTtXbPmLh1Zo-x8pbok,18260
 mindroot/coreplugins/admin/static/css/admin-custom.css,sha256=GZ2gxqyhzdjm1KBOQpiYl18YOOW39aoPN3Akb9gDgYU,14404
 mindroot/coreplugins/admin/static/css/dark.css,sha256=wOODR6WTWKhx0Cq8GDpY9THWwVC4LJBLc68PpYKIPzA,15597
@@ -48,6 +48,7 @@ mindroot/coreplugins/admin/static/js/markdown-renderer.js,sha256=SepuejgMmYSRm_o
 mindroot/coreplugins/admin/static/js/mcp-manager.js,sha256=o8UlP-E-Lxm4mEKUY-uqOhe-SflxIIVPfHQJqXkqDWo,8786
 mindroot/coreplugins/admin/static/js/mcp-publisher.js,sha256=Ut6wx3nUT5SfZ8TI0SmyuW8P46OJ52fkftscEg8KcKo,24330
 mindroot/coreplugins/admin/static/js/missing-commands.js,sha256=adNF9GWN981_KX7H25eOTw9QKlKIwTAsm8PGGkG5EcE,7949
+mindroot/coreplugins/admin/static/js/model-preferences-v2.js,sha256=qK5kYnMDu61xnflRw3nqOTNEkNHcxhOvQ9t3DNODfEk,15691
 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=bVp-d1y3HPocmVkHpqsVh0HiRUf77vJ43kargj1iPHk,9830
@@ -435,19 +436,21 @@ mindroot/coreplugins/admin/static/js/lit-html/node/directives/until.js,sha256=j1
 mindroot/coreplugins/admin/static/js/lit-html/node/directives/until.js.map,sha256=7xiwSZ7_fGtr5XwW-10Dzs8n9QE2VUfXaZ0Sd6d82L0,6567
 mindroot/coreplugins/admin/static/js/lit-html/node/directives/when.js,sha256=NLe0NJ-6jqjVDUrT_DzmSpREsRaLo1yarzdYcV_5xHY,181
 mindroot/coreplugins/admin/static/js/lit-html/node/directives/when.js.map,sha256=tOonih_-EaqrunhNGshA9xN--WIVdGikjg8MkVp0itQ,1534
-mindroot/coreplugins/admin/templates/admin.jinja2,sha256=RXTNDI5X4hV7zxhzW39SHo4XaSQ441MYfLr0Chbl5Bc,13266
+mindroot/coreplugins/admin/templates/admin.jinja2,sha256=H_oDqoWWk0Da0Jre67LIKvB3h30fmjcZz2T5knUyz0k,13272
+mindroot/coreplugins/admin/templates/model-preferences-v2.jinja2,sha256=5J3rXYmtp_yMTFCk85SYN03gc4lbidF0Nip6YcqcIW4,891
 mindroot/coreplugins/agent/agent.py,sha256=X-EmtrpEpdfo-iUw9gj7mLveRVzAApsDWPTwMAuv7Ww,20715
 mindroot/coreplugins/agent/cmd_start_example.py,sha256=Mdcd9st6viI6-M7a0-zqkw3IxR9FAxIiZ_8G-tLdIJk,1416
 mindroot/coreplugins/agent/command_parser.py,sha256=dgMqtVLPQWE2BU7iyjqwKGy5Gh74jcZkiy1JDs07t4E,13166
 mindroot/coreplugins/agent/ensure_msg_type.py,sha256=P2XSBs3gtjlDQLOF7808nm-Dl5jswyO6qgv0lNRyHXM,240
 mindroot/coreplugins/agent/equivalent_flags.default.json,sha256=2U-3S-gIRTDd4g6ixRL4S9Fk9w40MwFqV5MD_ObqHlo,33
 mindroot/coreplugins/agent/escaping.md,sha256=b6VdJjQ3oYhLStV-72wzHm7DhQDnnJp5gKJFkTB-Geo,2798
-mindroot/coreplugins/agent/init_models.py,sha256=WSPk5awq2P-gecbFjtcyylH2vT12qjKsQdpX0VvU7OM,791
+mindroot/coreplugins/agent/init_models.py,sha256=-o5P3NNlWmgbGltngfq5VYZ9Dm81N9kkMqTkG4p5PDA,939
 mindroot/coreplugins/agent/models.default.json,sha256=hX9-dlBWzJ-2QpMeG696hk7c483-CivujIcRRq4DcNs,1146
 mindroot/coreplugins/agent/preferred_models.default.json,sha256=Zpi6psgjhY750vyRfxN54LJM9N3afq83aL9HvmsquuU,276
 mindroot/coreplugins/agent/providers.default.json,sha256=FPmY5qVOrBy_Z4RgDJWQwLwxd-zWWI83nnAE6z5fEeg,1524
 mindroot/coreplugins/agent/system.j2.backup,sha256=itPx-urDBtKBqwps5T6yly4M9gX45AdrM-sznwefG_U,8927
 mindroot/coreplugins/agent/Assistant/agent.json,sha256=P4CaQpQaUTwx0PoyV9bCJHvfvANsFyBZlNcMtVlxM3M,1281
+mindroot/coreplugins/agent/SysAdmin/agent.json,sha256=wkZvJbqM153Gr0cnt531F_XndV5DXt6dkkYnXH6x91c,2864
 mindroot/coreplugins/agent/templates/system.jinja2,sha256=nazLtFBcs_f_IkxLYij_JWRLwhHlfQt4oMPeBA7fgnE,10789
 mindroot/coreplugins/api_keys/__init__.py,sha256=znoBzjEYNIDi7AD3NQMntC4MINqLofXh75L5_Ez8_bY,138
 mindroot/coreplugins/api_keys/api_key_manager.py,sha256=GH2V1PGnpLguAB5KMumgPgVwTXoft1F0FsvBhD781go,3205
@@ -1699,7 +1702,7 @@ mindroot/coreplugins/index/static/js/lit-html/node/directives/until.js.map,sha25
 mindroot/coreplugins/index/static/js/lit-html/node/directives/when.js,sha256=NLe0NJ-6jqjVDUrT_DzmSpREsRaLo1yarzdYcV_5xHY,181
 mindroot/coreplugins/index/static/js/lit-html/node/directives/when.js.map,sha256=tOonih_-EaqrunhNGshA9xN--WIVdGikjg8MkVp0itQ,1534
 mindroot/coreplugins/jwt_auth/__init__.py,sha256=qFCBnx0oAKTtMSXiPEa7VXOIlWDTU-5CY0XvodgSUlM,79
-mindroot/coreplugins/jwt_auth/middleware.py,sha256=Id2yrHbrMukFv6Grvgz4E4JX03YOP0glOGa1tSM9QZA,10851
+mindroot/coreplugins/jwt_auth/middleware.py,sha256=aOrKIQMDzLQArlizkGC3aRmUcPQuZRfKFUaceAgIYm8,10880
 mindroot/coreplugins/jwt_auth/mod.py,sha256=XqvAwBQVga-foEkziDJnQtISq1NwYcXXuvVRKeewfAQ,2070
 mindroot/coreplugins/jwt_auth/role_checks.py,sha256=bruZIIBSOvXNWB1YZ2s5btrbbXNf18w6MdORpJByV60,1555
 mindroot/coreplugins/jwt_auth/router.py,sha256=ecXYao_UG33UjQF15Hi-tf_X0eFsqLEldyqGpt7JNSw,1162
@@ -1838,10 +1841,11 @@ mindroot/lib/plugins/loader_with_l8n.py,sha256=4-kNgbk-GMN8UkCiSjg-29FGDtbml8Hhy
 mindroot/lib/plugins/manifest.py,sha256=Bquvg3xFg9dWxDFfRpHWei4kc8aWWxFQUP1nLDxIJtw,12078
 mindroot/lib/plugins/mapping.py,sha256=B3nxbStLzyYj8CEuEfxWXMbCu_dOtK_zVTbcCBw5mMc,838
 mindroot/lib/plugins/paths.py,sha256=vPDjEF9NU1xHMIcnN4_Hf1gjyleyXAAfRcf86WXt4M4,4312
-mindroot/lib/providers/__init__.py,sha256=e0DzrmFHxZJCzWf-GE41_n6zjzN1XmL_d-8cBcmYh5U,11681
+mindroot/lib/providers/__init__.py,sha256=CxqC9iaRUTx6q2i4rfLAjGEmjy7t6d86SoyTYCF8zYY,14534
 mindroot/lib/providers/commands.py,sha256=wxR9tfwjdu7lbjJZQ1vNOWH-vEdhcpOxkaBf2G9OKv0,735
 mindroot/lib/providers/hooks.py,sha256=9cJoJRhZyzFmLBJNTYGaVijA7B6hAm2mJu9I2ij4WMo,359
 mindroot/lib/providers/missing.py,sha256=G6ZM25ZEVgsk4uWwgf0GygJ1SWEnstwfw7xsR9QEI_E,2457
+mindroot/lib/providers/model_preferences_v2.py,sha256=BNqOnnNLDzPCUg34CNfQYOZ_gsJgmgMMePNzBygSMCA,6756
 mindroot/lib/providers/services.py,sha256=nTPUbz_KjxAENg4s9ymZnztH4Z7dhBjM6bvSlIxMQQs,598
 mindroot/lib/providers/backup/__init__.py,sha256=8iL9fylkE7SaFap4oj9D2eikN_4EJp5IaANiPF75qWM,12186
 mindroot/lib/utils/backoff.py,sha256=P059hqyTtYM_unNQP_iHSdYNhWe3Hz6VqbJ_vX19eoI,5520
@@ -1857,9 +1861,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=81In5TwETpaqnnY1_-tBQM7rfWvUxZUZkG7lEelRUfU,5321
-mindroot-9.6.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
-mindroot-9.6.0.dist-info/METADATA,sha256=XHr4wMTESiDKc30DrK9QyKJ6U6UYohiAA9Gma7a16q4,1034
-mindroot-9.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mindroot-9.6.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
-mindroot-9.6.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
-mindroot-9.6.0.dist-info/RECORD,,
+mindroot-9.8.0.dist-info/licenses/LICENSE,sha256=8plAmZh8y9ccuuqFFz4kp7G-cO_qsPgAOoHNvabSB4U,1070
+mindroot-9.8.0.dist-info/METADATA,sha256=SKtDN2fVOx-GsuOwXDfguiNx8fFBdNKY8q2m9EaheL4,1034
+mindroot-9.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mindroot-9.8.0.dist-info/entry_points.txt,sha256=0bpyjMccLttx6VcjDp6zfJPN0Kk0rffor6IdIbP0j4c,50
+mindroot-9.8.0.dist-info/top_level.txt,sha256=gwKm7DmNjhdrCJTYCrxa9Szne4lLpCtrEBltfsX-Mm8,9
+mindroot-9.8.0.dist-info/RECORD,,