@xalia/agent 0.6.8 → 0.6.10

package/src/agent/sudoMcpServerManager.ts

@@ -14,6 +14,7 @@ import {
   McpServer,
 } from "@xalia/xmcp/sdk";
 import { Client as McpClient } from "@modelcontextprotocol/sdk/client/index.js";
+import { CustomMcpServerDescriptor } from "../chat/data/dataModels";
 
 const DEVELOPMENT: boolean = process.env.DEVELOPMENT === "1";
 
@@ -31,7 +32,7 @@ class SanitizedServerBrief extends McpServerBrief {
   readonly originalName: string;
 
   private constructor() {
-    super("dummy", "dummy", "dummy", false, {}, "dummy", "dummy");
+    super("dummy", "dummy", "dummy", false, {}, "dummy", null, null, undefined);
     this.originalName = "dummy";
   }
 
@@ -79,7 +80,8 @@ export class SkillManager extends McpServerManager implements ISkillManager {
       displayName: string
     ) => void,
     // Redirect to this page after successful authorization
-    private authorized_url: string | undefined
+    private authorized_url: string | undefined,
+    private customMcpServers: Record<string, CustomMcpServerDescriptor>
   ) {
     super();
   }
@@ -96,7 +98,8 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     ) => void,
     sudoMcpUrl?: string,
     sudoMcpApiKey?: string,
-    authorized_url?: string
+    authorized_url?: string,
+    customMcpServers?: Record<string, CustomMcpServerDescriptor>
   ): Promise<SkillManager> {
     // TODO: Keep it on here and pass to `McpServerManager.addMcpServer`
     const apiClient = new ApiClient(
@@ -106,31 +109,29 @@ export class SkillManager extends McpServerManager implements ISkillManager {
     // Fetch server list
     const servers = await apiClient.listServers();
 
+    customMcpServers = customMcpServers || {};
     if (DEVELOPMENT) {
-      servers.push(
-        new McpServerBrief(
-          "local_dev",
-          "Local Dev Server",
+      customMcpServers["local_dev"] = {
+        name: "local_dev",
+        description:
           "A local mcp server using streamable-HTTP for development use.  " +
-            `URL: ${DEV_MCP_SERVER_URL}`,
-          false,
-          {},
-          "",
-          null,
-          null,
-          DEV_MCP_SERVER_URL
-        )
-      );
+          `URL: ${DEV_MCP_SERVER_URL}`,
+        url: DEV_MCP_SERVER_URL,
+      };
     }
 
-    const [mcpServers, mcpServersMap] = buildServersList(servers);
+    const [mcpServers, mcpServersMap] = buildServersList(
+      servers,
+      customMcpServers
+    );
     return new SkillManager(
       apiClient,
       mcpServers,
       mcpServersMap,
       new Map(),
       openUrl,
-      authorized_url
+      authorized_url,
+      customMcpServers
     );
   }
 
@@ -188,7 +189,10 @@ export class SkillManager extends McpServerManager implements ISkillManager {
    */
   public async refresh(): Promise<void> {
     const servers = await this.apiClient.listServers();
-    const [mcpServers, mcpServersMap] = buildServersList(servers);
+    const [mcpServers, mcpServersMap] = buildServersList(
+      servers,
+      this.customMcpServers
+    );
     this.serverBriefs = mcpServers;
     this.serverBriefsMap = mcpServersMap;
     this.toolCache = new Map();
@@ -321,7 +325,8 @@ async function connectServer(
  * holding the original name in a new field).
  */
 function buildServersList(
-  serverList: McpServerBrief[]
+  serverList: McpServerBrief[],
+  customServers: Record<string, CustomMcpServerDescriptor>
 ): [SanitizedServerBrief[], { [serverName: string]: SanitizedServerBrief }] {
   const servers: SanitizedServerBrief[] = [];
   const serversMap: { [serverName: string]: SanitizedServerBrief } = {};
@@ -332,6 +337,22 @@ function buildServersList(
     serversMap[ss.name] = ss;
   }
 
+  for (const [name, desc] of Object.entries(customServers)) {
+    const brief = new McpServerBrief(
+      name,
+      desc.name,
+      desc.description,
+      false,
+      {},
+      "",
+      null,
+      null,
+      desc.url
+    );
+    const ss = SanitizedServerBrief.fromServerBrief(brief);
+    servers.push(ss);
+    serversMap[ss.name] = ss;
+  }
   return [servers, serversMap];
 }