Fix build action artifact retrieval

backslash-f · backslash-f · commit 388a3c4ee100 · 2026-03-30T18:33:46.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thatfactory/xcode-cloud-mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Minimal MCP server for discovering Xcode Cloud workflows and retrieving build logs, issues, and test artifacts.",
   "license": "MIT",
   "type": "module",
diff --git a/src/api/resources/artifacts.ts b/src/api/resources/artifacts.ts
@@ -16,11 +16,11 @@ export interface GroupedArtifacts {
  */
 export class ArtifactsClient extends BaseAPIClient {
   /**
-   * List artifacts for a build run.
+   * List artifacts for a build action.
    */
-  async listForBuildRun(buildRunId: string): Promise<GroupedArtifacts> {
+  async listForBuildAction(buildActionId: string): Promise<GroupedArtifacts> {
     const response = await this.get<CiArtifact[]>(
-      `/v1/ciBuildRuns/${buildRunId}/artifacts`,
+      `/v1/ciBuildActions/${buildActionId}/artifacts`,
     );
 
     return groupArtifactsByType(response.data);
@@ -51,6 +51,7 @@ export function groupArtifactsByType(artifacts: CiArtifact[]): GroupedArtifacts
   for (const artifact of artifacts) {
     switch (artifact.attributes.fileType) {
       case 'LOG':
+      case 'LOG_BUNDLE':
         groupedArtifacts.logs.push(artifact);
         break;
       case 'ARCHIVE':
@@ -76,3 +77,32 @@ export function groupArtifactsByType(artifacts: CiArtifact[]): GroupedArtifacts
 
   return groupedArtifacts;
 }
+
+/**
+ * Merge grouped artifact collections from multiple build actions.
+ */
+export function mergeGroupedArtifacts(
+  groupedArtifactCollections: GroupedArtifacts[],
+): GroupedArtifacts {
+  const mergedArtifacts: GroupedArtifacts = {
+    logs: [],
+    archives: [],
+    screenshots: [],
+    videos: [],
+    resultBundles: [],
+    testProducts: [],
+    other: [],
+  };
+
+  for (const groupedArtifacts of groupedArtifactCollections) {
+    mergedArtifacts.logs.push(...groupedArtifacts.logs);
+    mergedArtifacts.archives.push(...groupedArtifacts.archives);
+    mergedArtifacts.screenshots.push(...groupedArtifacts.screenshots);
+    mergedArtifacts.videos.push(...groupedArtifacts.videos);
+    mergedArtifacts.resultBundles.push(...groupedArtifacts.resultBundles);
+    mergedArtifacts.testProducts.push(...groupedArtifacts.testProducts);
+    mergedArtifacts.other.push(...groupedArtifacts.other);
+  }
+
+  return mergedArtifacts;
+}
diff --git a/src/api/resources/builds.ts b/src/api/resources/builds.ts
@@ -1,5 +1,5 @@
 import { BaseAPIClient } from '../base-client.js';
-import type { CiBuildRun } from '../types.js';
+import type { CiBuildAction, CiBuildRun } from '../types.js';
 
 /**
  * Build run endpoints.
@@ -26,4 +26,15 @@ export class BuildsClient extends BaseAPIClient {
 
     return response.data;
   }
+
+  /**
+   * List build actions for a build run.
+   */
+  async getActions(buildRunId: string): Promise<CiBuildAction[]> {
+    const response = await this.get<CiBuildAction[]>(
+      `/v1/ciBuildRuns/${buildRunId}/actions`,
+    );
+
+    return response.data;
+  }
 }
diff --git a/src/api/types.ts b/src/api/types.ts
@@ -93,8 +93,27 @@ export interface CiBuildRun {
   };
 }
 
+/**
+ * Xcode Cloud build action.
+ */
+export interface CiBuildAction {
+  type: 'ciBuildActions';
+  id: string;
+  attributes: {
+    actionType: 'BUILD' | 'TEST' | 'ANALYZE' | 'ARCHIVE';
+    issueCounts?: CiIssueCounts | null;
+    executionProgress: 'PENDING' | 'RUNNING' | 'COMPLETE';
+    name: string;
+    startedDate?: string;
+    completionStatus?: 'SUCCEEDED' | 'FAILED' | 'ERRORED' | 'CANCELED' | 'SKIPPED';
+    finishedDate?: string;
+    isRequiredToPass?: boolean;
+  };
+}
+
 export type CiArtifactFileType =
   | 'LOG'
+  | 'LOG_BUNDLE'
   | 'ARCHIVE'
   | 'XCODEBUILD_ARCHIVE'
   | 'RESULT_BUNDLE'
diff --git a/src/index.ts b/src/index.ts
@@ -22,7 +22,7 @@ export function createServer(): McpServer {
 
   const server = new McpServer({
     name: 'Xcode Cloud MCP',
-    version: '0.1.0',
+    version: '0.1.1',
   });
 
   registerDiscoveryTools(server, client);
diff --git a/src/tools/results.ts b/src/tools/results.ts
@@ -6,6 +6,7 @@ import {
   resolveBuildLocator,
   type BuildSelector,
 } from '../utils/build-locator.js';
+import { collectBuildRunArtifacts } from '../utils/build-artifacts.js';
 import {
   extractTextFromArtifact,
   summarizeLogTexts,
@@ -60,7 +61,7 @@ export function registerResultTools(
     async (input: BuildLookupInput & { maxCharacters?: number }) => {
       try {
         const buildRun = await resolveBuildLocator(client, input);
-        const groupedArtifacts = await client.artifacts.listForBuildRun(buildRun.id);
+        const groupedArtifacts = await collectBuildRunArtifacts(client, buildRun.id);
         const maxCharacters = input.maxCharacters ?? 8000;
         const parsedLogTexts = await downloadLogTexts(
           client,
diff --git a/src/tools/tests.ts b/src/tools/tests.ts
@@ -6,6 +6,7 @@ import {
   resolveBuildLocator,
   type BuildSelector,
 } from '../utils/build-locator.js';
+import { collectBuildRunArtifacts } from '../utils/build-artifacts.js';
 import {
   extractTextFromArtifact,
   summarizeLogTexts,
@@ -36,7 +37,7 @@ export function registerTestTools(
     async (input: BuildLookupInput) => {
       try {
         const buildRun = await resolveBuildLocator(client, input);
-        const groupedArtifacts = await client.artifacts.listForBuildRun(buildRun.id);
+        const groupedArtifacts = await collectBuildRunArtifacts(client, buildRun.id);
         const parsedLogTexts = await downloadLogTexts(
           client,
           groupedArtifacts.logs,
@@ -80,7 +81,7 @@ export function registerTestTools(
     async (input: BuildLookupInput) => {
       try {
         const buildRun = await resolveBuildLocator(client, input);
-        const groupedArtifacts = await client.artifacts.listForBuildRun(buildRun.id);
+        const groupedArtifacts = await collectBuildRunArtifacts(client, buildRun.id);
 
         return jsonResponse({
           buildRun: {
diff --git a/src/utils/build-artifacts.ts b/src/utils/build-artifacts.ts
@@ -0,0 +1,22 @@
+import type { AppStoreConnectClient } from '../api/client.js';
+import {
+  mergeGroupedArtifacts,
+  type GroupedArtifacts,
+} from '../api/resources/artifacts.js';
+
+/**
+ * Resolve all artifacts for a build run by aggregating artifacts from each build action.
+ */
+export async function collectBuildRunArtifacts(
+  client: AppStoreConnectClient,
+  buildRunId: string,
+): Promise<GroupedArtifacts> {
+  const buildActions = await client.builds.getActions(buildRunId);
+  const groupedArtifactCollections = await Promise.all(
+    buildActions.map((buildAction) =>
+      client.artifacts.listForBuildAction(buildAction.id),
+    ),
+  );
+
+  return mergeGroupedArtifacts(groupedArtifactCollections);
+}
diff --git a/tests/artifacts.test.ts b/tests/artifacts.test.ts
@@ -1,26 +1,47 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import { groupArtifactsByType } from '../src/api/resources/artifacts.js';
+import {
+  groupArtifactsByType,
+  mergeGroupedArtifacts,
+} from '../src/api/resources/artifacts.js';
 import type { CiArtifact } from '../src/api/types.js';
 
 test('groupArtifactsByType classifies known artifact types', () => {
   const groupedArtifacts = groupArtifactsByType([
     createArtifact('1', 'LOG'),
-    createArtifact('2', 'SCREENSHOT'),
-    createArtifact('3', 'VIDEO'),
-    createArtifact('4', 'RESULT_BUNDLE'),
-    createArtifact('5', 'TEST_PRODUCTS'),
-    createArtifact('6', 'ARCHIVE'),
+    createArtifact('2', 'LOG_BUNDLE'),
+    createArtifact('3', 'SCREENSHOT'),
+    createArtifact('4', 'VIDEO'),
+    createArtifact('5', 'RESULT_BUNDLE'),
+    createArtifact('6', 'TEST_PRODUCTS'),
+    createArtifact('7', 'ARCHIVE'),
   ]);
 
-  assert.equal(groupedArtifacts.logs.length, 1);
+  assert.equal(groupedArtifacts.logs.length, 2);
   assert.equal(groupedArtifacts.screenshots.length, 1);
   assert.equal(groupedArtifacts.videos.length, 1);
   assert.equal(groupedArtifacts.resultBundles.length, 1);
   assert.equal(groupedArtifacts.testProducts.length, 1);
   assert.equal(groupedArtifacts.archives.length, 1);
 });
 
+test('mergeGroupedArtifacts combines action artifact groups', () => {
+  const mergedArtifacts = mergeGroupedArtifacts([
+    groupArtifactsByType([
+      createArtifact('1', 'LOG'),
+      createArtifact('2', 'SCREENSHOT'),
+    ]),
+    groupArtifactsByType([
+      createArtifact('3', 'LOG'),
+      createArtifact('4', 'RESULT_BUNDLE'),
+    ]),
+  ]);
+
+  assert.equal(mergedArtifacts.logs.length, 2);
+  assert.equal(mergedArtifacts.screenshots.length, 1);
+  assert.equal(mergedArtifacts.resultBundles.length, 1);
+});
+
 function createArtifact(
   id: string,
   fileType: CiArtifact['attributes']['fileType'],
diff --git a/tests/tools.test.ts b/tests/tools.test.ts
@@ -1,7 +1,13 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import type { AppStoreConnectClient } from '../src/api/client.js';
-import type { CiArtifact, CiBuildRun, CiProduct, CiWorkflow } from '../src/api/types.js';
+import type {
+  CiArtifact,
+  CiBuildAction,
+  CiBuildRun,
+  CiProduct,
+  CiWorkflow,
+} from '../src/api/types.js';
 import { registerBuildRunTools } from '../src/tools/build-runs.js';
 import { registerDiscoveryTools } from '../src/tools/discovery.js';
 import { registerResultTools } from '../src/tools/results.js';
@@ -81,6 +87,17 @@ test('registered tools expose product, workflow, and build data', async () => {
     'screenshot.png',
     'SCREENSHOT',
   );
+  const buildAction: CiBuildAction = {
+    id: 'action-1',
+    type: 'ciBuildActions',
+    attributes: {
+      actionType: 'TEST',
+      executionProgress: 'COMPLETE',
+      name: 'Tests',
+      completionStatus: 'FAILED',
+      isRequiredToPass: true,
+    },
+  };
 
   const client = {
     products: {
@@ -92,9 +109,10 @@ test('registered tools expose product, workflow, and build data', async () => {
     builds: {
       getById: async () => buildRun,
       listForWorkflow: async () => [buildRun],
+      getActions: async () => [buildAction],
     },
     artifacts: {
-      listForBuildRun: async () => ({
+      listForBuildAction: async () => ({
         logs: [logArtifact],
         archives: [],
         screenshots: [screenshotArtifact],

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@thatfactory/xcode-cloud-mcp",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.1.1",`
`4`	`4`	`"description": "Minimal MCP server for discovering Xcode Cloud workflows and retrieving build logs, issues, and test artifacts.",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "module",`