fixing mcp timing issue

Author: EMaher

src/services/publish-service.ts

@@ -283,6 +283,19 @@ async function executePuts(
           results
         );
       }
+    } else if (tier === 2) {
+      const { mcpApis, regularTier2 } = await splitMcpApis(
+        store,
+        config.sourceDir,
+        descriptors
+      );
+
+      await publishAndOutput(client, store, context, config, regularTier2, results);
+
+      if (mcpApis.length > 0) {
+        logger.debug(`Publishing ${mcpApis.length} MCP API resource(s) after regular tier 2 resources`);
+        await publishAndOutput(client, store, context, config, mcpApis, results);
+      }
     } else {
       // For tiers 3/4, exclude child resources whose parent is being published
       // in tier 2 (publishApi/publishProduct handle their children internally).
@@ -421,6 +434,31 @@ async function splitPoolBackends(
   return { poolBackends, regularTier1 };
 }
 
+async function splitMcpApis(
+  store: IArtifactStore,
+  sourceDir: string,
+  descriptors: ResourceDescriptor[]
+): Promise<{ mcpApis: ResourceDescriptor[]; regularTier2: ResourceDescriptor[] }> {
+  const mcpApis: ResourceDescriptor[] = [];
+  const regularTier2: ResourceDescriptor[] = [];
+
+  for (const descriptor of descriptors) {
+    if (descriptor.type === ResourceType.Api) {
+      const json = await store.readResource(sourceDir, descriptor);
+      const props = json?.properties as Record<string, unknown> | undefined;
+      const mcpTools = props?.mcpTools;
+      if (Array.isArray(mcpTools) && mcpTools.length > 0) {
+        mcpApis.push(descriptor);
+        continue;
+      }
+    }
+
+    regularTier2.push(descriptor);
+  }
+
+  return { mcpApis, regularTier2 };
+}
+
 /**
  * Publish a single tier of resources in parallel.
  */

tests/unit/services/publish-service.test.ts

@@ -207,6 +207,46 @@ describe('publish-service', () => {
       expect(publishApi).toHaveBeenCalled();
     });
 
+    it('should publish regular APIs before MCP APIs in tier 2', async () => {
+      const resources: ResourceDescriptor[] = [
+        { type: ResourceType.Api, nameParts: ['src-rest-openapi'] },
+        { type: ResourceType.Api, nameParts: ['src-mcp-from-api'] },
+      ];
+
+      const client = createMockClient();
+      const store = createMockStore(resources);
+
+      store.readResource.mockImplementation(async (_sourceDir: string, descriptor: ResourceDescriptor) => {
+        const name = descriptor.nameParts[descriptor.nameParts.length - 1] ?? '';
+        if (name === 'src-mcp-from-api') {
+          return { name, properties: { mcpTools: [{ operationId: '/apis/src-rest-openapi/operations/get' }] } };
+        }
+        return { name, properties: {} };
+      });
+
+      const apiCallOrder: string[] = [];
+      vi.mocked(publishApi).mockImplementation(async (_client, _store, _context, descriptor) => {
+        apiCallOrder.push(descriptor.nameParts[0] ?? '');
+        return {
+          descriptor,
+          status: 'success',
+          action: 'put',
+        };
+      });
+
+      const config: PublishConfig = {
+        service: testContext,
+        sourceDir: '/source',
+        dryRun: false,
+        deleteUnmatched: false,
+        logLevel: LogLevel.INFO,
+      };
+
+      await runPublish(client, store, config);
+
+      expect(apiCallOrder).toEqual(['src-rest-openapi', 'src-mcp-from-api']);
+    });
+
     it('should call generateDryRunReport in dry-run mode', async () => {
       const resources = [
         { type: ResourceType.Tag, nameParts: ['tag1'] },