Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(mcp): support CIMD registration (#5351)
teo52ca74f80495
diff --git a/apps/web/src/lib/service-clients/service-cognition/generated/client.ts b/apps/web/src/lib/service-clients/service-cognition/generated/client.tsindex ad52c0cc0f..1641be37f8 100644--- a/apps/web/src/lib/service-clients/service-cognition/generated/client.ts+++ b/apps/web/src/lib/service-clients/service-cognition/generated/client.ts@@ -1717,6 +1717,46 @@ export const mcpAuthCallback = async (} as mcpAuthCallbackResponse;};+/**+ * @summary Return Macro's public OAuth Client ID Metadata Document.+ */+export type mcpOauthClientMetadataResponse200 = {+ data: void;+ status: 200;+};++export type mcpOauthClientMetadataResponseSuccess =+ mcpOauthClientMetadataResponse200 & {+ headers: Headers;+ };++export type mcpOauthClientMetadataResponse =+ mcpOauthClientMetadataResponseSuccess;++export const getMcpOauthClientMetadataUrl = () => {+ return `/mcp/servers/auth/client-metadata`;+};++export const mcpOauthClientMetadata = async (+ options?: RequestInit+): Promise<mcpOauthClientMetadataResponse> => {+ const res = await fetch(getMcpOauthClientMetadataUrl(), {+ ...options,+ method: 'GET',+ });++ const body = [204, 205, 304].includes(res.status) ? null : await res.text();++ const data: mcpOauthClientMetadataResponse['data'] = body+ ? JSON.parse(body)+ : {};+ return {+ data,+ status: res.status,+ headers: res.headers,+ } as mcpOauthClientMetadataResponse;+};+/*** @summary Start the OAuth authorization flow for an MCP server.*/diff --git a/apps/web/src/lib/service-clients/service-cognition/openapi.json b/apps/web/src/lib/service-clients/service-cognition/openapi.jsonindex 7e46f4850e..06c92375e1 100644--- a/apps/web/src/lib/service-clients/service-cognition/openapi.json+++ b/apps/web/src/lib/service-clients/service-cognition/openapi.json@@ -1414,6 +1414,18 @@}}},+ "/mcp/servers/auth/client-metadata": {+ "get": {+ "tags": ["mcp"],+ "summary": "Return Macro's public OAuth Client ID Metadata Document.",+ "operationId": "mcp_oauth_client_metadata",+ "responses": {+ "200": {+ "description": "Macro OAuth client metadata document"+ }+ }+ }+ },"/mcp/servers/auth/start": {"post": {"tags": ["mcp"],diff --git a/crates/mcp_client/src/domain/models/mod.rs b/crates/mcp_client/src/domain/models/mod.rsindex 3ce889aa44..fac1157fe8 100644--- a/crates/mcp_client/src/domain/models/mod.rs+++ b/crates/mcp_client/src/domain/models/mod.rs@@ -1,6 +1,7 @@mod aes_key;mod call_tool_result;mod consts;+mod oauth_client_metadata;mod result;mod server;@@ -8,6 +9,7 @@ pub use aes_key::{AesKey, AesKeyError};pub use call_tool_result::CallToolResultExt;pub use consts::*;pub use macro_user_id::user_id::MacroUserIdStr;+pub use oauth_client_metadata::OAuthClientMetadata;pub use result::{Error, Result};pub use rmcp::transport::auth::StoredCredentials;pub use server::{McpServer, McpServerConnectionInfo, McpServerRecord, client_info};diff --git a/crates/mcp_client/src/domain/models/oauth_client_metadata.rs b/crates/mcp_client/src/domain/models/oauth_client_metadata.rsnew file mode 100644index 0000000000..62643908c2--- /dev/null+++ b/crates/mcp_client/src/domain/models/oauth_client_metadata.rs@@ -0,0 +1,45 @@+use super::MCP_CLIENT_NAME;++/// Public OAuth client metadata used when an authorization server supports+/// Client ID Metadata Documents (CIMD).+#[derive(Clone, Debug, serde::Serialize)]+pub struct OAuthClientMetadata {+ client_id: String,+ client_name: String,+ redirect_uris: Vec<String>,+ grant_types: Vec<String>,+ response_types: Vec<String>,+ token_endpoint_auth_method: String,+}++impl OAuthClientMetadata {+ /// Build Macro's public OAuth client metadata document.+ pub fn new(client_id: String, redirect_uri: String) -> Self {+ Self {+ client_id,+ client_name: MCP_CLIENT_NAME.to_string(),+ redirect_uris: vec![redirect_uri],+ grant_types: vec![+ "authorization_code".to_string(),+ "refresh_token".to_string(),+ ],+ response_types: vec!["code".to_string()],+ token_endpoint_auth_method: "none".to_string(),+ }+ }++ /// Return the HTTPS URL that identifies Macro to CIMD-capable servers.+ pub fn client_id(&self) -> &str {+ &self.client_id+ }++ /// Return the callback URI used for authorization-code redirects.+ pub fn redirect_uri(&self) -> &str {+ self.redirect_uris+ .first()+ .expect("OAuthClientMetadata always has one redirect URI")+ }+}++#[cfg(test)]+mod test;diff --git a/crates/mcp_client/src/domain/models/oauth_client_metadata/test.rs b/crates/mcp_client/src/domain/models/oauth_client_metadata/test.rsnew file mode 100644index 0000000000..9813ed9192--- /dev/null+++ b/crates/mcp_client/src/domain/models/oauth_client_metadata/test.rs@@ -0,0 +1,23 @@+use super::*;++#[test]+fn serializes_required_client_id_metadata_fields() {+ let metadata = OAuthClientMetadata::new(+ "https://document-cognition.macro.com/mcp/servers/auth/client-metadata".to_string(),+ "https://document-cognition.macro.com/mcp/servers/auth/callback".to_string(),+ );++ let value = serde_json::to_value(metadata).expect("metadata serializes");++ assert_eq!(+ value,+ serde_json::json!({+ "client_id": "https://document-cognition.macro.com/mcp/servers/auth/client-metadata",+ "client_name": "Macro",+ "redirect_uris": ["https://document-cognition.macro.com/mcp/servers/auth/callback"],+ "grant_types": ["authorization_code", "refresh_token"],+ "response_types": ["code"],+ "token_endpoint_auth_method": "none",+ })+ );+}diff --git a/crates/mcp_client/src/domain/service/mod.rs b/crates/mcp_client/src/domain/service/mod.rsindex 33ee6ae853..b53bfa29d9 100644--- a/crates/mcp_client/src/domain/service/mod.rs+++ b/crates/mcp_client/src/domain/service/mod.rs@@ -1,9 +1,7 @@-mod oauth;/// Write-through OAuth credential store for MCP connections.pub mod persisting_credential_store;/// MCP tool set and combined tool set for the AI loop.pub mod toolset;-pub use oauth::OAuthService;pub use persisting_credential_store::PersistingCredentialStore;pub use toolset::{CombinedToolSet, McpToolSet};diff --git a/crates/mcp_client/src/inbound/axum_router.rs b/crates/mcp_client/src/inbound/axum_router.rsindex 95cfeaebfd..51d2595885 100644--- a/crates/mcp_client/src/inbound/axum_router.rs+++ b/crates/mcp_client/src/inbound/axum_router.rs@@ -1,5 +1,5 @@use crate::domain::{- models::McpServerRecord,+ models::{McpServerRecord, OAuthClientMetadata},ports::{McpServerStore, OAuthClient},};use axum::{@@ -32,6 +32,7 @@ pub struct McpRouterState<S, O, Auth> {store: Arc<S>,oauth: Arc<O>,authorization_state: MacroAuthorizationState<Auth>,+ client_metadata: OAuthClientMetadata,on_auth_completed: Option<McpAuthCompletedHook>,}@@ -41,6 +42,7 @@ impl<S, O, Auth> Clone for McpRouterState<S, O, Auth> {store: self.store.clone(),oauth: self.oauth.clone(),authorization_state: self.authorization_state.clone(),+ client_metadata: self.client_metadata.clone(),on_auth_completed: self.on_auth_completed.clone(),}}@@ -60,11 +62,17 @@ where{/// Create a new router state from a server store, OAuth client, and/// authorization state.- pub fn new(store: S, oauth: O, authorization_state: MacroAuthorizationState<Auth>) -> Self {+ pub fn new(+ store: S,+ oauth: O,+ authorization_state: MacroAuthorizationState<Auth>,+ client_metadata: OAuthClientMetadata,+ ) -> Self {Self {store: Arc::new(store),oauth: Arc::new(oauth),authorization_state,+ client_metadata,on_auth_completed: None,}}@@ -100,7 +108,7 @@ where.with_state(state)}-/// Unauthenticated OAuth callback route.+/// Unauthenticated OAuth callback and client metadata routes.pub fn mcp_oauth_callback_router<S, O, Auth, Global>(state: McpRouterState<S, O, Auth>,) -> Router<Global>@@ -116,6 +124,10 @@ where"/mcp/servers/auth/callback",get(auth_callback::<S, O, Auth>),)+ .route(+ "/mcp/servers/auth/client-metadata",+ get(client_metadata::<S, O, Auth>),+ ).with_state(state)}@@ -449,6 +461,27 @@ whereOk(Json(StartAuthResponse { authorization_url }))}+#[utoipa::path(+ get,+ path = "/mcp/servers/auth/client-metadata",+ tag = "mcp",+ operation_id = "mcp_oauth_client_metadata",+ responses(+ (status = 200, description = "Macro OAuth client metadata document"),+ )+)]+/// Return Macro's public OAuth Client ID Metadata Document.+pub async fn client_metadata<S, O, Auth>(+ State(state): State<McpRouterState<S, O, Auth>>,+) -> Json<OAuthClientMetadata>+where+ S: McpServerStore,+ O: OAuthClient,+ Auth: MacroAuthorizationService,+{+ Json(state.client_metadata.clone())+}+/// Classify a callback as a successful `(code, state)` pair or a handler/// error, logging provider rejections and malformed callbacks along the way.fn parse_callback_params(params: AuthCallbackParams) -> Result<(String, String), McpHandlerErr> {diff --git a/crates/mcp_client/src/lib.rs b/crates/mcp_client/src/lib.rsindex f57843f4eb..b24538b9ef 100644--- a/crates/mcp_client/src/lib.rs+++ b/crates/mcp_client/src/lib.rs@@ -7,5 +7,5 @@ pub mod domain;/// Inbound adapters (HTTP/axum).pub mod inbound;-/// Outbound adapters (Postgres).+/// Outbound adapters for OAuth, Postgres, and Redis.pub mod outbound;diff --git a/crates/mcp_client/src/outbound/mod.rs b/crates/mcp_client/src/outbound/mod.rsindex e061746c9e..98494580c2 100644--- a/crates/mcp_client/src/outbound/mod.rs+++ b/crates/mcp_client/src/outbound/mod.rs@@ -1,3 +1,5 @@+/// RMCP-backed OAuth adapter for remote MCP servers.+pub mod oauth;/// Postgres-backed repository implementing [`McpServerStore`](crate::domain::ports::McpServerStore).pub mod pg_server_repo;/// Redis-backed store implementing [`OAuthStateStore`](crate::domain::ports::OAuthStateStore).diff --git a/crates/mcp_client/src/domain/service/oauth.rs b/crates/mcp_client/src/outbound/oauth.rssimilarity index 58%rename from crates/mcp_client/src/domain/service/oauth.rsrename to crates/mcp_client/src/outbound/oauth.rsindex beb27476ea..b6b8ae34bf 100644--- a/crates/mcp_client/src/domain/service/oauth.rs+++ b/crates/mcp_client/src/outbound/oauth.rs@@ -1,12 +1,15 @@-use crate::domain::models::MCP_CLIENT_NAME;-use crate::domain::models::{MacroUserIdStr, McpServerRecord};+//! RMCP-backed OAuth adapter for remote MCP servers.++use crate::domain::models::{+ MCP_CLIENT_NAME, MacroUserIdStr, McpServerRecord, OAuthClientMetadata,+};use crate::domain::ports::{McpServerStore, OAuthClient, OAuthStateStore, PendingAuth};#[cfg(feature = "providers")]use crate::domain::provider_registry::PreRegisteredProviders;use macro_user_id::cowlike::CowLike;use rmcp::transport::auth::{- AuthorizationManager, CredentialStore as _, InMemoryCredentialStore, InMemoryStateStore,- OAuthClientConfig, StateStore as _, StoredAuthorizationState,+ AuthorizationManager, AuthorizationMetadata, CredentialStore as _, InMemoryCredentialStore,+ InMemoryStateStore, OAuthClientConfig, StateStore as _, StoredAuthorizationState,};/// Drives the OAuth authorization-code flow, storing ephemeral state in an@@ -14,7 +17,7 @@ use rmcp::transport::auth::{pub struct OAuthService<S, R> {server_store: S,state_store: R,- redirect_uri: String,+ client_metadata: OAuthClientMetadata,#[cfg(feature = "providers")]pre_registered: PreRegisteredProviders,}@@ -25,24 +28,24 @@ impl<S, R> OAuthService<S, R> {pub fn new(server_store: S,state_store: R,- redirect_uri: String,+ client_metadata: OAuthClientMetadata,pre_registered: PreRegisteredProviders,) -> Self {Self {server_store,state_store,- redirect_uri,+ client_metadata,pre_registered,}}- /// Create a new OAuth service (DCR only, no pre-registered providers).+ /// Create a new OAuth service without pre-registered providers.#[cfg(not(feature = "providers"))]- pub fn new(server_store: S, state_store: R, redirect_uri: String) -> Self {+ pub fn new(server_store: S, state_store: R, client_metadata: OAuthClientMetadata) -> Self {Self {server_store,state_store,- redirect_uri,+ client_metadata,}}}@@ -54,35 +57,109 @@ struct ResolvedClient {scopes: Vec<String>,}+fn supports_client_id_metadata(metadata: &AuthorizationMetadata) -> bool {+ metadata+ .additional_fields+ .get("client_id_metadata_document_supported")+ .and_then(serde_json::Value::as_bool)+ .unwrap_or(false)+}++fn is_valid_client_metadata_url(client_id: &str) -> bool {+ reqwest::Url::parse(client_id)+ .ok()+ .is_some_and(|url| url.scheme() == "https" && url.host_str().is_some() && url.path() != "/")+}+impl<S, R> OAuthService<S, R> {+ fn configure_cimd_client(+ &self,+ auth_manager: &mut AuthorizationManager,+ scopes: Vec<String>,+ ) -> anyhow::Result<ResolvedClient> {+ let client_id = self.client_metadata.client_id().to_string();+ let config = OAuthClientConfig::new(client_id.clone(), self.client_metadata.redirect_uri())+ .with_scopes(scopes.clone());+ auth_manager.configure_client(config)?;++ tracing::info!(%client_id, "using OAuth Client ID Metadata Document");+ Ok(ResolvedClient {+ client_id,+ client_secret: None,+ scopes,+ })+ }++ async fn register_dcr_client(+ &self,+ auth_manager: &mut AuthorizationManager,+ scopes: Vec<String>,+ ) -> anyhow::Result<ResolvedClient> {+ let scope_refs: Vec<&str> = scopes.iter().map(String::as_str).collect();+ let config = auth_manager+ .register_client(+ MCP_CLIENT_NAME,+ self.client_metadata.redirect_uri(),+ &scope_refs,+ )+ .await?;++ Ok(ResolvedClient {+ client_id: config.client_id,+ client_secret: config.client_secret,+ scopes,+ })+ }++ async fn resolve_dynamic_client(+ &self,+ auth_manager: &mut AuthorizationManager,+ supports_client_metadata: bool,+ scopes: Vec<String>,+ ) -> anyhow::Result<ResolvedClient> {+ if supports_client_metadata+ && is_valid_client_metadata_url(self.client_metadata.client_id())+ {+ return self.configure_cimd_client(auth_manager, scopes);+ }++ if supports_client_metadata {+ tracing::warn!(+ client_id = self.client_metadata.client_id(),+ "authorization server supports CIMD but Macro's metadata URL is not a valid public HTTPS URL; falling back to DCR"+ );+ }++ self.register_dcr_client(auth_manager, scopes).await+ }+#[cfg(feature = "providers")]async fn resolve_client_config(&self,server_url: &str,auth_manager: &mut AuthorizationManager,+ supports_client_metadata: bool,) -> anyhow::Result<ResolvedClient> {if let Some(creds) = self.pre_registered.get(server_url) {- let mut config =- OAuthClientConfig::new(creds.client_id.clone(), self.redirect_uri.clone());- config = config.with_client_secret(creds.client_secret.clone());+ let config = OAuthClientConfig::new(+ creds.client_id.clone(),+ self.client_metadata.redirect_uri(),+ )+ .with_client_secret(creds.client_secret.clone())+ .with_scopes(creds.scopes.clone());auth_manager.configure_client(config)?;- Ok(ResolvedClient {- client_id: creds.client_id.clone(),- client_secret: Some(creds.client_secret.clone()),- scopes: creds.scopes.clone(),- })- } else {- let scopes = crate::domain::provider_registry::dcr_default_scopes(server_url);- let scope_refs: Vec<&str> = scopes.iter().map(String::as_str).collect();- let config = auth_manager- .register_client(MCP_CLIENT_NAME, &self.redirect_uri, &scope_refs)- .await?;- Ok(ResolvedClient {- client_id: config.client_id,- client_secret: config.client_secret,- scopes,- })+ return Ok(ResolvedClient {+ client_id: creds.client_id,+ client_secret: Some(creds.client_secret),+ scopes: creds.scopes,+ });}++ let defaults = crate::domain::provider_registry::dcr_default_scopes(server_url);+ let default_refs: Vec<&str> = defaults.iter().map(String::as_str).collect();+ let scopes = auth_manager.select_scopes(None, &default_refs);+ self.resolve_dynamic_client(auth_manager, supports_client_metadata, scopes)+ .await}#[cfg(not(feature = "providers"))]@@ -90,15 +167,11 @@ impl<S, R> OAuthService<S, R> {&self,_server_url: &str,auth_manager: &mut AuthorizationManager,+ supports_client_metadata: bool,) -> anyhow::Result<ResolvedClient> {- let config = auth_manager- .register_client(MCP_CLIENT_NAME, &self.redirect_uri, &[])- .await?;- Ok(ResolvedClient {- client_id: config.client_id,- client_secret: config.client_secret,- scopes: vec![],- })+ let scopes = auth_manager.select_scopes(None, &[]);+ self.resolve_dynamic_client(auth_manager, supports_client_metadata, scopes)+ .await}}@@ -117,6 +190,7 @@ where) -> anyhow::Result<String> {let mut auth_manager = AuthorizationManager::new(server_url).await?;let metadata = auth_manager.discover_metadata().await?;+ let supports_client_metadata = supports_client_id_metadata(&metadata);auth_manager.set_metadata(metadata);let in_memory_state = InMemoryStateStore::new();@@ -124,10 +198,10 @@ whereauth_manager.set_credential_store(InMemoryCredentialStore::new());let resolved = self- .resolve_client_config(server_url, &mut auth_manager)+ .resolve_client_config(server_url, &mut auth_manager, supports_client_metadata).await?;- let scope_refs: Vec<&str> = resolved.scopes.iter().map(|s| s.as_str()).collect();+ let scope_refs: Vec<&str> = resolved.scopes.iter().map(String::as_str).collect();let auth_url = auth_manager.get_authorization_url(&scope_refs).await?;let csrf_token = extract_state_param(&auth_url)?;@@ -146,7 +220,11 @@ where};self.state_store.save(&csrf_token, pending).await?;- tracing::info!(csrf_token, redirect_uri = %self.redirect_uri, "stored pending OAuth state");+ tracing::info!(+ csrf_token,+ redirect_uri = self.client_metadata.redirect_uri(),+ "stored pending OAuth state"+ );Ok(auth_url)}@@ -178,7 +256,7 @@ whereauth_manager.set_credential_store(credential_store.clone());let mut client_config =- OAuthClientConfig::new(pending.client_id, self.redirect_uri.clone());+ OAuthClientConfig::new(pending.client_id, self.client_metadata.redirect_uri());if let Some(secret) = pending.client_secret {client_config = client_config.with_client_secret(secret);}@@ -222,7 +300,10 @@ wherefn extract_state_param(url: &str) -> anyhow::Result<String> {reqwest::Url::parse(url)?.query_pairs()- .find(|(k, _)| k == "state")- .map(|(_, v)| v.into_owned())+ .find(|(key, _)| key == "state")+ .map(|(_, value)| value.into_owned()).ok_or_else(|| anyhow::anyhow!("missing state parameter in authorization URL"))}++#[cfg(test)]+mod test;diff --git a/crates/mcp_client/src/outbound/oauth/test.rs b/crates/mcp_client/src/outbound/oauth/test.rsnew file mode 100644index 0000000000..ae31550837--- /dev/null+++ b/crates/mcp_client/src/outbound/oauth/test.rs@@ -0,0 +1,238 @@+use super::*;+use axum::{+ Json, Router,+ extract::State,+ http::{HeaderMap, HeaderValue, StatusCode, header::WWW_AUTHENTICATE},+ routing::{get, post},+};+use std::{+ collections::HashMap,+ sync::{+ Arc, Mutex,+ atomic::{AtomicUsize, Ordering},+ },+};++const CLIENT_METADATA_URL: &str =+ "https://document-cognition.macro.com/mcp/servers/auth/client-metadata";+const REDIRECT_URI: &str = "https://document-cognition.macro.com/mcp/servers/auth/callback";++#[derive(Clone, Default)]+struct FakeServerStore;++impl McpServerStore for FakeServerStore {+ type Err = anyhow::Error;++ async fn save(&self, _record: &McpServerRecord) -> Result<(), Self::Err> {+ Ok(())+ }++ async fn load(+ &self,+ _user_id: &MacroUserIdStr<'static>,+ _server_url: &str,+ ) -> Result<Option<McpServerRecord>, Self::Err> {+ Ok(None)+ }++ async fn delete(+ &self,+ _user_id: &MacroUserIdStr<'static>,+ _server_url: &str,+ ) -> Result<(), Self::Err> {+ Ok(())+ }++ async fn list(+ &self,+ _user_id: &MacroUserIdStr<'static>,+ ) -> Result<Vec<McpServerRecord>, Self::Err> {+ Ok(Vec::new())+ }+}++#[derive(Clone, Default)]+struct FakeStateStore {+ pending: Arc<Mutex<HashMap<String, PendingAuth>>>,+}++impl OAuthStateStore for FakeStateStore {+ async fn save(&self, csrf_token: &str, pending: PendingAuth) -> anyhow::Result<()> {+ self.pending+ .lock()+ .expect("state mutex is not poisoned")+ .insert(csrf_token.to_string(), pending);+ Ok(())+ }++ async fn take(&self, csrf_token: &str) -> anyhow::Result<Option<PendingAuth>> {+ Ok(self+ .pending+ .lock()+ .expect("state mutex is not poisoned")+ .remove(csrf_token))+ }+}++#[derive(Clone)]+struct MockAuthorizationServer {+ base_url: String,+ supports_client_metadata: bool,+ registrations: Arc<AtomicUsize>,+}++async fn protected_resource(+ State(state): State<MockAuthorizationServer>,+) -> (StatusCode, HeaderMap) {+ let mut headers = HeaderMap::new();+ headers.insert(+ WWW_AUTHENTICATE,+ HeaderValue::from_str(&format!(+ "Bearer resource_metadata=\"{}/.well-known/oauth-protected-resource/mcp\"",+ state.base_url+ ))+ .expect("valid challenge"),+ );+ (StatusCode::UNAUTHORIZED, headers)+}++async fn protected_resource_metadata(+ State(state): State<MockAuthorizationServer>,+) -> Json<serde_json::Value> {+ Json(serde_json::json!({+ "resource": format!("{}/mcp", state.base_url),+ "authorization_servers": [state.base_url],+ "scopes_supported": ["read"],+ }))+}++async fn authorization_server_metadata(+ State(state): State<MockAuthorizationServer>,+) -> Json<serde_json::Value> {+ Json(serde_json::json!({+ "issuer": state.base_url,+ "authorization_endpoint": format!("{}/authorize", state.base_url),+ "token_endpoint": format!("{}/token", state.base_url),+ "registration_endpoint": format!("{}/register", state.base_url),+ "response_types_supported": ["code"],+ "code_challenge_methods_supported": ["S256"],+ "client_id_metadata_document_supported": state.supports_client_metadata,+ }))+}++async fn register_client(+ State(state): State<MockAuthorizationServer>,+) -> (StatusCode, Json<serde_json::Value>) {+ state.registrations.fetch_add(1, Ordering::SeqCst);+ (+ StatusCode::CREATED,+ Json(serde_json::json!({+ "client_id": "dcr-client-id",+ "client_name": "Macro",+ "redirect_uris": [REDIRECT_URI],+ "grant_types": ["authorization_code", "refresh_token"],+ "response_types": ["code"],+ "token_endpoint_auth_method": "none",+ })),+ )+}++async fn spawn_authorization_server(+ supports_client_metadata: bool,+) -> (String, Arc<AtomicUsize>, tokio::task::JoinHandle<()>) {+ let listener = tokio::net::TcpListener::bind("127.0.0.1:0")+ .await+ .expect("bind mock authorization server");+ let base_url = format!(+ "http://{}",+ listener.local_addr().expect("mock server address")+ );+ let registrations = Arc::new(AtomicUsize::new(0));+ let state = MockAuthorizationServer {+ base_url: base_url.clone(),+ supports_client_metadata,+ registrations: registrations.clone(),+ };+ let app = Router::new()+ .route("/mcp", get(protected_resource))+ .route(+ "/.well-known/oauth-protected-resource/mcp",+ get(protected_resource_metadata),+ )+ .route(+ "/.well-known/oauth-authorization-server",+ get(authorization_server_metadata),+ )+ .route("/register", post(register_client))+ .with_state(state);+ let task = tokio::spawn(async move {+ axum::serve(listener, app)+ .await+ .expect("mock authorization server runs");+ });++ (base_url, registrations, task)+}++fn oauth_service() -> OAuthService<FakeServerStore, FakeStateStore> {+ OAuthService::new(+ FakeServerStore,+ FakeStateStore::default(),+ OAuthClientMetadata::new(CLIENT_METADATA_URL.to_string(), REDIRECT_URI.to_string()),+ PreRegisteredProviders::empty(),+ )+}++fn test_user_id() -> MacroUserIdStr<'static> {+ MacroUserIdStr::parse_from_str("macro|[email protected]")+ .expect("valid test user id")+ .into_owned()+}++fn query_parameter(url: &str, key: &str) -> Option<String> {+ reqwest::Url::parse(url)+ .expect("valid authorization URL")+ .query_pairs()+ .find(|(candidate, _)| candidate == key)+ .map(|(_, value)| value.into_owned())+}++#[tokio::test]+async fn cimd_capability_uses_metadata_url_without_dynamic_registration() {+ let (base_url, registrations, server_task) = spawn_authorization_server(true).await;+ let server_url = format!("{base_url}/mcp");++ let authorization_url = oauth_service()+ .start_authorization(&test_user_id(), &server_url, "Test server")+ .await+ .expect("CIMD authorization starts");++ assert_eq!(+ query_parameter(&authorization_url, "client_id").as_deref(),+ Some(CLIENT_METADATA_URL)+ );+ assert_eq!(+ query_parameter(&authorization_url, "redirect_uri").as_deref(),+ Some(REDIRECT_URI)+ );+ assert_eq!(registrations.load(Ordering::SeqCst), 0);+ server_task.abort();+}++#[tokio::test]+async fn dcr_remains_the_fallback_when_cimd_is_not_supported() {+ let (base_url, registrations, server_task) = spawn_authorization_server(false).await;+ let server_url = format!("{base_url}/mcp");++ let authorization_url = oauth_service()+ .start_authorization(&test_user_id(), &server_url, "Test server")+ .await+ .expect("DCR authorization starts");++ assert_eq!(+ query_parameter(&authorization_url, "client_id").as_deref(),+ Some("dcr-client-id")+ );+ assert_eq!(registrations.load(Ordering::SeqCst), 1);+ server_task.abort();+}diff --git a/packages/sdk/generated/cognition/index.ts b/packages/sdk/generated/cognition/index.tsindex 4b1e758d18..52c1c27ec6 100644--- a/packages/sdk/generated/cognition/index.ts+++ b/packages/sdk/generated/cognition/index.ts@@ -1,4 +1,4 @@// This file is auto-generated by @hey-api/openapi-tsexport { type Options, Sdk } from './sdk.gen';-export type { AccessLevel, AddMcpServerData, AddMcpServerError, AddMcpServerErrors, AddMcpServerResponse, AddMcpServerResponses, AddServerRequest, AiFeature, AssistantMessagePart, AttachmentMetadata, AttachmentType, CallToolData, CallToolError, CallToolErrors, CallToolRequest, CallToolResponse, CallToolResponse2, CallToolResponses, ChannelSharePermission, ChannelType, Chat, ChatAttachment, ChatHistory, ChatHistoryBatchMessagesRequest, ChatMessage, ChatMessageContent, ChatMessageError, ChatMessageWithAttachments, ChatPreview, ChatPreviewData, ChatResponse, ChatStream, ClientOptions, CompleteHandlerData, CompleteHandlerErrors, CompleteHandlerResponse, CompleteHandlerResponses, CompleteOnboardingRequest, CompletionUsage, ConnectedServer, ConversationRecord, CopyChatData, CopyChatError, CopyChatErrors, CopyChatResponse, CopyChatResponses, CreateChatData, CreateChatError, CreateChatErrors, CreateChatRequest, CreateChatResponse, CreateChatResponses, DeleteChatData, DeleteChatError, DeleteChatErrors, DeleteChatResponses, DeleteMcpServerData, DeleteMcpServerError, DeleteMcpServerErrors, DeleteMcpServerResponse, DeleteMcpServerResponses, DismissRunHandlerData, DismissRunHandlerErrors, DismissRunHandlerResponse, DismissRunHandlerResponses, DocumentCognitionServiceApiVersion, DocumentReference, DocumentTextPart, DynamicSchema, Entity, EntityType, ErrorBody, ErrorResponse, Expiry, FeatureUsage, FileType, GenericErrorResponse, GetBatchPreviewData, GetBatchPreviewError, GetBatchPreviewErrors, GetBatchPreviewRequest, GetBatchPreviewResponse, GetBatchPreviewResponse2, GetBatchPreviewResponses, GetChatData, GetChatError, GetChatErrors, GetChatHistoryBatchMessagesHandlerData, GetChatHistoryBatchMessagesHandlerError, GetChatHistoryBatchMessagesHandlerErrors, GetChatHistoryBatchMessagesHandlerResponse, GetChatHistoryBatchMessagesHandlerResponses, GetChatHistoryHandlerData, GetChatHistoryHandlerError, GetChatHistoryHandlerErrors, GetChatHistoryHandlerResponse, GetChatHistoryHandlerResponses, GetChatPermissionsData, GetChatPermissionsError, GetChatPermissionsErrors, GetChatPermissionsResponse, GetChatPermissionsResponse2, GetChatPermissionsResponses, GetChatResponse, GetChatResponse2, GetChatResponses, GetChatsForAttachmentHandlerData, GetChatsForAttachmentHandlerError, GetChatsForAttachmentHandlerErrors, GetChatsForAttachmentHandlerResponse, GetChatsForAttachmentHandlerResponses, GetChatsForAttachmentResponse, GetCitationHandlerData, GetCitationHandlerError, GetCitationHandlerErrors, GetCitationHandlerResponse, GetCitationHandlerResponses, GetMemoryHandlerData, GetMemoryHandlerError, GetMemoryHandlerErrors, GetMemoryHandlerResponse, GetMemoryHandlerResponses, GetStateHandler2Data, GetStateHandler2Errors, GetStateHandler2Response, GetStateHandler2Responses, GetStateHandlerData, GetStateHandlerErrors, GetStateHandlerResponse, GetStateHandlerResponses, GetUsageHandlerData, GetUsageHandlerError, GetUsageHandlerErrors, GetUsageHandlerResponse, GetUsageHandlerResponses, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, HttpSendChatMessageRequest, ImportEntity, ImportRun, ImportSource, ImportState, ImportStatus, Initiator, JwtPayload, LinearIssueMeta, ListMcpServersData, ListMcpServersError, ListMcpServersErrors, ListMcpServersResponse, ListMcpServersResponses, MacroUserIdStr, McpAuthCallbackData, McpAuthCallbackError, McpAuthCallbackErrors, McpAuthCallbackResponses, MemoryErrorBody, MemoryResponse, MessageWithAttachments, NewAttachment, NewChatMessage, NewMessageAttachment, NotionDocMeta, OnboardingRow, OnboardingState, OnboardingStatus, PatchChatData, PatchChatError, PatchChatErrors, PatchChatRequest, PatchChatResponses, PermanentlyDeleteChatData, PermanentlyDeleteChatError, PermanentlyDeleteChatErrors, PermanentlyDeleteChatResponses, Price, ProjectionStateResponse, ProjectionStatus, RefreshCadence, RejectToolCallData, RejectToolCallError, RejectToolCallErrors, RejectToolCallRequest, RejectToolCallResponses, RetryGatherHandlerData, RetryGatherHandlerErrors, RetryGatherHandlerResponse, RetryGatherHandlerResponses, RevertDeleteChatData, RevertDeleteChatError, RevertDeleteChatErrors, RevertDeleteChatResponses, Role, RunImportHandlerData, RunImportHandlerErrors, RunImportHandlerResponse, RunImportHandlerResponses, RunImportOutcome, RunImportRequest, RunStatus, SendChatMessageData, SendChatMessageError, SendChatMessageErrors, SendChatMessagePayload, SendChatMessageResponse, SendChatMessageResponse2, SendChatMessageResponses, ServerResponse, SetPricingHandlerData, SetPricingHandlerError, SetPricingHandlerErrors, SetPricingHandlerResponses, SetPricingRequest, SharePermissionV2, SlackChannelMeta, SlackParticipant, StartAuthRequest, StartAuthResponse, StartMcpAuthData, StartMcpAuthError, StartMcpAuthErrors, StartMcpAuthResponse, StartMcpAuthResponses, StopChatStreamData, StopChatStreamError, StopChatStreamError2, StopChatStreamErrors, StopChatStreamRequest, StopChatStreamResponse, StopChatStreamResponse2, StopChatStreamResponses, StreamError, StringIdResponse, StructuredCompletionData, StructuredCompletionError, StructuredCompletionError2, StructuredCompletionErrors, StructuredCompletionRequest, StructuredCompletionResponse, StructuredCompletionResponse2, StructuredCompletionResponses, TargetType, ToolSet, UpdateChannelSharePermission, UpdateMcpServerData, UpdateMcpServerError, UpdateMcpServerErrors, UpdateMcpServerResponse, UpdateMcpServerResponses, UpdateOperation, UpdateServerRequest, UpdateSharePermissionRequestV2, UpdateToolCallData, UpdateToolCallError, UpdateToolCallErrors, UpdateToolCallRequest, UpdateToolCallResponses, UpdateToolResponseData, UpdateToolResponseError, UpdateToolResponseErrors, UpdateToolResponseRequest, UpdateToolResponseResponses, UpsertAiProjectionData, UpsertAiProjectionError, UpsertAiProjectionErrors, UpsertAiProjectionResponse, UpsertAiProjectionResponses, UpsertProjectionRequest, Usage, UsageRequest, UsageSummary, UserPdfRect, UserToolResponseValue, WebCitation, WithChatId } from './types.gen';+export type { AccessLevel, AddMcpServerData, AddMcpServerError, AddMcpServerErrors, AddMcpServerResponse, AddMcpServerResponses, AddServerRequest, AiFeature, AssistantMessagePart, AttachmentMetadata, AttachmentType, CallToolData, CallToolError, CallToolErrors, CallToolRequest, CallToolResponse, CallToolResponse2, CallToolResponses, ChannelSharePermission, ChannelType, Chat, ChatAttachment, ChatHistory, ChatHistoryBatchMessagesRequest, ChatMessage, ChatMessageContent, ChatMessageError, ChatMessageWithAttachments, ChatPreview, ChatPreviewData, ChatResponse, ChatStream, ClientOptions, CompleteHandlerData, CompleteHandlerErrors, CompleteHandlerResponse, CompleteHandlerResponses, CompleteOnboardingRequest, CompletionUsage, ConnectedServer, ConversationRecord, CopyChatData, CopyChatError, CopyChatErrors, CopyChatResponse, CopyChatResponses, CreateChatData, CreateChatError, CreateChatErrors, CreateChatRequest, CreateChatResponse, CreateChatResponses, DeleteChatData, DeleteChatError, DeleteChatErrors, DeleteChatResponses, DeleteMcpServerData, DeleteMcpServerError, DeleteMcpServerErrors, DeleteMcpServerResponse, DeleteMcpServerResponses, DismissRunHandlerData, DismissRunHandlerErrors, DismissRunHandlerResponse, DismissRunHandlerResponses, DocumentCognitionServiceApiVersion, DocumentReference, DocumentTextPart, DynamicSchema, Entity, EntityType, ErrorBody, ErrorResponse, Expiry, FeatureUsage, FileType, GenericErrorResponse, GetBatchPreviewData, GetBatchPreviewError, GetBatchPreviewErrors, GetBatchPreviewRequest, GetBatchPreviewResponse, GetBatchPreviewResponse2, GetBatchPreviewResponses, GetChatData, GetChatError, GetChatErrors, GetChatHistoryBatchMessagesHandlerData, GetChatHistoryBatchMessagesHandlerError, GetChatHistoryBatchMessagesHandlerErrors, GetChatHistoryBatchMessagesHandlerResponse, GetChatHistoryBatchMessagesHandlerResponses, GetChatHistoryHandlerData, GetChatHistoryHandlerError, GetChatHistoryHandlerErrors, GetChatHistoryHandlerResponse, GetChatHistoryHandlerResponses, GetChatPermissionsData, GetChatPermissionsError, GetChatPermissionsErrors, GetChatPermissionsResponse, GetChatPermissionsResponse2, GetChatPermissionsResponses, GetChatResponse, GetChatResponse2, GetChatResponses, GetChatsForAttachmentHandlerData, GetChatsForAttachmentHandlerError, GetChatsForAttachmentHandlerErrors, GetChatsForAttachmentHandlerResponse, GetChatsForAttachmentHandlerResponses, GetChatsForAttachmentResponse, GetCitationHandlerData, GetCitationHandlerError, GetCitationHandlerErrors, GetCitationHandlerResponse, GetCitationHandlerResponses, GetMemoryHandlerData, GetMemoryHandlerError, GetMemoryHandlerErrors, GetMemoryHandlerResponse, GetMemoryHandlerResponses, GetStateHandler2Data, GetStateHandler2Errors, GetStateHandler2Response, GetStateHandler2Responses, GetStateHandlerData, GetStateHandlerErrors, GetStateHandlerResponse, GetStateHandlerResponses, GetUsageHandlerData, GetUsageHandlerError, GetUsageHandlerErrors, GetUsageHandlerResponse, GetUsageHandlerResponses, HealthHandlerData, HealthHandlerResponse, HealthHandlerResponses, HttpSendChatMessageRequest, ImportEntity, ImportRun, ImportSource, ImportState, ImportStatus, Initiator, JwtPayload, LinearIssueMeta, ListMcpServersData, ListMcpServersError, ListMcpServersErrors, ListMcpServersResponse, ListMcpServersResponses, MacroUserIdStr, McpAuthCallbackData, McpAuthCallbackError, McpAuthCallbackErrors, McpAuthCallbackResponses, McpOauthClientMetadataData, McpOauthClientMetadataResponses, MemoryErrorBody, MemoryResponse, MessageWithAttachments, NewAttachment, NewChatMessage, NewMessageAttachment, NotionDocMeta, OnboardingRow, OnboardingState, OnboardingStatus, PatchChatData, PatchChatError, PatchChatErrors, PatchChatRequest, PatchChatResponses, PermanentlyDeleteChatData, PermanentlyDeleteChatError, PermanentlyDeleteChatErrors, PermanentlyDeleteChatResponses, Price, ProjectionStateResponse, ProjectionStatus, RefreshCadence, RejectToolCallData, RejectToolCallError, RejectToolCallErrors, RejectToolCallRequest, RejectToolCallResponses, RetryGatherHandlerData, RetryGatherHandlerErrors, RetryGatherHandlerResponse, RetryGatherHandlerResponses, RevertDeleteChatData, RevertDeleteChatError, RevertDeleteChatErrors, RevertDeleteChatResponses, Role, RunImportHandlerData, RunImportHandlerErrors, RunImportHandlerResponse, RunImportHandlerResponses, RunImportOutcome, RunImportRequest, RunStatus, SendChatMessageData, SendChatMessageError, SendChatMessageErrors, SendChatMessagePayload, SendChatMessageResponse, SendChatMessageResponse2, SendChatMessageResponses, ServerResponse, SetPricingHandlerData, SetPricingHandlerError, SetPricingHandlerErrors, SetPricingHandlerResponses, SetPricingRequest, SharePermissionV2, SlackChannelMeta, SlackParticipant, StartAuthRequest, StartAuthResponse, StartMcpAuthData, StartMcpAuthError, StartMcpAuthErrors, StartMcpAuthResponse, StartMcpAuthResponses, StopChatStreamData, StopChatStreamError, StopChatStreamError2, StopChatStreamErrors, StopChatStreamRequest, StopChatStreamResponse, StopChatStreamResponse2, StopChatStreamResponses, StreamError, StringIdResponse, StructuredCompletionData, StructuredCompletionError, StructuredCompletionError2, StructuredCompletionErrors, StructuredCompletionRequest, StructuredCompletionResponse, StructuredCompletionResponse2, StructuredCompletionResponses, TargetType, ToolSet, UpdateChannelSharePermission, UpdateMcpServerData, UpdateMcpServerError, UpdateMcpServerErrors, UpdateMcpServerResponse, UpdateMcpServerResponses, UpdateOperation, UpdateServerRequest, UpdateSharePermissionRequestV2, UpdateToolCallData, UpdateToolCallError, UpdateToolCallErrors, UpdateToolCallRequest, UpdateToolCallResponses, UpdateToolResponseData, UpdateToolResponseError, UpdateToolResponseErrors, UpdateToolResponseRequest, UpdateToolResponseResponses, UpsertAiProjectionData, UpsertAiProjectionError, UpsertAiProjectionErrors, UpsertAiProjectionResponse, UpsertAiProjectionResponses, UpsertProjectionRequest, Usage, UsageRequest, UsageSummary, UserPdfRect, UserToolResponseValue, WebCitation, WithChatId } from './types.gen';diff --git a/packages/sdk/generated/cognition/sdk.gen.ts b/packages/sdk/generated/cognition/sdk.gen.tsindex 7501b942db..d3ca9d61b7 100644--- a/packages/sdk/generated/cognition/sdk.gen.ts+++ b/packages/sdk/generated/cognition/sdk.gen.ts@@ -2,7 +2,7 @@import type { Client, ClientMeta, Options as Options2, RequestResult, TDataShape } from './client';import { client } from './client.gen';-import type { AddMcpServerData, AddMcpServerErrors, AddMcpServerResponses, CallToolData, CallToolErrors, CallToolResponses, CompleteHandlerData, CompleteHandlerErrors, CompleteHandlerResponses, CopyChatData, CopyChatErrors, CopyChatResponses, CreateChatData, CreateChatErrors, CreateChatResponses, DeleteChatData, DeleteChatErrors, DeleteChatResponses, DeleteMcpServerData, DeleteMcpServerErrors, DeleteMcpServerResponses, DismissRunHandlerData, DismissRunHandlerErrors, DismissRunHandlerResponses, GetBatchPreviewData, GetBatchPreviewErrors, GetBatchPreviewResponses, GetChatData, GetChatErrors, GetChatHistoryBatchMessagesHandlerData, GetChatHistoryBatchMessagesHandlerErrors, GetChatHistoryBatchMessagesHandlerResponses, GetChatHistoryHandlerData, GetChatHistoryHandlerErrors, GetChatHistoryHandlerResponses, GetChatPermissionsData, GetChatPermissionsErrors, GetChatPermissionsResponses, GetChatResponses, GetChatsForAttachmentHandlerData, GetChatsForAttachmentHandlerErrors, GetChatsForAttachmentHandlerResponses, GetCitationHandlerData, GetCitationHandlerErrors, GetCitationHandlerResponses, GetMemoryHandlerData, GetMemoryHandlerErrors, GetMemoryHandlerResponses, GetStateHandler2Data, GetStateHandler2Errors, GetStateHandler2Responses, GetStateHandlerData, GetStateHandlerErrors, GetStateHandlerResponses, GetUsageHandlerData, GetUsageHandlerErrors, GetUsageHandlerResponses, HealthHandlerData, HealthHandlerResponses, ListMcpServersData, ListMcpServersErrors, ListMcpServersResponses, McpAuthCallbackData, McpAuthCallbackErrors, McpAuthCallbackResponses, PatchChatData, PatchChatErrors, PatchChatResponses, PermanentlyDeleteChatData, PermanentlyDeleteChatErrors, PermanentlyDeleteChatResponses, RejectToolCallData, RejectToolCallErrors, RejectToolCallResponses, RetryGatherHandlerData, RetryGatherHandlerErrors, RetryGatherHandlerResponses, RevertDeleteChatData, RevertDeleteChatErrors, RevertDeleteChatResponses, RunImportHandlerData, RunImportHandlerErrors, RunImportHandlerResponses, SendChatMessageData, SendChatMessageErrors, SendChatMessageResponses, SetPricingHandlerData, SetPricingHandlerErrors, SetPricingHandlerResponses, StartMcpAuthData, StartMcpAuthErrors, StartMcpAuthResponses, StopChatStreamData, StopChatStreamErrors, StopChatStreamResponses, StructuredCompletionData, StructuredCompletionErrors, StructuredCompletionResponses, UpdateMcpServerData, UpdateMcpServerErrors, UpdateMcpServerResponses, UpdateToolCallData, UpdateToolCallErrors, UpdateToolCallResponses, UpdateToolResponseData, UpdateToolResponseErrors, UpdateToolResponseResponses, UpsertAiProjectionData, UpsertAiProjectionErrors, UpsertAiProjectionResponses } from './types.gen';+import type { AddMcpServerData, AddMcpServerErrors, AddMcpServerResponses, CallToolData, CallToolErrors, CallToolResponses, CompleteHandlerData, CompleteHandlerErrors, CompleteHandlerResponses, CopyChatData, CopyChatErrors, CopyChatResponses, CreateChatData, CreateChatErrors, CreateChatResponses, DeleteChatData, DeleteChatErrors, DeleteChatResponses, DeleteMcpServerData, DeleteMcpServerErrors, DeleteMcpServerResponses, DismissRunHandlerData, DismissRunHandlerErrors, DismissRunHandlerResponses, GetBatchPreviewData, GetBatchPreviewErrors, GetBatchPreviewResponses, GetChatData, GetChatErrors, GetChatHistoryBatchMessagesHandlerData, GetChatHistoryBatchMessagesHandlerErrors, GetChatHistoryBatchMessagesHandlerResponses, GetChatHistoryHandlerData, GetChatHistoryHandlerErrors, GetChatHistoryHandlerResponses, GetChatPermissionsData, GetChatPermissionsErrors, GetChatPermissionsResponses, GetChatResponses, GetChatsForAttachmentHandlerData, GetChatsForAttachmentHandlerErrors, GetChatsForAttachmentHandlerResponses, GetCitationHandlerData, GetCitationHandlerErrors, GetCitationHandlerResponses, GetMemoryHandlerData, GetMemoryHandlerErrors, GetMemoryHandlerResponses, GetStateHandler2Data, GetStateHandler2Errors, GetStateHandler2Responses, GetStateHandlerData, GetStateHandlerErrors, GetStateHandlerResponses, GetUsageHandlerData, GetUsageHandlerErrors, GetUsageHandlerResponses, HealthHandlerData, HealthHandlerResponses, ListMcpServersData, ListMcpServersErrors, ListMcpServersResponses, McpAuthCallbackData, McpAuthCallbackErrors, McpAuthCallbackResponses, McpOauthClientMetadataData, McpOauthClientMetadataResponses, PatchChatData, PatchChatErrors, PatchChatResponses, PermanentlyDeleteChatData, PermanentlyDeleteChatErrors, PermanentlyDeleteChatResponses, RejectToolCallData, RejectToolCallErrors, RejectToolCallResponses, RetryGatherHandlerData, RetryGatherHandlerErrors, RetryGatherHandlerResponses, RevertDeleteChatData, RevertDeleteChatErrors, RevertDeleteChatResponses, RunImportHandlerData, RunImportHandlerErrors, RunImportHandlerResponses, SendChatMessageData, SendChatMessageErrors, SendChatMessageResponses, SetPricingHandlerData, SetPricingHandlerErrors, SetPricingHandlerResponses, StartMcpAuthData, StartMcpAuthErrors, StartMcpAuthResponses, StopChatStreamData, StopChatStreamErrors, StopChatStreamResponses, StructuredCompletionData, StructuredCompletionErrors, StructuredCompletionResponses, UpdateMcpServerData, UpdateMcpServerErrors, UpdateMcpServerResponses, UpdateToolCallData, UpdateToolCallErrors, UpdateToolCallResponses, UpdateToolResponseData, UpdateToolResponseErrors, UpdateToolResponseResponses, UpsertAiProjectionData, UpsertAiProjectionErrors, UpsertAiProjectionResponses } from './types.gen';export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean, TResponse = unknown> = Options2<TData, ThrowOnError, TResponse> & {/**@@ -348,6 +348,13 @@ export class Sdk extends HeyApiClient {return (options?.client ?? this.client).get<McpAuthCallbackResponses, McpAuthCallbackErrors, ThrowOnError>({ url: '/mcp/servers/auth/callback', ...options });}+ /**+ * Return Macro's public OAuth Client ID Metadata Document.+ */+ public mcpOauthClientMetadata<ThrowOnError extends boolean = false>(options?: Options<McpOauthClientMetadataData, ThrowOnError>): RequestResult<McpOauthClientMetadataResponses, unknown, ThrowOnError> {+ return (options?.client ?? this.client).get<McpOauthClientMetadataResponses, unknown, ThrowOnError>({ url: '/mcp/servers/auth/client-metadata', ...options });+ }+/*** Start the OAuth authorization flow for an MCP server.*/diff --git a/packages/sdk/generated/cognition/types.gen.ts b/packages/sdk/generated/cognition/types.gen.tsindex 91d6112ef8..b8be52439f 100644--- a/packages/sdk/generated/cognition/types.gen.ts+++ b/packages/sdk/generated/cognition/types.gen.ts@@ -2324,6 +2324,20 @@ export type McpAuthCallbackResponses = {200: unknown;};+export type McpOauthClientMetadataData = {+ body?: never;+ path?: never;+ query?: never;+ url: '/mcp/servers/auth/client-metadata';+};++export type McpOauthClientMetadataResponses = {+ /**+ * Macro OAuth client metadata document+ */+ 200: unknown;+};+export type StartMcpAuthData = {body: StartAuthRequest;path?: never;diff --git a/packages/sdk/specs/cognition.json b/packages/sdk/specs/cognition.jsonindex 7e46f4850e..06c92375e1 100644--- a/packages/sdk/specs/cognition.json+++ b/packages/sdk/specs/cognition.json@@ -1414,6 +1414,18 @@}}},+ "/mcp/servers/auth/client-metadata": {+ "get": {+ "tags": ["mcp"],+ "summary": "Return Macro's public OAuth Client ID Metadata Document.",+ "operationId": "mcp_oauth_client_metadata",+ "responses": {+ "200": {+ "description": "Macro OAuth client metadata document"+ }+ }+ }+ },"/mcp/servers/auth/start": {"post": {"tags": ["mcp"],diff --git a/packages/sdk/src/coverage/skipped.ts b/packages/sdk/src/coverage/skipped.tsindex 1f8bacfe5f..0ec194eb71 100644--- a/packages/sdk/src/coverage/skipped.ts+++ b/packages/sdk/src/coverage/skipped.ts@@ -101,6 +101,7 @@ export const cognitionExcluded = ['healthHandler','listMcpServers','mcpAuthCallback',+ 'mcpOauthClientMetadata','rejectToolCall','runImportHandler','dismissRunHandler',diff --git a/services/document_cognition_service/src/api/context/mod.rs b/services/document_cognition_service/src/api/context/mod.rsindex 23d61b3c77..c0893c2bab 100644--- a/services/document_cognition_service/src/api/context/mod.rs+++ b/services/document_cognition_service/src/api/context/mod.rs@@ -94,7 +94,7 @@ pub type DcsAiProjectionService =/// Concrete MCP router state for DCS.pub type DcsMcpRouterState = mcp_client::inbound::McpRouterState<mcp_client::outbound::pg_server_repo::PgServerRepo,- mcp_client::domain::service::OAuthService<+ mcp_client::outbound::oauth::OAuthService<mcp_client::outbound::pg_server_repo::PgServerRepo,mcp_client::outbound::redis_state_store::RedisOAuthStateStore,>,diff --git a/services/document_cognition_service/src/api/context/test.rs b/services/document_cognition_service/src/api/context/test.rsindex 4e80a6da86..fb94e8760b 100644--- a/services/document_cognition_service/src/api/context/test.rs+++ b/services/document_cognition_service/src/api/context/test.rs@@ -534,13 +534,22 @@ pub async fn test_api_context(pool: sqlx::Pool<sqlx::Postgres>) -> std::sync::Armcp_client::outbound::pg_server_repo::PgServerRepo::new(pool.clone(), mcp_key);let mcp_state_store =mcp_client::outbound::redis_state_store::RedisOAuthStateStore::new(redis_client);- let mcp_oauth = mcp_client::domain::service::OAuthService::new(+ let client_metadata = mcp_client::domain::models::OAuthClientMetadata::new(+ "http://localhost/mcp/servers/auth/client-metadata".to_string(),+ "http://localhost/mcp/servers/auth/callback".to_string(),+ );+ let mcp_oauth = mcp_client::outbound::oauth::OAuthService::new(mcp_repo.clone(),mcp_state_store,- "http://localhost/mcp/servers/auth/callback".to_string(),+ client_metadata.clone(),mcp_client::domain::provider_registry::PreRegisteredProviders::empty(),);- mcp_client::inbound::McpRouterState::new(mcp_repo, mcp_oauth, authorization_state)+ mcp_client::inbound::McpRouterState::new(+ mcp_repo,+ mcp_oauth,+ authorization_state,+ client_metadata,+ )},import_service: import_service.clone(),onboarding_service,diff --git a/services/document_cognition_service/src/api/swagger.rs b/services/document_cognition_service/src/api/swagger.rsindex 806b57db05..3039c880a5 100644--- a/services/document_cognition_service/src/api/swagger.rs+++ b/services/document_cognition_service/src/api/swagger.rs@@ -100,6 +100,7 @@ use utoipa::OpenApi;mcp_api::update_server,mcp_api::delete_server,mcp_api::start_auth,+ mcp_api::client_metadata,mcp_api::auth_callback),components(diff --git a/services/document_cognition_service/src/main.rs b/services/document_cognition_service/src/main.rsindex 9065cd6417..406534e659 100644--- a/services/document_cognition_service/src/main.rs+++ b/services/document_cognition_service/src/main.rs@@ -584,18 +584,19 @@ async fn main() -> anyhow::Result<()> {tracing::info!("initialized onboarding service");- let mcp_redirect_uri = format!(- "{}/mcp/servers/auth/callback",- DocumentCognitionServiceUrl::new()?,+ let mcp_public_url = DocumentCognitionServiceUrl::new()?;+ let mcp_client_metadata = mcp_client::domain::models::OAuthClientMetadata::new(+ format!("{mcp_public_url}/mcp/servers/auth/client-metadata"),+ format!("{mcp_public_url}/mcp/servers/auth/callback"),);let mcp_oauth_state_store =mcp_client::outbound::redis_state_store::RedisOAuthStateStore::new(redis_client.clone());let mcp_pre_registered =mcp_client::domain::provider_registry::PreRegisteredProviders::from_env()?;- let mcp_oauth = mcp_client::domain::service::OAuthService::new(+ let mcp_oauth = mcp_client::outbound::oauth::OAuthService::new(mcp_server_repo.clone(),mcp_oauth_state_store,- mcp_redirect_uri,+ mcp_client_metadata.clone(),mcp_pre_registered,);// The moment a connector finishes OAuth, reconcile onboarding for that@@ -618,6 +619,7 @@ async fn main() -> anyhow::Result<()> {mcp_server_repo,mcp_oauth,authorization_state.clone(),+ mcp_client_metadata,).with_auth_completed_hook(mcp_auth_hook);