feat: matching connectors with MCP demands

Signed-off-by: Tomas Weiss <tomas.weiss2@gmail.com>

Author: tomkis

CLAUDE.md

@@ -18,4 +18,10 @@ When filing issues to i-am-bee/agentstack:
 
 ## Rules for issue filing
 - Keep the ticket extremly concise
-- Don't provide implementation detail, your goal is define problem, with potential consequences not solution.
+- Don't provide implementation detail, your goal is define problem, with potential consequences not solution.
+
+# TypeScript
+
+## Code Style
+
+- preferably don't use single letter variable names, make it at least a bit descriptive

apps/agentstack-sdk-py/src/agentstack_sdk/a2a/extensions/services/mcp.py

@@ -39,7 +39,7 @@ class StdioTransport(pydantic.BaseModel):
 class StreamableHTTPTransport(pydantic.BaseModel):
     type: Literal["streamable_http"] = "streamable_http"
 
-    url: pydantic.AnyHttpUrl
+    url: str
     headers: dict[str, str] | None = None
 
 
@@ -112,11 +112,7 @@ def handle_incoming_message(self, message: a2a.types.Message, context: RunContex
             if fullfilment.transport.type == "streamable_http":
                 try:
                     fullfilment.transport.url = pydantic.AnyHttpUrl(
-                        re.sub(
-                            r"^http[s]?://{platform_url}",
-                            platform_url,
-                            str(fullfilment.transport.url),
-                        )
+                        re.sub("^{platform_url}", platform_url, str(fullfilment.transport.url))
                     )
                 except Exception:
                     logger.warning("Platform URL substitution failed", exc_info=True)

apps/agentstack-sdk-ts/src/client/api/types.ts

@@ -99,7 +99,6 @@ export const connectorSchema = z.object({
     .nullable(),
   disconnect_reason: z.string().nullable(),
   metadata: z.record(z.string(), z.string()).nullable(),
-  created_at: z.string(),
 });
 
 export type Connector = z.infer<typeof connectorSchema>;

apps/agentstack-ui/src/modules/connectors/api/index.ts

@@ -6,8 +6,9 @@
 import { api } from '#api/index.ts';
 import { ensureData } from '#api/utils.ts';
 import { BASE_URL } from '#utils/constants.ts';
+import { ListConnectorsResponse } from 'agentstack-sdk';
 
-import type { CreateConnectorRequest, ListConnectorsResponse } from './types';
+import type { CreateConnectorRequest } from './types';
 
 export async function createConnector(body: CreateConnectorRequest) {
   const response = await api.POST('/api/v1/connectors', { body });
@@ -72,5 +73,5 @@ interface Created {
 
 export async function listConnectors(): Promise<ListConnectorsResponse | undefined> {
   const response = await api.GET('/api/v1/connectors', {});
-  return ensureData(response);
+  return ensureData(response) as ListConnectorsResponse;
 }

apps/agentstack-ui/src/modules/connectors/api/types.ts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ApiRequest, ApiResponse } from '#@types/utils.ts';
+import type { ApiRequest } from '#@types/utils.ts';
 
 export type CreateConnectorRequest = ApiRequest<'/api/v1/connectors'>;
-export type ListConnectorsResponse = ApiResponse<'/api/v1/connectors', 'get', 'application/json', 200>;

apps/agentstack-ui/src/modules/connectors/components/ConnectorsView.tsx

@@ -26,6 +26,10 @@ export const ConnectorsView = () => {
         client_id,
         client_secret,
         match_preset: false,
+        // TODO: get name from the form
+        metadata: {
+          name: 'GitHub',
+        },
       });
     },
     [createConnector],

apps/agentstack-ui/src/modules/runs/contexts/agent-demands/AgentDemandsProvider.tsx

@@ -8,6 +8,7 @@ import { type PropsWithChildren, useCallback, useEffect, useRef, useState } from
 
 import type { AgentA2AClient } from '#api/a2a/types.ts';
 import { useApp } from '#contexts/App/index.ts';
+import { useListConnectors } from '#modules/connectors/api/queries/useListConnectors.ts';
 import type { RunFormValues } from '#modules/form/types.ts';
 import { useCreateContextToken } from '#modules/platform-context/api/mutations/useCreateContextToken.ts';
 import { useMatchProviders } from '#modules/platform-context/api/mutations/useMatchProviders.ts';
@@ -39,7 +40,7 @@ export function AgentDemandsProvider<UIGenericPart>({
   );
 
   const {
-    config: { featureFlags, contextTokenPermissions },
+    config: { contextTokenPermissions },
   } = useApp();
   const { contextId } = usePlatformContext();
 
@@ -115,6 +116,9 @@ export function AgentDemandsProvider<UIGenericPart>({
 
   const [selectedMCPServers, setSelectedMCPServers] = useState<Record<string, string>>({});
 
+  const { data: connectorsData } = useListConnectors();
+  const connectors = connectorsData?.items ?? [];
+
   useEffect(() => {
     setSelectedMCPServers(
       Object.keys(agentClient?.demands.mcpDemands?.mcp_demands ?? {}).reduce(
@@ -168,20 +172,20 @@ export function AgentDemandsProvider<UIGenericPart>({
         selectedEmbeddingProviders,
         selectedMCPServers,
         providedSecrets,
-        featureFlags,
         selectedSettings,
         formFulfillments: formFulfillmentsRef.current,
         oauthRedirectUri: fulfillmentsContext.oauthRedirectUri ?? null,
+        connectors,
       });
     },
     [
       getContextToken,
       selectedLLMProviders,
       selectedEmbeddingProviders,
       selectedMCPServers,
-      featureFlags,
       selectedSettings,
       demandedSecrets,
+      connectors,
     ],
   );
 

apps/agentstack-ui/src/modules/runs/contexts/agent-demands/build-fulfillments.ts

@@ -3,10 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentSettings, ContextToken, EmbeddingDemands, FormFulfillments, Fulfillments } from 'agentstack-sdk';
+import type {
+  AgentSettings,
+  Connector,
+  ContextToken,
+  EmbeddingDemands,
+  FormFulfillments,
+  Fulfillments,
+} from 'agentstack-sdk';
+import { ConnectorState } from 'agentstack-sdk';
 
 import { BASE_URL } from '#utils/constants.ts';
-import type { FeatureFlags } from '#utils/feature-flags.ts';
 
 interface BuildFulfillmentsParams {
   contextToken: ContextToken;
@@ -17,7 +24,7 @@ interface BuildFulfillmentsParams {
   selectedSettings: AgentSettings;
   formFulfillments: FormFulfillments;
   oauthRedirectUri: string | null;
-  featureFlags: FeatureFlags;
+  connectors: Connector[];
 }
 
 export const buildFulfillments = ({
@@ -29,7 +36,7 @@ export const buildFulfillments = ({
   providedSecrets,
   formFulfillments,
   oauthRedirectUri,
-  featureFlags,
+  connectors,
 }: BuildFulfillmentsParams): Fulfillments => {
   return {
     getContextToken: () => contextToken,
@@ -105,27 +112,47 @@ export const buildFulfillments = ({
       );
     },
     mcp: async ({ mcp_demands }) => {
-      if (!featureFlags.MCP) {
-        return {
-          mcp_fulfillments: {},
-        };
-      }
-
+      const connectedConnectors = connectors.filter((connector) => connector.state === ConnectorState.Connected);
       const allDemands = Object.keys(mcp_demands);
+      const mcp_fulfillments: Record<string, any> = {};
 
-      return allDemands.reduce(
-        (memo, demandKey) => {
-          memo.mcp_fulfillments[demandKey] = {
+      for (const demandKey of allDemands) {
+        const clientProvided = selectedMCPServers[demandKey];
+        if (clientProvided) {
+          mcp_fulfillments[demandKey] = {
             transport: {
               type: 'streamable_http',
-              url: selectedMCPServers[demandKey],
+              url: clientProvided,
             },
           };
 
-          return memo;
-        },
-        { mcp_fulfillments: {} },
-      );
+          continue;
+        }
+
+        const demand = mcp_demands[demandKey];
+        const suggestedNames = demand.suggested || [];
+
+        // TODO: what if we have multiple connectors with the same name?
+        // currently we just randomly pick the latest connector
+        const matchingConnectors = connectedConnectors.filter((connector) =>
+          suggestedNames.some(
+            (suggestedName) => connector.metadata?.name?.toLowerCase() === suggestedName.toLowerCase(),
+          ),
+        );
+
+        if (matchingConnectors.length > 0) {
+          const latestConnector = matchingConnectors[matchingConnectors.length - 1];
+
+          mcp_fulfillments[demandKey] = {
+            transport: {
+              type: 'streamable_http',
+              url: `{platform_url}/api/v1/connectors/${latestConnector.id}/mcp`,
+            },
+          };
+        }
+      }
+
+      return { mcp_fulfillments };
     },
     oauth: async () => {
       return {