Fix --branch and --tag for builds start

The flags were sending sourceBranchOrTag as an attribute with a branch
name string, but the API requires it as a relationship pointing to a
scmGitReferences resource ID.

The command now resolves the branch/tag to its resource ID via a
two-step lookup: fetch the workflow to get its repository ID, then
query the repository's git references to find the matching ref.

Author: emoryalimam

Sources/XcodeCloudCLI/Commands/Builds/BuildsCommand.swift

@@ -759,18 +759,31 @@ struct BuildsStartCommand: ParsableCommand {
         let quiet = options.quiet
 
         do {
-            let gitReference: GitReference?
-            if let branch = branch {
-                gitReference = .branch(branch)
-            } else if let tag = tag {
-                gitReference = .tag(tag)
+            let gitReferenceId: String?
+            if branch != nil || tag != nil {
+                let kind = branch != nil ? "BRANCH" : "TAG"
+                let name = branch ?? tag!
+                printVerbose("Resolving \(kind.lowercased()) '\(name)'...", verbose: verbose)
+                let workflow = try runAsync { try await client.getWorkflow(id: wfId) }
+                guard let repoId = workflow.data.relationships?.repository?.data?.id else {
+                    printError("Could not determine repository for workflow \(wfId)")
+                    throw ExitCode.failure
+                }
+                let refs = try runAsync { try await client.listGitReferences(repositoryId: repoId) }
+                guard let ref = refs.data.first(where: {
+                    $0.attributes?.name == name && $0.attributes?.kind == kind && $0.attributes?.isDeleted != true
+                }) else {
+                    printError("\(kind == "BRANCH" ? "Branch" : "Tag") '\(name)' not found in repository")
+                    throw ExitCode.failure
+                }
+                gitReferenceId = ref.id
             } else {
-                gitReference = nil
+                gitReferenceId = nil
             }
 
             printVerbose("Starting build for workflow \(wfId)...", verbose: verbose)
             let response = try runAsync {
-                try await client.startBuildRun(workflowId: wfId, gitReference: gitReference)
+                try await client.startBuildRun(workflowId: wfId, gitReferenceId: gitReferenceId)
             }
 
             if !quiet {

Sources/XcodeCloudKit/API/APIClient.swift

@@ -50,11 +50,17 @@ public actor APIClient {
         try await request(.getBuildRun(id: id))
     }
 
-    public func startBuildRun(workflowId: String, gitReference: GitReference? = nil) async throws -> APIResponse<CiBuildRun> {
-        let body = CiBuildRunCreateRequest(workflowId: workflowId, gitReference: gitReference)
+    public func startBuildRun(workflowId: String, gitReferenceId: String? = nil) async throws -> APIResponse<CiBuildRun> {
+        let body = CiBuildRunCreateRequest(workflowId: workflowId, gitReferenceId: gitReferenceId)
         return try await request(.startBuildRun, body: body)
     }
 
+    // MARK: - SCM Git References
+
+    public func listGitReferences(repositoryId: String) async throws -> APIListResponse<ScmGitReference> {
+        try await request(.listGitReferences(repositoryId: repositoryId))
+    }
+
     // MARK: - Build Actions
 
     public func listBuildActions(buildRunId: String) async throws -> APIListResponse<CiBuildAction> {

Sources/XcodeCloudKit/API/Endpoints.swift

@@ -17,6 +17,7 @@ public enum Endpoint {
     case getIssue(id: String)
     case listTestResults(buildActionId: String)
     case getTestResult(id: String)
+    case listGitReferences(repositoryId: String)
 
     public var path: String {
         switch self {
@@ -53,6 +54,8 @@ public enum Endpoint {
             return "/v1/ciBuildActions/\(buildActionId)/testResults"
         case .getTestResult(let id):
             return "/v1/ciTestResults/\(id)"
+        case .listGitReferences(let repositoryId):
+            return "/v1/scmRepositories/\(repositoryId)/gitReferences"
         }
     }
 
@@ -94,6 +97,10 @@ public enum Endpoint {
             if let cursor = cursor {
                 items.append(URLQueryItem(name: "cursor", value: cursor))
             }
+        case .getWorkflow:
+            items.append(URLQueryItem(name: "include", value: "repository"))
+        case .listGitReferences:
+            items.append(URLQueryItem(name: "limit", value: "200"))
         default:
             break
         }

Sources/XcodeCloudKit/API/Models/APIModels.swift

@@ -373,48 +373,46 @@ public struct RelationshipList: Codable, Sendable {
 public struct CiBuildRunCreateRequest: Codable, Sendable {
     public let data: CiBuildRunCreateData
 
-    public init(workflowId: String, gitReference: GitReference? = nil) {
-        self.data = CiBuildRunCreateData(workflowId: workflowId, gitReference: gitReference)
+    public init(workflowId: String, gitReferenceId: String? = nil) {
+        self.data = CiBuildRunCreateData(workflowId: workflowId, gitReferenceId: gitReferenceId)
     }
 }
 
 public struct CiBuildRunCreateData: Codable, Sendable {
     public var type: String
-    public let attributes: CiBuildRunCreateAttributes?
     public let relationships: CiBuildRunCreateRelationships
 
-    public init(workflowId: String, gitReference: GitReference? = nil) {
+    public init(workflowId: String, gitReferenceId: String? = nil) {
         self.type = "ciBuildRuns"
-        self.attributes = gitReference.map { CiBuildRunCreateAttributes(sourceBranchOrTag: $0) }
-        self.relationships = CiBuildRunCreateRelationships(workflowId: workflowId)
-    }
-}
-
-public struct CiBuildRunCreateAttributes: Codable, Sendable {
-    public let sourceBranchOrTag: GitReference?
-}
-
-public struct GitReference: Codable, Sendable {
-    public let kind: String  // "BRANCH" or "TAG"
-    public let name: String
-
-    public static func branch(_ name: String) -> GitReference {
-        GitReference(kind: "BRANCH", name: name)
-    }
-
-    public static func tag(_ name: String) -> GitReference {
-        GitReference(kind: "TAG", name: name)
+        self.relationships = CiBuildRunCreateRelationships(workflowId: workflowId, gitReferenceId: gitReferenceId)
     }
 }
 
 public struct CiBuildRunCreateRelationships: Codable, Sendable {
     public let workflow: CreateRelationship
+    public let sourceBranchOrTag: CreateRelationship?
 
-    public init(workflowId: String) {
+    public init(workflowId: String, gitReferenceId: String? = nil) {
         self.workflow = CreateRelationship(id: workflowId, type: "ciWorkflows")
+        self.sourceBranchOrTag = gitReferenceId.map { CreateRelationship(id: $0, type: "scmGitReferences") }
     }
 }
 
+// MARK: - SCM Git References
+
+public struct ScmGitReference: Codable, Sendable, Identifiable {
+    public let type: String
+    public let id: String
+    public let attributes: ScmGitReferenceAttributes?
+}
+
+public struct ScmGitReferenceAttributes: Codable, Sendable {
+    public let name: String?
+    public let canonicalName: String?
+    public let isDeleted: Bool?
+    public let kind: String?  // "BRANCH" or "TAG"
+}
+
 public struct CreateRelationship: Codable, Sendable {
     public let data: RelationshipData