refactor: move mcp catalog aggregation to wf_sources_mcp

src/wf_mcp/broker/service/core.py

@@ -25,6 +25,7 @@ from wf_sources_mcp.catalog import (
     CatalogNodeEntry,
     CatalogPromptEntry,
     CatalogResourceEntry,
+    CombinedCatalog,
 )
 from wf_sources_mcp.sdk import BackendAdapter, StatefulMcpRuntime, ToolExecutor
 from wf_sources_mcp.source_registry import SourceRegistryStore
@@ -38,7 +39,6 @@ from ...models import (
     ConnectionConfig,
 )
 from ..admin_capabilities import admin_source
-from ..catalog import CombinedCatalog
 from .builtins import builtin_sources
 from .connection_service import ConnectionService
 from .content_access import ContentAccessService

src/wf_mcp/broker/service/source_catalog.py

@@ -22,6 +22,8 @@ from wf_sources_mcp.catalog import (
     CatalogNodeEntry,
     CatalogPromptEntry,
     CatalogResourceEntry,
+    CombinedCatalog,
+    snapshot_from_specs,
 )
 from wf_sources_mcp.connections import mcp_source_connection_from_connection_config
 from wf_sources_mcp.sdk import ToolExecutor
@@ -33,7 +35,6 @@ from ...models import (
     CatalogSnapshot,
 )
 from ...workflow.wrappers import _model_from_schema
-from ..catalog import CombinedCatalog, snapshot_from_specs
 from .specs import get_qualified_spec, qualify_spec
 
 ConnectionLookup = Callable[[str], ConnectionConfig]

src/wf_mcp/broker/service/upstream_transport.py

@@ -17,7 +17,6 @@ from wf_artifacts import (
     WorkflowArtifact,
     WorkflowDeployment,
 )
-from wf_mcp.broker.catalog import snapshot_from_specs
 from wf_mcp.broker.discovery import (
     discover_connection_capabilities,
     specs_from_discovered_tools,
@@ -26,6 +25,7 @@ from wf_mcp.events import McpEvent, make_event
 from wf_mcp.models import ConnectionConfig
 from wf_mcp.shared.errors import error_payload
 from wf_sources_mcp.auth import AuthRecord, connection_auth_diagnostic
+from wf_sources_mcp.catalog import snapshot_from_specs
 from wf_sources_mcp.catalog.models import CatalogSnapshot
 from wf_sources_mcp.connections import (
     mcp_source_connection_from_connection_config,