imcp 0.0.10 → 0.0.12

package/src/core/constants.ts

@@ -58,8 +58,18 @@ const CODE_INSIDER_STRORAGE_DIR = (() => {
  * Value: Client-specific settings or configuration details.
  * TODO: Define actual client settings structure.
  */
-export const SUPPORTED_CLIENTS: Record<string, any> = {
-  'MSRooCode': { /* MSROO specific settings */
+export const SUPPORTED_CLIENTS: Record<string, {
+  extension: {
+    extensionId: string;
+    leastVersion?: string;
+    repository?: string;
+    assetName?: string;
+    private?: boolean;
+  };
+  codeSettingPath: string;
+  codeInsiderSettingPath: string;
+}> = {
+  'MSRooCode': {
 
     extension: {
       extensionId: 'microsoftai.ms-roo-cline',

package/src/core/installers/clients/ExtensionInstaller.ts

@@ -140,6 +140,9 @@ export class ExtensionInstaller {
                 } else {
                     // Install private extension from GitHub release using latest version
                     try {
+                        if (!repository || !assetName) {
+                            throw new Error(`Missing repository or assetName for private extension ${extensionId}`);
+                        }
                         const { resolvedPath } = await handleGitHubRelease(
                             { name: extensionId, version: 'latest', type: 'extension' },
                             { repository, assetName }

package/src/core/types.ts

@@ -84,6 +84,7 @@ export interface UpdateRequirementOptions {
 
 export interface ServerUninstallOptions {
   removeData?: boolean;
+  targets?: string[];  // List of client targets to uninstall from
 }
 
 // Types related to server feed configuration (e.g., ai-coder-tools.json)
@@ -150,6 +151,11 @@ export interface FeedConfiguration {
   mcpServers: McpConfig[];
 }
 
+export interface ClientSettings {
+  codeSettingPath: string;
+  codeInsiderSettingPath: string;
+}
+
 // Events that can be emitted by the SDK
 export enum MCPEvent {
   SERVER_INSTALLED = 'server:installed',
@@ -161,7 +167,7 @@ export enum MCPEvent {
 
 export interface MCPEventData {
   [MCPEvent.SERVER_INSTALLED]: { server: MCPServerCategory };
-  [MCPEvent.SERVER_UNINSTALLED]: { serverName: string };
+  [MCPEvent.SERVER_UNINSTALLED]: { serverName: string; targets?: string[] };
   [MCPEvent.SERVER_STARTED]: { server: MCPServerCategory };
   [MCPEvent.SERVER_STOPPED]: { serverName: string };
   [MCPEvent.CONFIG_CHANGED]: { configuration: MCPConfiguration };

package/src/services/ServerService.ts

@@ -147,19 +147,34 @@ export class ServerService {
    * Installs a specific mcp tool for a server.
    * TODO: This might require enhancing MCPManager to handle category-specific installs.
    */
+  /**
+   * Uninstall MCP server from specified client targets
+   * @param category The server category
+   * @param serverName The server name to uninstall
+   * @param options Uninstall options including target clients and data removal flags
+   */
   async uninstallMcpServer(
     category: string,
     serverName: string,
-    options: ServerUninstallOptions = {} // Reuse ServerInstallOptions for env etc.
+    options: ServerUninstallOptions = {}
   ): Promise<ServerOperationResult> {
-    return mcpManager.uninstallServer(category, serverName, options);
+    Logger.debug(`Uninstalling MCP server: ${JSON.stringify({ category, serverName, options })}`);
+    try {
+      const result = await mcpManager.uninstallServer(category, serverName, options);
+      Logger.debug(`Uninstallation result: ${JSON.stringify(result)}`);
+      return result;
+    } catch (error) {
+      Logger.error(`Failed to uninstall MCP server: ${serverName}`, error);
+      throw error;
+    }
   }
 
   /**
    * Validates server names
    */
-  async validateServerName(category: string, name: string): Promise<boolean> {
-    Logger.debug(`Validating server name: ${JSON.stringify({ category, name })}`);
+  async validateServerName(category: string, names: string | string[]): Promise<boolean> {
+    const serverNames = Array.isArray(names) ? names : [names];
+    Logger.debug(`Validating server names: ${JSON.stringify({ category, names: serverNames })}`);
 
     // Check if category exists in feeds
     const feedConfig = await mcpManager.getFeedConfiguration(category);
@@ -168,10 +183,13 @@ export class ServerService {
       return false;
     }
 
-    // Check if server exists in the category's mcpServers
-    const serverExists = feedConfig.mcpServers.some(server => server.name === name);
-    if (!serverExists) {
-      Logger.debug(`Validation failed: Server "${name}" not found in category "${category}"`);
+    // Check if all servers exist in the category's mcpServers
+    const invalidServers = serverNames.filter(name =>
+      !feedConfig.mcpServers.some(server => server.name === name)
+    );
+
+    if (invalidServers.length > 0) {
+      Logger.debug(`Validation failed: Servers "${invalidServers.join(', ')}" not found in category "${category}"`);
       return false;
     }
 

package/src/utils/osUtils.ts

@@ -273,7 +273,7 @@ export function getPythonPackagePath(pythonExecutablePath: string): string {
         // Virtual environment structure on Windows: <venv>/Scripts/python.exe
         const venvRoot = path.dirname(dir);
         return path.join(venvRoot, 'Lib', 'site-packages');
-      } else if (dir.toLowerCase().includes('python')) {
+      } else {
         // System Python or Conda on Windows
         return path.join(dir, 'Lib', 'site-packages');
       }

package/src/web/public/css/modal.css

@@ -160,6 +160,15 @@ body {
     transition: all 0.2s ease;
     cursor: pointer;
     user-select: none;
+    gap: 0.5rem;
+}
+
+/* Client actions container */
+.client-actions {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin-left: auto;
 }
 
 .client-item:hover {
@@ -180,6 +189,14 @@ body {
     gap: 0.75rem;
 }
 
+/* Status container */
+.status-container {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    margin-left: auto;
+}
+
 /* Status badges */
 .status-badge {
     display: inline-flex;
@@ -227,6 +244,31 @@ body {
     background-color: #fef3c7;
 }
 
+/* Uninstall button styling */
+.uninstall-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    border-radius: 6px;
+    border: 1px solid transparent;
+    background: transparent;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    padding: 0;
+}
+
+.uninstall-btn:hover {
+    background-color: #fee2e2;
+    border-color: #ef4444;
+    transform: scale(1.05);
+}
+
+.uninstall-btn i {
+    font-size: 1.25rem;
+}
+
 /* Environment variables section */
 #modalEnvInputs input {
     width: 100%;

package/src/web/public/js/modal.js

@@ -141,14 +141,16 @@ function _appendInstallLoadingMessage(message) {
 /**
  * Display the installation loading modal and prepare it for messages.
  */
-function showInstallLoadingModal() {
+function showInstallLoadingModal(operation = 'Installing') {
     const loadingModal = document.getElementById('installLoadingModal');
     const loadingMsg = document.getElementById('installLoadingMessage');
-    if (loadingModal && loadingMsg) {
+    const loadingTitle = document.querySelector('.loading-title');
+    if (loadingModal && loadingMsg && loadingTitle) {
         loadingModal.style.display = 'block';
         loadingMsg.innerHTML = '';
+        loadingTitle.textContent = `${operation}...`;
     } else {
-        console.error('[LoadingModal] Required elements not found: installLoadingModal or installLoadingMessage');
+        console.error('[LoadingModal] Required elements not found: installLoadingModal, installLoadingMessage, or loading-title');
     }
 }
 
@@ -330,17 +332,55 @@ async function showInstallModal(categoryName, serverName, callback) {
             // Add elements to client info
             clientInfo.appendChild(clientName);
 
-            // Add client info (name) to the item first
+            // Add elements to client item
             clientItem.appendChild(clientInfo);
 
+            // Status container for badge and uninstall button
+            const statusContainer = document.createElement('div');
+            statusContainer.className = 'status-container';
+
             // Status badge - only show if we have status text
             if (statusText) {
                 const statusBadge = document.createElement('span');
                 statusBadge.className = `status-badge ${statusClass}`;
                 statusBadge.textContent = statusText;
-                clientItem.appendChild(statusBadge);
+                statusContainer.appendChild(statusBadge);
+
+                // Add uninstall button right after status badge if installed
+                if (operationStatus.status === 'completed' && operationStatus.type === 'install') {
+                    const uninstallBtn = document.createElement('button');
+                    uninstallBtn.className = 'uninstall-btn text-red-600 hover:text-red-800 ml-2';
+                    uninstallBtn.innerHTML = '<i class="bx bx-trash"></i>';
+                    uninstallBtn.title = 'Uninstall from this client';
+                    uninstallBtn.onclick = async (e) => {
+                        e.stopPropagation(); // Prevent item selection
+                        e.preventDefault(); // Prevent form submission
+                        const confirmed = await showConfirm('Uninstall Confirmation', `Are you sure you want to uninstall ${serverName} from ${target}?`);
+                        if (confirmed) {
+                            // Add target to selectedClients for uninstallation
+                            window.selectedClients = [target];
+                            showInstallLoadingModal('Uninstalling');
+                            const serverList = {
+                                [serverName]: {
+                                    removeData: true // Include removal of associated data
+                                }
+                            };
+                            try {
+                                delayedAppendInstallLoadingMessage(`Uninstalling ${serverName} from ${target}...`);
+                                await uninstallTools(categoryName, serverList, [target]);
+                            } catch (error) {
+                                delayedAppendInstallLoadingMessage(`Error: ${error.message}`);
+                                throw error; // Re-throw to trigger error handling in uninstallTools
+                            }
+                        }
+                        return false; // Prevent form submission
+                    };
+                    statusContainer.appendChild(uninstallBtn);
+                }
             }
 
+            clientItem.appendChild(statusContainer);
+
             // Add client item to target div
             targetDiv.appendChild(clientItem);
         });
@@ -641,34 +681,40 @@ async function showInstallModal(categoryName, serverName, callback) {
                 });
             });
 
-            // Get selected clients
-            const selectedTargets = window.selectedClients.length > 0 ?
-                window.selectedClients :
-                Array.from(document.querySelectorAll('.client-item.selected'))
-                    .map(item => item.dataset.target);
-
             // Check if we have any requirements selected for update
             const hasRequirementsToUpdate = requirementsToUpdate.length > 0;
 
-            // Only require client selection if we don't have any requirements to update
-            if (selectedTargets.length === 0 && !hasRequirementsToUpdate) {
-                showToast('Please select at least one client to configure.', 'error');
-                return;
+            // Only proceed if this isn't an uninstall operation
+            const uninstallBtn = document.querySelector('.uninstall-btn');
+            if (!uninstallBtn || !uninstallBtn.matches(':active')) {
+                // Get selected clients
+                const selectedTargets = window.selectedClients.length > 0 ?
+                    window.selectedClients :
+                    Array.from(document.querySelectorAll('.client-item.selected'))
+                        .map(item => item.dataset.target);
+
+                console.log('Selected targets:', selectedTargets);
+                console.log('Requirements to update:', requirementsToUpdate);
+                if (selectedTargets.length === 0 && !hasRequirementsToUpdate) {
+                    showToast('Please select at least one client to configure.', 'error');
+                    return;
+                }
+                window.selectedClients = selectedTargets;
             }
 
             // Call install function with selected targets
             // Find installing message for the first selected target
             let installingMessage = "Starting installation...";
             const serverStatus = serverStatuses[serverName] || { installedStatus: {} };
-            if (selectedTargets.length > 0) {
-                const target = selectedTargets[0];
+            if (window.selectedClients.length > 0) {
+                const target = window.selectedClients[0];
                 const msg = serverStatus.installedStatus?.[target]?.message;
                 if (msg) installingMessage = msg;
             }
 
             // Add requirements to update to serverInstallOptions if any
             const serverInstallOptions = {
-                targetClients: selectedTargets,
+                targetClients: window.selectedClients,
                 env: envVars,
                 args: args,
                 settings: pythonEnv ? { pythonEnv } : undefined
@@ -679,7 +725,9 @@ async function showInstallModal(categoryName, serverName, callback) {
                 serverInstallOptions.requirements = requirementsToUpdate;
             }
 
-            handleBulkClientInstall(categoryName, serverName, selectedTargets, envVars, installingMessage, serverData, serverInstallOptions);
+            // For installation, use the selectedTargets from the validation above
+            const targetsToUse = document.querySelector('.uninstall-btn:hover') ? [] : window.selectedClients;
+            handleBulkClientInstall(categoryName, serverName, targetsToUse, envVars, installingMessage, serverData, serverInstallOptions);
         };
 
     } catch (error) {
@@ -893,23 +941,35 @@ async function pollInstallStatus(categoryName, serverName, targets, interval = 2
 
 // Function to handle client uninstallation for multiple targets
 async function uninstallTools(categoryName, serverList, targets) {
-    if (!Array.isArray(targets)) {
-        targets = [targets]; // Convert single target to array for backward compatibility
-    }
-
-    const confirmed = await showConfirm(`Are you sure you want to uninstall this server for ${targets.length} client(s)?`);
-    if (!confirmed) {
+    // Get selected targets from window.selectedClients or the provided targets
+    const selectedTargets = window.selectedClients || (Array.isArray(targets) ? targets : [targets]);
+    
+    // Validate selected targets
+    if (!selectedTargets || selectedTargets.length === 0) {
+        showToast('Please select at least one client to uninstall.', 'error');
         return;
     }
 
     try {
+        delayedAppendInstallLoadingMessage('Starting uninstallation...');
+
+        // Ensure serverList is an object where each key is a server name
+        if (Array.isArray(serverList)) {
+            const formattedServerList = {};
+            serverList.forEach(server => {
+                formattedServerList[server] = { removeData: true };
+            });
+            serverList = formattedServerList;
+        }
+
         const response = await fetch(`/api/categories/${categoryName}/uninstall`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
-                toolList: serverList,
+                serverList: serverList,
                 options: {
-                    targets: targets
+                    targets: selectedTargets,
+                    removeData: true
                 }
             })
         });
@@ -924,10 +984,14 @@ async function uninstallTools(categoryName, serverList, targets) {
             throw new Error(result.error || 'Uninstallation failed');
         }
 
-        showToast(`Successfully uninstalled for ${targets.length} client(s).`, 'success');
-        location.reload(); // Refresh the page to update the UI
+        // Add completion message and trigger completion UI
+        delayedAppendInstallLoadingMessage(`Successfully uninstalled from ${selectedTargets.join(', ')}`, true);
+        
+        // Clear selected clients after successful uninstall
+        window.selectedClients = [];
     } catch (error) {
         console.error('Error uninstalling tools:', error);
+        delayedAppendInstallLoadingMessage(`Error: ${error.message}`, true);
         showToast(`Error uninstalling tools: ${error.message}`, 'error');
     }
 }

package/src/web/public/js/notifications.js

@@ -30,28 +30,26 @@ function showToast(message, type = 'success') {
     });
 }
 
-// Function to show a Bootstrap confirmation dialog
-function showConfirm(message) {
+// Function to show a confirmation dialog using custom modal system
+function showConfirm(title, message) {
     return new Promise((resolve) => {
         const modalId = `confirm-modal-${Date.now()}`;
         const modalHtml = `
-            <div class="modal fade" id="${modalId}" tabindex="-1" aria-labelledby="${modalId}-label" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="${modalId}-label">Confirm Action</h5>
-                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                        </div>
-                        <div class="modal-body">
-                            ${message}
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-                            <button type="button" class="btn btn-primary confirm-action">
-                                <span class="spinner-border spinner-border-sm d-none me-2" role="status" aria-hidden="true"></span>
-                                Confirm
-                            </button>
-                        </div>
+            <div id="${modalId}" class="modal">
+                <div class="modal-content" style="max-width: 400px; margin: 15% auto;">
+                    <div class="modal-header">
+                        <h3 class="text-lg font-semibold text-gray-700">${title}</h3>
+                    </div>
+                    <div style="margin: 1rem 0;">
+                        ${message}
+                    </div>
+                    <div style="display: flex; justify-content: flex-end; gap: 0.5rem; margin-top: 1rem;">
+                        <button type="button" class="cancel-button px-4 py-2 text-gray-600 hover:text-gray-800 font-medium rounded-lg hover:bg-gray-100 transition-colors">
+                            Cancel
+                        </button>
+                        <button type="button" class="confirm-button submit-button">
+                            Confirm
+                        </button>
                     </div>
                 </div>
             </div>
@@ -60,29 +58,30 @@ function showConfirm(message) {
         document.body.insertAdjacentHTML('beforeend', modalHtml);
         
         const modalElement = document.getElementById(modalId);
-        const modal = new bootstrap.Modal(modalElement);
+        modalElement.style.display = 'block';
         
         // Handle confirm button click
-        modalElement.querySelector('.confirm-action').addEventListener('click', (event) => {
-            const button = event.currentTarget;
-            const spinner = button.querySelector('.spinner-border');
-            button.disabled = true;
-            spinner.classList.remove('d-none');
-            
-            // Add small delay to show the loading state
-            setTimeout(() => {
-                modal.hide();
-                resolve(true);
-            }, 300);
+        modalElement.querySelector('.confirm-button').addEventListener('click', () => {
+            modalElement.style.display = 'none';
+            modalElement.remove();
+            resolve(true);
         });
         
-        // Handle modal hidden event
-        modalElement.addEventListener('hidden.bs.modal', () => {
+        // Handle cancel button click
+        modalElement.querySelector('.cancel-button').addEventListener('click', () => {
+            modalElement.style.display = 'none';
             modalElement.remove();
             resolve(false);
         });
-        
-        modal.show();
+
+        // Handle click outside modal
+        modalElement.addEventListener('click', (event) => {
+            if (event.target === modalElement) {
+                modalElement.style.display = 'none';
+                modalElement.remove();
+                resolve(false);
+            }
+        });
     });
 }
 

package/src/web/server.ts

@@ -32,7 +32,11 @@ export interface InstallServersRequestBody {
 }
 
 interface UninstallServersRequestBody {
-  serverList: string[];
+  serverList: Record<string, { removeData?: boolean }>;
+  options: {
+    targets: string[];
+    removeData?: boolean;
+  };
 }
 
 interface ApiResponse<T> {
@@ -155,15 +159,29 @@ app.post('/api/categories/:categoryName/uninstall', async (req: Request<{ catego
     const { categoryName } = req.params;
     const { serverList } = req.body;
 
-    if (!Array.isArray(serverList) || serverList.length === 0) {
+    if (!serverList || Object.keys(serverList).length === 0) {
       return res.status(400).json({
         success: false,
         error: 'Invalid tool list provided'
       });
     }
 
+    const { options } = req.body;
+    if (!options?.targets || options.targets.length === 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'No target clients specified'
+      });
+    }
+
     const results = await Promise.all(
-      serverList.map(serverName => serverService.uninstallMcpServer(categoryName, serverName))
+      Object.entries(serverList).map(([serverName, serverOptions]) =>
+        serverService.uninstallMcpServer(categoryName, serverName, {
+          ...serverOptions,
+          targets: options.targets,
+          removeData: options.removeData ?? serverOptions.removeData
+        })
+      )
     );
 
     const { success, messages } = serverService.formatOperationResults(results);