diff --git a/internal/agent/http_cache/tuistcache/api/oas_defaults_gen.go b/internal/agent/http_cache/tuistcache/api/oas_defaults_gen.go
index 23ae46f4..e1a50bf6 100644
--- a/internal/agent/http_cache/tuistcache/api/oas_defaults_gen.go
+++ b/internal/agent/http_cache/tuistcache/api/oas_defaults_gen.go
@@ -57,3 +57,11 @@ func (s *StartPreviewsMultipartUploadOK) setDefaults() {
 		s.Status = val
 	}
 }
+
+// setDefaults set default value of fields.
+func (s *StartPreviewsMultipartUploadReq) setDefaults() {
+	{
+		val := StartPreviewsMultipartUploadReqType("app_bundle")
+		s.Type.SetTo(val)
+	}
+}
diff --git a/internal/agent/http_cache/tuistcache/api/oas_json_gen.go b/internal/agent/http_cache/tuistcache/api/oas_json_gen.go
index 471dfee3..96e3d563 100644
--- a/internal/agent/http_cache/tuistcache/api/oas_json_gen.go
+++ b/internal/agent/http_cache/tuistcache/api/oas_json_gen.go
@@ -7903,6 +7903,39 @@ func (s *OptStartPreviewsMultipartUploadReq) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }
 
+// Encode encodes StartPreviewsMultipartUploadReqType as json.
+func (o OptStartPreviewsMultipartUploadReqType) Encode(e *jx.Encoder) {
+	if !o.Set {
+		return
+	}
+	e.Str(string(o.Value))
+}
+
+// Decode decodes StartPreviewsMultipartUploadReqType from json.
+func (o *OptStartPreviewsMultipartUploadReqType) Decode(d *jx.Decoder) error {
+	if o == nil {
+		return errors.New("invalid: unable to decode OptStartPreviewsMultipartUploadReqType to nil")
+	}
+	o.Set = true
+	if err := o.Value.Decode(d); err != nil {
+		return err
+	}
+	return nil
+}
+
+// MarshalJSON implements stdjson.Marshaler.
+func (s OptStartPreviewsMultipartUploadReqType) MarshalJSON() ([]byte, error) {
+	e := jx.Encoder{}
+	s.Encode(&e)
+	return e.Bytes(), nil
+}
+
+// UnmarshalJSON implements stdjson.Unmarshaler.
+func (s *OptStartPreviewsMultipartUploadReqType) UnmarshalJSON(data []byte) error {
+	d := jx.DecodeBytes(data)
+	return s.Decode(d)
+}
+
 // Encode encodes string as json.
 func (o OptString) Encode(e *jx.Encoder) {
 	if !o.Set {
@@ -10227,16 +10260,37 @@ func (s *StartPreviewsMultipartUploadReq) Encode(e *jx.Encoder) {
 
 // encodeFields encodes fields.
 func (s *StartPreviewsMultipartUploadReq) encodeFields(e *jx.Encoder) {
+	{
+		if s.BundleIdentifier.Set {
+			e.FieldStart("bundle_identifier")
+			s.BundleIdentifier.Encode(e)
+		}
+	}
 	{
 		if s.DisplayName.Set {
 			e.FieldStart("display_name")
 			s.DisplayName.Encode(e)
 		}
 	}
+	{
+		if s.Type.Set {
+			e.FieldStart("type")
+			s.Type.Encode(e)
+		}
+	}
+	{
+		if s.Version.Set {
+			e.FieldStart("version")
+			s.Version.Encode(e)
+		}
+	}
 }
 
-var jsonFieldsNameOfStartPreviewsMultipartUploadReq = [1]string{
-	0: "display_name",
+var jsonFieldsNameOfStartPreviewsMultipartUploadReq = [4]string{
+	0: "bundle_identifier",
+	1: "display_name",
+	2: "type",
+	3: "version",
 }
 
 // Decode decodes StartPreviewsMultipartUploadReq from json.
@@ -10244,9 +10298,20 @@ func (s *StartPreviewsMultipartUploadReq) Decode(d *jx.Decoder) error {
 	if s == nil {
 		return errors.New("invalid: unable to decode StartPreviewsMultipartUploadReq to nil")
 	}
+	s.setDefaults()
 
 	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
 		switch string(k) {
+		case "bundle_identifier":
+			if err := func() error {
+				s.BundleIdentifier.Reset()
+				if err := s.BundleIdentifier.Decode(d); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"bundle_identifier\"")
+			}
 		case "display_name":
 			if err := func() error {
 				s.DisplayName.Reset()
@@ -10257,6 +10322,26 @@ func (s *StartPreviewsMultipartUploadReq) Decode(d *jx.Decoder) error {
 			}(); err != nil {
 				return errors.Wrap(err, "decode field \"display_name\"")
 			}
+		case "type":
+			if err := func() error {
+				s.Type.Reset()
+				if err := s.Type.Decode(d); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"type\"")
+			}
+		case "version":
+			if err := func() error {
+				s.Version.Reset()
+				if err := s.Version.Decode(d); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"version\"")
+			}
 		default:
 			return d.Skip()
 		}
@@ -10281,6 +10366,46 @@ func (s *StartPreviewsMultipartUploadReq) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }
 
+// Encode encodes StartPreviewsMultipartUploadReqType as json.
+func (s StartPreviewsMultipartUploadReqType) Encode(e *jx.Encoder) {
+	e.Str(string(s))
+}
+
+// Decode decodes StartPreviewsMultipartUploadReqType from json.
+func (s *StartPreviewsMultipartUploadReqType) Decode(d *jx.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode StartPreviewsMultipartUploadReqType to nil")
+	}
+	v, err := d.StrBytes()
+	if err != nil {
+		return err
+	}
+	// Try to use constant string.
+	switch StartPreviewsMultipartUploadReqType(v) {
+	case StartPreviewsMultipartUploadReqTypeAppBundle:
+		*s = StartPreviewsMultipartUploadReqTypeAppBundle
+	case StartPreviewsMultipartUploadReqTypeIpa:
+		*s = StartPreviewsMultipartUploadReqTypeIpa
+	default:
+		*s = StartPreviewsMultipartUploadReqType(v)
+	}
+
+	return nil
+}
+
+// MarshalJSON implements stdjson.Marshaler.
+func (s StartPreviewsMultipartUploadReqType) MarshalJSON() ([]byte, error) {
+	e := jx.Encoder{}
+	s.Encode(&e)
+	return e.Bytes(), nil
+}
+
+// UnmarshalJSON implements stdjson.Unmarshaler.
+func (s *StartPreviewsMultipartUploadReqType) UnmarshalJSON(data []byte) error {
+	d := jx.DecodeBytes(data)
+	return s.Decode(d)
+}
+
 // Encode encodes StartPreviewsMultipartUploadUnauthorized as json.
 func (s *StartPreviewsMultipartUploadUnauthorized) Encode(e *jx.Encoder) {
 	unwrapped := (*Error)(s)
diff --git a/internal/agent/http_cache/tuistcache/api/oas_request_decoders_gen.go b/internal/agent/http_cache/tuistcache/api/oas_request_decoders_gen.go
index ef4ac2e5..61c8cd58 100644
--- a/internal/agent/http_cache/tuistcache/api/oas_request_decoders_gen.go
+++ b/internal/agent/http_cache/tuistcache/api/oas_request_decoders_gen.go
@@ -1006,6 +1006,21 @@ func (s *Server) decodeStartPreviewsMultipartUploadRequest(r *http.Request) (
 			}
 			return req, close, err
 		}
+		if err := func() error {
+			if value, ok := request.Get(); ok {
+				if err := func() error {
+					if err := value.Validate(); err != nil {
+						return err
+					}
+					return nil
+				}(); err != nil {
+					return err
+				}
+			}
+			return nil
+		}(); err != nil {
+			return req, close, errors.Wrap(err, "validate")
+		}
 		return request, close, nil
 	default:
 		return req, close, validate.InvalidContentType(ct)
diff --git a/internal/agent/http_cache/tuistcache/api/oas_schemas_gen.go b/internal/agent/http_cache/tuistcache/api/oas_schemas_gen.go
index f4a4b365..477d9b1a 100644
--- a/internal/agent/http_cache/tuistcache/api/oas_schemas_gen.go
+++ b/internal/agent/http_cache/tuistcache/api/oas_schemas_gen.go
@@ -2799,6 +2799,52 @@ func (o OptStartPreviewsMultipartUploadReq) Or(d StartPreviewsMultipartUploadReq
 	return d
 }
 
+// NewOptStartPreviewsMultipartUploadReqType returns new OptStartPreviewsMultipartUploadReqType with value set to v.
+func NewOptStartPreviewsMultipartUploadReqType(v StartPreviewsMultipartUploadReqType) OptStartPreviewsMultipartUploadReqType {
+	return OptStartPreviewsMultipartUploadReqType{
+		Value: v,
+		Set:   true,
+	}
+}
+
+// OptStartPreviewsMultipartUploadReqType is optional StartPreviewsMultipartUploadReqType.
+type OptStartPreviewsMultipartUploadReqType struct {
+	Value StartPreviewsMultipartUploadReqType
+	Set   bool
+}
+
+// IsSet returns true if OptStartPreviewsMultipartUploadReqType was set.
+func (o OptStartPreviewsMultipartUploadReqType) IsSet() bool { return o.Set }
+
+// Reset unsets value.
+func (o *OptStartPreviewsMultipartUploadReqType) Reset() {
+	var v StartPreviewsMultipartUploadReqType
+	o.Value = v
+	o.Set = false
+}
+
+// SetTo sets value to v.
+func (o *OptStartPreviewsMultipartUploadReqType) SetTo(v StartPreviewsMultipartUploadReqType) {
+	o.Set = true
+	o.Value = v
+}
+
+// Get returns value and boolean that denotes whether value was set.
+func (o OptStartPreviewsMultipartUploadReqType) Get() (v StartPreviewsMultipartUploadReqType, ok bool) {
+	if !o.Set {
+		return v, false
+	}
+	return o.Value, true
+}
+
+// Or returns value if set, or given parameter if does not.
+func (o OptStartPreviewsMultipartUploadReqType) Or(d StartPreviewsMultipartUploadReqType) StartPreviewsMultipartUploadReqType {
+	if v, ok := o.Get(); ok {
+		return v
+	}
+	return d
+}
+
 // NewOptString returns new OptString with value set to v.
 func NewOptString(v string) OptString {
 	return OptString{
@@ -3772,8 +3818,19 @@ func (s *StartPreviewsMultipartUploadOKStatus) UnmarshalText(data []byte) error
 }
 
 type StartPreviewsMultipartUploadReq struct {
+	// The bundle identifier of the preview.
+	BundleIdentifier OptString `json:"bundle_identifier"`
 	// The display name of the preview.
 	DisplayName OptString `json:"display_name"`
+	// The type of the preview to upload.
+	Type OptStartPreviewsMultipartUploadReqType `json:"type"`
+	// The version of the preview.
+	Version OptString `json:"version"`
+}
+
+// GetBundleIdentifier returns the value of BundleIdentifier.
+func (s *StartPreviewsMultipartUploadReq) GetBundleIdentifier() OptString {
+	return s.BundleIdentifier
 }
 
 // GetDisplayName returns the value of DisplayName.
@@ -3781,11 +3838,78 @@ func (s *StartPreviewsMultipartUploadReq) GetDisplayName() OptString {
 	return s.DisplayName
 }
 
+// GetType returns the value of Type.
+func (s *StartPreviewsMultipartUploadReq) GetType() OptStartPreviewsMultipartUploadReqType {
+	return s.Type
+}
+
+// GetVersion returns the value of Version.
+func (s *StartPreviewsMultipartUploadReq) GetVersion() OptString {
+	return s.Version
+}
+
+// SetBundleIdentifier sets the value of BundleIdentifier.
+func (s *StartPreviewsMultipartUploadReq) SetBundleIdentifier(val OptString) {
+	s.BundleIdentifier = val
+}
+
 // SetDisplayName sets the value of DisplayName.
 func (s *StartPreviewsMultipartUploadReq) SetDisplayName(val OptString) {
 	s.DisplayName = val
 }
 
+// SetType sets the value of Type.
+func (s *StartPreviewsMultipartUploadReq) SetType(val OptStartPreviewsMultipartUploadReqType) {
+	s.Type = val
+}
+
+// SetVersion sets the value of Version.
+func (s *StartPreviewsMultipartUploadReq) SetVersion(val OptString) {
+	s.Version = val
+}
+
+// The type of the preview to upload.
+type StartPreviewsMultipartUploadReqType string
+
+const (
+	StartPreviewsMultipartUploadReqTypeAppBundle StartPreviewsMultipartUploadReqType = "app_bundle"
+	StartPreviewsMultipartUploadReqTypeIpa       StartPreviewsMultipartUploadReqType = "ipa"
+)
+
+// AllValues returns all StartPreviewsMultipartUploadReqType values.
+func (StartPreviewsMultipartUploadReqType) AllValues() []StartPreviewsMultipartUploadReqType {
+	return []StartPreviewsMultipartUploadReqType{
+		StartPreviewsMultipartUploadReqTypeAppBundle,
+		StartPreviewsMultipartUploadReqTypeIpa,
+	}
+}
+
+// MarshalText implements encoding.TextMarshaler.
+func (s StartPreviewsMultipartUploadReqType) MarshalText() ([]byte, error) {
+	switch s {
+	case StartPreviewsMultipartUploadReqTypeAppBundle:
+		return []byte(s), nil
+	case StartPreviewsMultipartUploadReqTypeIpa:
+		return []byte(s), nil
+	default:
+		return nil, errors.Errorf("invalid value: %q", s)
+	}
+}
+
+// UnmarshalText implements encoding.TextUnmarshaler.
+func (s *StartPreviewsMultipartUploadReqType) UnmarshalText(data []byte) error {
+	switch StartPreviewsMultipartUploadReqType(data) {
+	case StartPreviewsMultipartUploadReqTypeAppBundle:
+		*s = StartPreviewsMultipartUploadReqTypeAppBundle
+		return nil
+	case StartPreviewsMultipartUploadReqTypeIpa:
+		*s = StartPreviewsMultipartUploadReqTypeIpa
+		return nil
+	default:
+		return errors.Errorf("invalid value: %q", data)
+	}
+}
+
 type StartPreviewsMultipartUploadUnauthorized Error
 
 func (*StartPreviewsMultipartUploadUnauthorized) startPreviewsMultipartUploadRes() {}
diff --git a/internal/agent/http_cache/tuistcache/api/oas_validators_gen.go b/internal/agent/http_cache/tuistcache/api/oas_validators_gen.go
index 59319d47..fe74089a 100644
--- a/internal/agent/http_cache/tuistcache/api/oas_validators_gen.go
+++ b/internal/agent/http_cache/tuistcache/api/oas_validators_gen.go
@@ -765,6 +765,47 @@ func (s StartPreviewsMultipartUploadOKStatus) Validate() error {
 	}
 }
 
+func (s *StartPreviewsMultipartUploadReq) Validate() error {
+	if s == nil {
+		return validate.ErrNilPointer
+	}
+
+	var failures []validate.FieldError
+	if err := func() error {
+		if value, ok := s.Type.Get(); ok {
+			if err := func() error {
+				if err := value.Validate(); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return err
+			}
+		}
+		return nil
+	}(); err != nil {
+		failures = append(failures, validate.FieldError{
+			Name:  "type",
+			Error: err,
+		})
+	}
+	if len(failures) > 0 {
+		return &validate.Error{Fields: failures}
+	}
+	return nil
+}
+
+func (s StartPreviewsMultipartUploadReqType) Validate() error {
+	switch s {
+	case "app_bundle":
+		return nil
+	case "ipa":
+		return nil
+	default:
+		return errors.Errorf("invalid value: %v", s)
+	}
+}
+
 func (s *UpdateOrganization2Req) Validate() error {
 	if s == nil {
 		return validate.ErrNilPointer
diff --git a/pkg/api/cirrus_ci_service.pb.go b/pkg/api/cirrus_ci_service.pb.go
index b9fbc392..598953af 100644
--- a/pkg/api/cirrus_ci_service.pb.go
+++ b/pkg/api/cirrus_ci_service.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.34.2
+// 	protoc-gen-go v1.35.1
 // 	protoc        (unknown)
 // source: api/cirrus_ci_service.proto
 
@@ -393,11 +393,9 @@ type CapabilitiesRequest struct {
 
 func (x *CapabilitiesRequest) Reset() {
 	*x = CapabilitiesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CapabilitiesRequest) String() string {
@@ -408,7 +406,7 @@ func (*CapabilitiesRequest) ProtoMessage() {}
 
 func (x *CapabilitiesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -433,11 +431,9 @@ type CapabilitiesResponse struct {
 
 func (x *CapabilitiesResponse) Reset() {
 	*x = CapabilitiesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[1]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CapabilitiesResponse) String() string {
@@ -448,7 +444,7 @@ func (*CapabilitiesResponse) ProtoMessage() {}
 
 func (x *CapabilitiesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -481,11 +477,9 @@ type AdditionalInstancesInfo struct {
 
 func (x *AdditionalInstancesInfo) Reset() {
 	*x = AdditionalInstancesInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AdditionalInstancesInfo) String() string {
@@ -496,7 +490,7 @@ func (*AdditionalInstancesInfo) ProtoMessage() {}
 
 func (x *AdditionalInstancesInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -542,11 +536,9 @@ type EvaluateConfigRequest struct {
 
 func (x *EvaluateConfigRequest) Reset() {
 	*x = EvaluateConfigRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EvaluateConfigRequest) String() string {
@@ -557,7 +549,7 @@ func (*EvaluateConfigRequest) ProtoMessage() {}
 
 func (x *EvaluateConfigRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -635,11 +627,9 @@ type FileSystem struct {
 
 func (x *FileSystem) Reset() {
 	*x = FileSystem{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FileSystem) String() string {
@@ -650,7 +640,7 @@ func (*FileSystem) ProtoMessage() {}
 
 func (x *FileSystem) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -716,11 +706,9 @@ type EvaluateConfigResponse struct {
 
 func (x *EvaluateConfigResponse) Reset() {
 	*x = EvaluateConfigResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EvaluateConfigResponse) String() string {
@@ -731,7 +719,7 @@ func (*EvaluateConfigResponse) ProtoMessage() {}
 
 func (x *EvaluateConfigResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -794,11 +782,9 @@ type RichError struct {
 
 func (x *RichError) Reset() {
 	*x = RichError{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[6]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RichError) String() string {
@@ -809,7 +795,7 @@ func (*RichError) ProtoMessage() {}
 
 func (x *RichError) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -867,11 +853,9 @@ type Issue struct {
 
 func (x *Issue) Reset() {
 	*x = Issue{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[7]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Issue) String() string {
@@ -882,7 +866,7 @@ func (*Issue) ProtoMessage() {}
 
 func (x *Issue) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -949,11 +933,9 @@ type JSONSchemaRequest struct {
 
 func (x *JSONSchemaRequest) Reset() {
 	*x = JSONSchemaRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[8]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *JSONSchemaRequest) String() string {
@@ -964,7 +946,7 @@ func (*JSONSchemaRequest) ProtoMessage() {}
 
 func (x *JSONSchemaRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -996,11 +978,9 @@ type JSONSchemaResponse struct {
 
 func (x *JSONSchemaResponse) Reset() {
 	*x = JSONSchemaResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[9]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *JSONSchemaResponse) String() string {
@@ -1011,7 +991,7 @@ func (*JSONSchemaResponse) ProtoMessage() {}
 
 func (x *JSONSchemaResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1047,11 +1027,9 @@ type EvaluateFunctionRequest struct {
 
 func (x *EvaluateFunctionRequest) Reset() {
 	*x = EvaluateFunctionRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[10]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EvaluateFunctionRequest) String() string {
@@ -1062,7 +1040,7 @@ func (*EvaluateFunctionRequest) ProtoMessage() {}
 
 func (x *EvaluateFunctionRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1125,11 +1103,9 @@ type EvaluateFunctionResponse struct {
 
 func (x *EvaluateFunctionResponse) Reset() {
 	*x = EvaluateFunctionResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[11]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *EvaluateFunctionResponse) String() string {
@@ -1140,7 +1116,7 @@ func (*EvaluateFunctionResponse) ProtoMessage() {}
 
 func (x *EvaluateFunctionResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1194,11 +1170,9 @@ type RegisterRequest struct {
 
 func (x *RegisterRequest) Reset() {
 	*x = RegisterRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[12]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RegisterRequest) String() string {
@@ -1209,7 +1183,7 @@ func (*RegisterRequest) ProtoMessage() {}
 
 func (x *RegisterRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1248,11 +1222,9 @@ type RegisterResponse struct {
 
 func (x *RegisterResponse) Reset() {
 	*x = RegisterResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[13]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[13]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *RegisterResponse) String() string {
@@ -1263,7 +1235,7 @@ func (*RegisterResponse) ProtoMessage() {}
 
 func (x *RegisterResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[13]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1299,11 +1271,9 @@ type PollRequest struct {
 
 func (x *PollRequest) Reset() {
 	*x = PollRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[14]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[14]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PollRequest) String() string {
@@ -1314,7 +1284,7 @@ func (*PollRequest) ProtoMessage() {}
 
 func (x *PollRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[14]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1368,11 +1338,9 @@ type QueryRunningTasksRequest struct {
 
 func (x *QueryRunningTasksRequest) Reset() {
 	*x = QueryRunningTasksRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[15]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[15]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryRunningTasksRequest) String() string {
@@ -1383,7 +1351,7 @@ func (*QueryRunningTasksRequest) ProtoMessage() {}
 
 func (x *QueryRunningTasksRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[15]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1418,11 +1386,9 @@ type QueryRunningTasksResponse struct {
 
 func (x *QueryRunningTasksResponse) Reset() {
 	*x = QueryRunningTasksResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[16]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[16]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *QueryRunningTasksResponse) String() string {
@@ -1433,7 +1399,7 @@ func (*QueryRunningTasksResponse) ProtoMessage() {}
 
 func (x *QueryRunningTasksResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[16]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1482,11 +1448,9 @@ type TaskFailedRequest struct {
 
 func (x *TaskFailedRequest) Reset() {
 	*x = TaskFailedRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[17]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[17]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *TaskFailedRequest) String() string {
@@ -1497,7 +1461,7 @@ func (*TaskFailedRequest) ProtoMessage() {}
 
 func (x *TaskFailedRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[17]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1542,11 +1506,9 @@ type PollResponse struct {
 
 func (x *PollResponse) Reset() {
 	*x = PollResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[18]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[18]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PollResponse) String() string {
@@ -1557,7 +1519,7 @@ func (*PollResponse) ProtoMessage() {}
 
 func (x *PollResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[18]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1625,11 +1587,9 @@ type WorkerInfo struct {
 
 func (x *WorkerInfo) Reset() {
 	*x = WorkerInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[19]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WorkerInfo) String() string {
@@ -1640,7 +1600,7 @@ func (*WorkerInfo) ProtoMessage() {}
 
 func (x *WorkerInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[19]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1679,11 +1639,9 @@ type UpdateStatusRequest struct {
 
 func (x *UpdateStatusRequest) Reset() {
 	*x = UpdateStatusRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[20]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UpdateStatusRequest) String() string {
@@ -1694,7 +1652,7 @@ func (*UpdateStatusRequest) ProtoMessage() {}
 
 func (x *UpdateStatusRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[20]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1726,11 +1684,9 @@ type WorkerStatus struct {
 
 func (x *WorkerStatus) Reset() {
 	*x = WorkerStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WorkerStatus) String() string {
@@ -1741,7 +1697,7 @@ func (*WorkerStatus) ProtoMessage() {}
 
 func (x *WorkerStatus) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1773,11 +1729,9 @@ type MultipartCacheUploadCreateResponse struct {
 
 func (x *MultipartCacheUploadCreateResponse) Reset() {
 	*x = MultipartCacheUploadCreateResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[22]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MultipartCacheUploadCreateResponse) String() string {
@@ -1788,7 +1742,7 @@ func (*MultipartCacheUploadCreateResponse) ProtoMessage() {}
 
 func (x *MultipartCacheUploadCreateResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[22]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1823,11 +1777,9 @@ type MultipartCacheUploadPartRequest struct {
 
 func (x *MultipartCacheUploadPartRequest) Reset() {
 	*x = MultipartCacheUploadPartRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[23]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MultipartCacheUploadPartRequest) String() string {
@@ -1838,7 +1790,7 @@ func (*MultipartCacheUploadPartRequest) ProtoMessage() {}
 
 func (x *MultipartCacheUploadPartRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1893,11 +1845,9 @@ type MultipartCacheUploadCommitRequest struct {
 
 func (x *MultipartCacheUploadCommitRequest) Reset() {
 	*x = MultipartCacheUploadCommitRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[24]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[24]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MultipartCacheUploadCommitRequest) String() string {
@@ -1908,7 +1858,7 @@ func (*MultipartCacheUploadCommitRequest) ProtoMessage() {}
 
 func (x *MultipartCacheUploadCommitRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[24]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -1957,11 +1907,9 @@ type ReportTerminalAttachedRequest struct {
 
 func (x *ReportTerminalAttachedRequest) Reset() {
 	*x = ReportTerminalAttachedRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[25]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[25]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalAttachedRequest) String() string {
@@ -1972,7 +1920,7 @@ func (*ReportTerminalAttachedRequest) ProtoMessage() {}
 
 func (x *ReportTerminalAttachedRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[25]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2017,11 +1965,9 @@ type ReportTerminalAttachedResponse struct {
 
 func (x *ReportTerminalAttachedResponse) Reset() {
 	*x = ReportTerminalAttachedResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[26]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[26]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalAttachedResponse) String() string {
@@ -2032,7 +1978,7 @@ func (*ReportTerminalAttachedResponse) ProtoMessage() {}
 
 func (x *ReportTerminalAttachedResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[26]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2063,11 +2009,9 @@ type ReportTerminalLifecycleRequest struct {
 
 func (x *ReportTerminalLifecycleRequest) Reset() {
 	*x = ReportTerminalLifecycleRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[27]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[27]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalLifecycleRequest) String() string {
@@ -2078,7 +2022,7 @@ func (*ReportTerminalLifecycleRequest) ProtoMessage() {}
 
 func (x *ReportTerminalLifecycleRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[27]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2146,11 +2090,9 @@ type ReportTerminalLifecycleResponse struct {
 
 func (x *ReportTerminalLifecycleResponse) Reset() {
 	*x = ReportTerminalLifecycleResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[28]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[28]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalLifecycleResponse) String() string {
@@ -2161,7 +2103,7 @@ func (*ReportTerminalLifecycleResponse) ProtoMessage() {}
 
 func (x *ReportTerminalLifecycleResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[28]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2187,11 +2129,9 @@ type TaskIdentification struct {
 
 func (x *TaskIdentification) Reset() {
 	*x = TaskIdentification{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[29]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[29]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *TaskIdentification) String() string {
@@ -2202,7 +2142,7 @@ func (*TaskIdentification) ProtoMessage() {}
 
 func (x *TaskIdentification) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[29]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2242,11 +2182,9 @@ type DataChunk struct {
 
 func (x *DataChunk) Reset() {
 	*x = DataChunk{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[30]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[30]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DataChunk) String() string {
@@ -2257,7 +2195,7 @@ func (*DataChunk) ProtoMessage() {}
 
 func (x *DataChunk) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[30]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2300,11 +2238,9 @@ type InitialCommandsRequest struct {
 
 func (x *InitialCommandsRequest) Reset() {
 	*x = InitialCommandsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[31]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[31]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *InitialCommandsRequest) String() string {
@@ -2315,7 +2251,7 @@ func (*InitialCommandsRequest) ProtoMessage() {}
 
 func (x *InitialCommandsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[31]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2373,11 +2309,9 @@ type LogEntry struct {
 
 func (x *LogEntry) Reset() {
 	*x = LogEntry{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[32]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[32]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *LogEntry) String() string {
@@ -2388,7 +2322,7 @@ func (*LogEntry) ProtoMessage() {}
 
 func (x *LogEntry) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[32]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2450,11 +2384,9 @@ type UploadLogsResponse struct {
 
 func (x *UploadLogsResponse) Reset() {
 	*x = UploadLogsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[33]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[33]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UploadLogsResponse) String() string {
@@ -2465,7 +2397,7 @@ func (*UploadLogsResponse) ProtoMessage() {}
 
 func (x *UploadLogsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[33]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2499,11 +2431,9 @@ type CacheKey struct {
 
 func (x *CacheKey) Reset() {
 	*x = CacheKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[34]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[34]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheKey) String() string {
@@ -2514,7 +2444,7 @@ func (*CacheKey) ProtoMessage() {}
 
 func (x *CacheKey) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[34]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2558,11 +2488,9 @@ type CacheEntry struct {
 
 func (x *CacheEntry) Reset() {
 	*x = CacheEntry{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[35]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[35]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheEntry) String() string {
@@ -2573,7 +2501,7 @@ func (*CacheEntry) ProtoMessage() {}
 
 func (x *CacheEntry) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[35]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2635,11 +2563,9 @@ type UploadCacheResponse struct {
 
 func (x *UploadCacheResponse) Reset() {
 	*x = UploadCacheResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[36]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[36]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UploadCacheResponse) String() string {
@@ -2650,7 +2576,7 @@ func (*UploadCacheResponse) ProtoMessage() {}
 
 func (x *UploadCacheResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[36]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2686,11 +2612,9 @@ type ArtifactEntry struct {
 
 func (x *ArtifactEntry) Reset() {
 	*x = ArtifactEntry{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[37]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[37]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ArtifactEntry) String() string {
@@ -2701,7 +2625,7 @@ func (*ArtifactEntry) ProtoMessage() {}
 
 func (x *ArtifactEntry) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[37]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2763,11 +2687,9 @@ type UploadArtifactsResponse struct {
 
 func (x *UploadArtifactsResponse) Reset() {
 	*x = UploadArtifactsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[38]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[38]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UploadArtifactsResponse) String() string {
@@ -2778,7 +2700,7 @@ func (*UploadArtifactsResponse) ProtoMessage() {}
 
 func (x *UploadArtifactsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[38]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2811,11 +2733,9 @@ type ArtifactFileInfo struct {
 
 func (x *ArtifactFileInfo) Reset() {
 	*x = ArtifactFileInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[39]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[39]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ArtifactFileInfo) String() string {
@@ -2826,7 +2746,7 @@ func (*ArtifactFileInfo) ProtoMessage() {}
 
 func (x *ArtifactFileInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[39]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2868,11 +2788,9 @@ type GenerateArtifactUploadURLsRequest struct {
 
 func (x *GenerateArtifactUploadURLsRequest) Reset() {
 	*x = GenerateArtifactUploadURLsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[40]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[40]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GenerateArtifactUploadURLsRequest) String() string {
@@ -2883,7 +2801,7 @@ func (*GenerateArtifactUploadURLsRequest) ProtoMessage() {}
 
 func (x *GenerateArtifactUploadURLsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[40]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2930,11 +2848,9 @@ type GenerateArtifactUploadURLsResponse struct {
 
 func (x *GenerateArtifactUploadURLsResponse) Reset() {
 	*x = GenerateArtifactUploadURLsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[41]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[41]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GenerateArtifactUploadURLsResponse) String() string {
@@ -2945,7 +2861,7 @@ func (*GenerateArtifactUploadURLsResponse) ProtoMessage() {}
 
 func (x *GenerateArtifactUploadURLsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[41]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -2982,11 +2898,9 @@ type CommitUploadedArtifactsRequest struct {
 
 func (x *CommitUploadedArtifactsRequest) Reset() {
 	*x = CommitUploadedArtifactsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[42]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[42]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CommitUploadedArtifactsRequest) String() string {
@@ -2997,7 +2911,7 @@ func (*CommitUploadedArtifactsRequest) ProtoMessage() {}
 
 func (x *CommitUploadedArtifactsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[42]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3056,11 +2970,9 @@ type CommitUploadedArtifactsResponse struct {
 
 func (x *CommitUploadedArtifactsResponse) Reset() {
 	*x = CommitUploadedArtifactsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[43]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[43]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CommitUploadedArtifactsResponse) String() string {
@@ -3071,7 +2983,7 @@ func (*CommitUploadedArtifactsResponse) ProtoMessage() {}
 
 func (x *CommitUploadedArtifactsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[43]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3098,11 +3010,9 @@ type DownloadCacheRequest struct {
 
 func (x *DownloadCacheRequest) Reset() {
 	*x = DownloadCacheRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[44]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[44]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DownloadCacheRequest) String() string {
@@ -3113,7 +3023,7 @@ func (*DownloadCacheRequest) ProtoMessage() {}
 
 func (x *DownloadCacheRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[44]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3158,11 +3068,9 @@ type CommandsResponse struct {
 
 func (x *CommandsResponse) Reset() {
 	*x = CommandsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[45]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[45]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CommandsResponse) String() string {
@@ -3173,7 +3081,7 @@ func (*CommandsResponse) ProtoMessage() {}
 
 func (x *CommandsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[45]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3242,11 +3150,9 @@ type ReportCommandUpdatesRequest struct {
 
 func (x *ReportCommandUpdatesRequest) Reset() {
 	*x = ReportCommandUpdatesRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[46]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[46]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportCommandUpdatesRequest) String() string {
@@ -3257,7 +3163,7 @@ func (*ReportCommandUpdatesRequest) ProtoMessage() {}
 
 func (x *ReportCommandUpdatesRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[46]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3295,11 +3201,9 @@ type ReportCommandUpdatesResponse struct {
 
 func (x *ReportCommandUpdatesResponse) Reset() {
 	*x = ReportCommandUpdatesResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[47]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[47]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportCommandUpdatesResponse) String() string {
@@ -3310,7 +3214,7 @@ func (*ReportCommandUpdatesResponse) ProtoMessage() {}
 
 func (x *ReportCommandUpdatesResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[47]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3337,11 +3241,9 @@ type ReportAnnotationsCommandRequest struct {
 
 func (x *ReportAnnotationsCommandRequest) Reset() {
 	*x = ReportAnnotationsCommandRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[48]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[48]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAnnotationsCommandRequest) String() string {
@@ -3352,7 +3254,7 @@ func (*ReportAnnotationsCommandRequest) ProtoMessage() {}
 
 func (x *ReportAnnotationsCommandRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[48]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3397,11 +3299,9 @@ type Annotation struct {
 
 func (x *Annotation) Reset() {
 	*x = Annotation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[49]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[49]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Annotation) String() string {
@@ -3412,7 +3312,7 @@ func (*Annotation) ProtoMessage() {}
 
 func (x *Annotation) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[49]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3480,11 +3380,9 @@ type HeartbeatRequest struct {
 
 func (x *HeartbeatRequest) Reset() {
 	*x = HeartbeatRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[50]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[50]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *HeartbeatRequest) String() string {
@@ -3495,7 +3393,7 @@ func (*HeartbeatRequest) ProtoMessage() {}
 
 func (x *HeartbeatRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[50]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3526,11 +3424,9 @@ type HeartbeatResponse struct {
 
 func (x *HeartbeatResponse) Reset() {
 	*x = HeartbeatResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[51]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[51]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *HeartbeatResponse) String() string {
@@ -3541,7 +3437,7 @@ func (*HeartbeatResponse) ProtoMessage() {}
 
 func (x *HeartbeatResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[51]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3569,11 +3465,9 @@ type CacheInfoRequest struct {
 
 func (x *CacheInfoRequest) Reset() {
 	*x = CacheInfoRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[52]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[52]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheInfoRequest) String() string {
@@ -3584,7 +3478,7 @@ func (*CacheInfoRequest) ProtoMessage() {}
 
 func (x *CacheInfoRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[52]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3636,11 +3530,9 @@ type CacheInfo struct {
 
 func (x *CacheInfo) Reset() {
 	*x = CacheInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[53]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[53]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheInfo) String() string {
@@ -3651,7 +3543,7 @@ func (*CacheInfo) ProtoMessage() {}
 
 func (x *CacheInfo) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[53]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3712,11 +3604,9 @@ type CacheInfoResponse struct {
 
 func (x *CacheInfoResponse) Reset() {
 	*x = CacheInfoResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[54]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[54]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheInfoResponse) String() string {
@@ -3727,7 +3617,7 @@ func (*CacheInfoResponse) ProtoMessage() {}
 
 func (x *CacheInfoResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[54]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3761,11 +3651,9 @@ type DeleteCacheRequest struct {
 
 func (x *DeleteCacheRequest) Reset() {
 	*x = DeleteCacheRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[55]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[55]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DeleteCacheRequest) String() string {
@@ -3776,7 +3664,7 @@ func (*DeleteCacheRequest) ProtoMessage() {}
 
 func (x *DeleteCacheRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[55]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3814,11 +3702,9 @@ type DeleteCacheResponse struct {
 
 func (x *DeleteCacheResponse) Reset() {
 	*x = DeleteCacheResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[56]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[56]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DeleteCacheResponse) String() string {
@@ -3829,7 +3715,7 @@ func (*DeleteCacheResponse) ProtoMessage() {}
 
 func (x *DeleteCacheResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[56]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3857,11 +3743,9 @@ type ReportAgentProblemRequest struct {
 
 func (x *ReportAgentProblemRequest) Reset() {
 	*x = ReportAgentProblemRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[57]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[57]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAgentProblemRequest) String() string {
@@ -3872,7 +3756,7 @@ func (*ReportAgentProblemRequest) ProtoMessage() {}
 
 func (x *ReportAgentProblemRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[57]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3920,11 +3804,9 @@ type ReportStopHookRequest struct {
 
 func (x *ReportStopHookRequest) Reset() {
 	*x = ReportStopHookRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[58]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[58]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportStopHookRequest) String() string {
@@ -3935,7 +3817,7 @@ func (*ReportStopHookRequest) ProtoMessage() {}
 
 func (x *ReportStopHookRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[58]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -3970,11 +3852,9 @@ type ReportAgentSignalRequest struct {
 
 func (x *ReportAgentSignalRequest) Reset() {
 	*x = ReportAgentSignalRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[59]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[59]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAgentSignalRequest) String() string {
@@ -3985,7 +3865,7 @@ func (*ReportAgentSignalRequest) ProtoMessage() {}
 
 func (x *ReportAgentSignalRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[59]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4027,11 +3907,9 @@ type ReportAgentLogsRequest struct {
 
 func (x *ReportAgentLogsRequest) Reset() {
 	*x = ReportAgentLogsRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[60]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[60]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAgentLogsRequest) String() string {
@@ -4042,7 +3920,7 @@ func (*ReportAgentLogsRequest) ProtoMessage() {}
 
 func (x *ReportAgentLogsRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[60]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4087,11 +3965,9 @@ type CacheRetrievalAttempt struct {
 
 func (x *CacheRetrievalAttempt) Reset() {
 	*x = CacheRetrievalAttempt{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[61]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[61]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheRetrievalAttempt) String() string {
@@ -4102,7 +3978,7 @@ func (*CacheRetrievalAttempt) ProtoMessage() {}
 
 func (x *CacheRetrievalAttempt) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[61]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4174,11 +4050,9 @@ type ResourceUtilization struct {
 
 func (x *ResourceUtilization) Reset() {
 	*x = ResourceUtilization{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[62]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[62]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ResourceUtilization) String() string {
@@ -4189,7 +4063,7 @@ func (*ResourceUtilization) ProtoMessage() {}
 
 func (x *ResourceUtilization) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[62]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4243,11 +4117,9 @@ type ChartPoint struct {
 
 func (x *ChartPoint) Reset() {
 	*x = ChartPoint{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[63]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[63]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ChartPoint) String() string {
@@ -4258,7 +4130,7 @@ func (*ChartPoint) ProtoMessage() {}
 
 func (x *ChartPoint) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[63]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4302,11 +4174,9 @@ type CommandResult struct {
 
 func (x *CommandResult) Reset() {
 	*x = CommandResult{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[64]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[64]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CommandResult) String() string {
@@ -4317,7 +4187,7 @@ func (*CommandResult) ProtoMessage() {}
 
 func (x *CommandResult) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[64]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4382,11 +4252,9 @@ type ReportAgentFinishedRequest struct {
 
 func (x *ReportAgentFinishedRequest) Reset() {
 	*x = ReportAgentFinishedRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[65]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[65]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAgentFinishedRequest) String() string {
@@ -4397,7 +4265,7 @@ func (*ReportAgentFinishedRequest) ProtoMessage() {}
 
 func (x *ReportAgentFinishedRequest) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[65]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4449,11 +4317,9 @@ type ReportAgentFinishedResponse struct {
 
 func (x *ReportAgentFinishedResponse) Reset() {
 	*x = ReportAgentFinishedResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[66]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[66]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportAgentFinishedResponse) String() string {
@@ -4464,7 +4330,7 @@ func (*ReportAgentFinishedResponse) ProtoMessage() {}
 
 func (x *ReportAgentFinishedResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[66]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4496,11 +4362,9 @@ type Task struct {
 
 func (x *Task) Reset() {
 	*x = Task{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[67]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[67]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Task) String() string {
@@ -4511,7 +4375,7 @@ func (*Task) ProtoMessage() {}
 
 func (x *Task) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[67]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4606,11 +4470,9 @@ type Command struct {
 
 func (x *Command) Reset() {
 	*x = Command{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[68]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[68]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Command) String() string {
@@ -4621,7 +4483,7 @@ func (*Command) ProtoMessage() {}
 
 func (x *Command) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[68]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4793,11 +4655,9 @@ type ExitInstruction struct {
 
 func (x *ExitInstruction) Reset() {
 	*x = ExitInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[69]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[69]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ExitInstruction) String() string {
@@ -4808,7 +4668,7 @@ func (*ExitInstruction) ProtoMessage() {}
 
 func (x *ExitInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[69]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4833,11 +4693,9 @@ type ScriptInstruction struct {
 
 func (x *ScriptInstruction) Reset() {
 	*x = ScriptInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[70]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[70]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ScriptInstruction) String() string {
@@ -4848,7 +4706,7 @@ func (*ScriptInstruction) ProtoMessage() {}
 
 func (x *ScriptInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[70]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4880,11 +4738,9 @@ type BackgroundScriptInstruction struct {
 
 func (x *BackgroundScriptInstruction) Reset() {
 	*x = BackgroundScriptInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[71]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[71]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *BackgroundScriptInstruction) String() string {
@@ -4895,7 +4751,7 @@ func (*BackgroundScriptInstruction) ProtoMessage() {}
 
 func (x *BackgroundScriptInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[71]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -4937,11 +4793,9 @@ type CacheInstruction struct {
 
 func (x *CacheInstruction) Reset() {
 	*x = CacheInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[72]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[72]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheInstruction) String() string {
@@ -4952,7 +4806,7 @@ func (*CacheInstruction) ProtoMessage() {}
 
 func (x *CacheInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[72]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5019,11 +4873,9 @@ type UploadCacheInstruction struct {
 
 func (x *UploadCacheInstruction) Reset() {
 	*x = UploadCacheInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[73]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[73]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *UploadCacheInstruction) String() string {
@@ -5034,7 +4886,7 @@ func (*UploadCacheInstruction) ProtoMessage() {}
 
 func (x *UploadCacheInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[73]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5064,11 +4916,9 @@ type CloneInstruction struct {
 
 func (x *CloneInstruction) Reset() {
 	*x = CloneInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[74]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[74]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CloneInstruction) String() string {
@@ -5079,7 +4929,7 @@ func (*CloneInstruction) ProtoMessage() {}
 
 func (x *CloneInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[74]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5109,11 +4959,9 @@ type FileInstruction struct {
 
 func (x *FileInstruction) Reset() {
 	*x = FileInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[75]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[75]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FileInstruction) String() string {
@@ -5124,7 +4972,7 @@ func (*FileInstruction) ProtoMessage() {}
 
 func (x *FileInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[75]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5194,12 +5042,10 @@ type ArtifactsInstruction struct {
 }
 
 func (x *ArtifactsInstruction) Reset() {
-	*x = ArtifactsInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[76]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	*x = ArtifactsInstruction{}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[76]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ArtifactsInstruction) String() string {
@@ -5210,7 +5056,7 @@ func (*ArtifactsInstruction) ProtoMessage() {}
 
 func (x *ArtifactsInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[76]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5256,11 +5102,9 @@ type WaitForTerminalInstruction struct {
 
 func (x *WaitForTerminalInstruction) Reset() {
 	*x = WaitForTerminalInstruction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[77]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[77]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *WaitForTerminalInstruction) String() string {
@@ -5271,7 +5115,7 @@ func (*WaitForTerminalInstruction) ProtoMessage() {}
 
 func (x *WaitForTerminalInstruction) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[77]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5304,11 +5148,9 @@ type PipeInstance struct {
 
 func (x *PipeInstance) Reset() {
 	*x = PipeInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[78]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[78]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PipeInstance) String() string {
@@ -5319,7 +5161,7 @@ func (*PipeInstance) ProtoMessage() {}
 
 func (x *PipeInstance) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[78]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5370,11 +5212,9 @@ type ContainerInstance struct {
 
 func (x *ContainerInstance) Reset() {
 	*x = ContainerInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[79]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[79]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ContainerInstance) String() string {
@@ -5385,7 +5225,7 @@ func (*ContainerInstance) ProtoMessage() {}
 
 func (x *ContainerInstance) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[79]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5502,11 +5342,9 @@ type PortMapping struct {
 
 func (x *PortMapping) Reset() {
 	*x = PortMapping{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[80]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[80]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PortMapping) String() string {
@@ -5517,7 +5355,7 @@ func (*PortMapping) ProtoMessage() {}
 
 func (x *PortMapping) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[80]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5566,11 +5404,9 @@ type AdditionalContainer struct {
 
 func (x *AdditionalContainer) Reset() {
 	*x = AdditionalContainer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[81]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[81]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *AdditionalContainer) String() string {
@@ -5581,7 +5417,7 @@ func (*AdditionalContainer) ProtoMessage() {}
 
 func (x *AdditionalContainer) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[81]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5687,11 +5523,9 @@ type PrebuiltImageInstance struct {
 
 func (x *PrebuiltImageInstance) Reset() {
 	*x = PrebuiltImageInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[82]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[82]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PrebuiltImageInstance) String() string {
@@ -5702,7 +5536,7 @@ func (*PrebuiltImageInstance) ProtoMessage() {}
 
 func (x *PrebuiltImageInstance) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[82]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5764,11 +5598,9 @@ type Volume struct {
 
 func (x *Volume) Reset() {
 	*x = Volume{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[83]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[83]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Volume) String() string {
@@ -5779,7 +5611,7 @@ func (*Volume) ProtoMessage() {}
 
 func (x *Volume) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[83]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5832,11 +5664,9 @@ type Isolation struct {
 
 func (x *Isolation) Reset() {
 	*x = Isolation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[84]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[84]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation) String() string {
@@ -5847,7 +5677,7 @@ func (*Isolation) ProtoMessage() {}
 
 func (x *Isolation) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[84]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -5950,11 +5780,9 @@ type PersistentWorkerInstance struct {
 
 func (x *PersistentWorkerInstance) Reset() {
 	*x = PersistentWorkerInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[85]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[85]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PersistentWorkerInstance) String() string {
@@ -5965,7 +5793,7 @@ func (*PersistentWorkerInstance) ProtoMessage() {}
 
 func (x *PersistentWorkerInstance) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[85]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6015,11 +5843,9 @@ type MacOSInstance struct {
 
 func (x *MacOSInstance) Reset() {
 	*x = MacOSInstance{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[86]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[86]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MacOSInstance) String() string {
@@ -6030,7 +5856,7 @@ func (*MacOSInstance) ProtoMessage() {}
 
 func (x *MacOSInstance) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[86]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6091,11 +5917,9 @@ type DockerBuilder struct {
 
 func (x *DockerBuilder) Reset() {
 	*x = DockerBuilder{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[87]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[87]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *DockerBuilder) String() string {
@@ -6106,7 +5930,7 @@ func (*DockerBuilder) ProtoMessage() {}
 
 func (x *DockerBuilder) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[87]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6146,11 +5970,9 @@ type GenerateURLResponse struct {
 
 func (x *GenerateURLResponse) Reset() {
 	*x = GenerateURLResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[88]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[88]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GenerateURLResponse) String() string {
@@ -6161,7 +5983,7 @@ func (*GenerateURLResponse) ProtoMessage() {}
 
 func (x *GenerateURLResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[88]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6200,11 +6022,9 @@ type GenerateURLsResponse struct {
 
 func (x *GenerateURLsResponse) Reset() {
 	*x = GenerateURLsResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[89]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[89]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GenerateURLsResponse) String() string {
@@ -6215,7 +6035,7 @@ func (*GenerateURLsResponse) ProtoMessage() {}
 
 func (x *GenerateURLsResponse) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[89]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6247,11 +6067,9 @@ type FileSystem_Memory struct {
 
 func (x *FileSystem_Memory) Reset() {
 	*x = FileSystem_Memory{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[92]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[92]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FileSystem_Memory) String() string {
@@ -6262,7 +6080,7 @@ func (*FileSystem_Memory) ProtoMessage() {}
 
 func (x *FileSystem_Memory) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[92]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6297,11 +6115,9 @@ type FileSystem_Github struct {
 
 func (x *FileSystem_Github) Reset() {
 	*x = FileSystem_Github{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[93]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[93]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *FileSystem_Github) String() string {
@@ -6312,7 +6128,7 @@ func (*FileSystem_Github) ProtoMessage() {}
 
 func (x *FileSystem_Github) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[93]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6374,11 +6190,9 @@ type PollResponse_AgentAwareTask struct {
 
 func (x *PollResponse_AgentAwareTask) Reset() {
 	*x = PollResponse_AgentAwareTask{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[97]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[97]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *PollResponse_AgentAwareTask) String() string {
@@ -6389,7 +6203,7 @@ func (*PollResponse_AgentAwareTask) ProtoMessage() {}
 
 func (x *PollResponse_AgentAwareTask) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[97]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6473,11 +6287,9 @@ type MultipartCacheUploadCommitRequest_Part struct {
 
 func (x *MultipartCacheUploadCommitRequest_Part) Reset() {
 	*x = MultipartCacheUploadCommitRequest_Part{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[101]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[101]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *MultipartCacheUploadCommitRequest_Part) String() string {
@@ -6488,7 +6300,7 @@ func (*MultipartCacheUploadCommitRequest_Part) ProtoMessage() {}
 
 func (x *MultipartCacheUploadCommitRequest_Part) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[101]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6525,11 +6337,9 @@ type ReportTerminalLifecycleRequest_Started struct {
 
 func (x *ReportTerminalLifecycleRequest_Started) Reset() {
 	*x = ReportTerminalLifecycleRequest_Started{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[102]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[102]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalLifecycleRequest_Started) String() string {
@@ -6540,7 +6350,7 @@ func (*ReportTerminalLifecycleRequest_Started) ProtoMessage() {}
 
 func (x *ReportTerminalLifecycleRequest_Started) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[102]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6563,11 +6373,9 @@ type ReportTerminalLifecycleRequest_Expiring struct {
 
 func (x *ReportTerminalLifecycleRequest_Expiring) Reset() {
 	*x = ReportTerminalLifecycleRequest_Expiring{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[103]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[103]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ReportTerminalLifecycleRequest_Expiring) String() string {
@@ -6578,7 +6386,7 @@ func (*ReportTerminalLifecycleRequest_Expiring) ProtoMessage() {}
 
 func (x *ReportTerminalLifecycleRequest_Expiring) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[103]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6606,11 +6414,9 @@ type LogEntry_LogKey struct {
 
 func (x *LogEntry_LogKey) Reset() {
 	*x = LogEntry_LogKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[104]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[104]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *LogEntry_LogKey) String() string {
@@ -6621,7 +6427,7 @@ func (*LogEntry_LogKey) ProtoMessage() {}
 
 func (x *LogEntry_LogKey) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[104]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6672,11 +6478,9 @@ type ArtifactEntry_ArtifactsUpload struct {
 
 func (x *ArtifactEntry_ArtifactsUpload) Reset() {
 	*x = ArtifactEntry_ArtifactsUpload{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[105]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[105]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ArtifactEntry_ArtifactsUpload) String() string {
@@ -6687,7 +6491,7 @@ func (*ArtifactEntry_ArtifactsUpload) ProtoMessage() {}
 
 func (x *ArtifactEntry_ArtifactsUpload) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[105]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6742,11 +6546,9 @@ type ArtifactEntry_ArtifactChunk struct {
 
 func (x *ArtifactEntry_ArtifactChunk) Reset() {
 	*x = ArtifactEntry_ArtifactChunk{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[106]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[106]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *ArtifactEntry_ArtifactChunk) String() string {
@@ -6757,7 +6559,7 @@ func (*ArtifactEntry_ArtifactChunk) ProtoMessage() {}
 
 func (x *ArtifactEntry_ArtifactChunk) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[106]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6797,11 +6599,9 @@ type GenerateArtifactUploadURLsResponse_UploadURL struct {
 
 func (x *GenerateArtifactUploadURLsResponse_UploadURL) Reset() {
 	*x = GenerateArtifactUploadURLsResponse_UploadURL{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[107]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[107]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *GenerateArtifactUploadURLsResponse_UploadURL) String() string {
@@ -6812,7 +6612,7 @@ func (*GenerateArtifactUploadURLsResponse_UploadURL) ProtoMessage() {}
 
 func (x *GenerateArtifactUploadURLsResponse_UploadURL) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[107]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6855,11 +6655,9 @@ type Annotation_FileLocation struct {
 
 func (x *Annotation_FileLocation) Reset() {
 	*x = Annotation_FileLocation{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[110]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[110]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Annotation_FileLocation) String() string {
@@ -6870,7 +6668,7 @@ func (*Annotation_FileLocation) ProtoMessage() {}
 
 func (x *Annotation_FileLocation) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[110]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6932,11 +6730,9 @@ type CacheRetrievalAttempt_Hit struct {
 
 func (x *CacheRetrievalAttempt_Hit) Reset() {
 	*x = CacheRetrievalAttempt_Hit{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[111]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[111]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheRetrievalAttempt_Hit) String() string {
@@ -6947,7 +6743,7 @@ func (*CacheRetrievalAttempt_Hit) ProtoMessage() {}
 
 func (x *CacheRetrievalAttempt_Hit) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[111]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -6996,11 +6792,9 @@ type CacheRetrievalAttempt_Miss struct {
 
 func (x *CacheRetrievalAttempt_Miss) Reset() {
 	*x = CacheRetrievalAttempt_Miss{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[112]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[112]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *CacheRetrievalAttempt_Miss) String() string {
@@ -7011,7 +6805,7 @@ func (*CacheRetrievalAttempt_Miss) ProtoMessage() {}
 
 func (x *CacheRetrievalAttempt_Miss) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[112]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7065,11 +6859,9 @@ type Task_Metadata struct {
 
 func (x *Task_Metadata) Reset() {
 	*x = Task_Metadata{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[114]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[114]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Task_Metadata) String() string {
@@ -7080,7 +6872,7 @@ func (*Task_Metadata) ProtoMessage() {}
 
 func (x *Task_Metadata) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[114]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7117,11 +6909,9 @@ type Isolation_None struct {
 
 func (x *Isolation_None) Reset() {
 	*x = Isolation_None{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[121]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[121]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_None) String() string {
@@ -7132,7 +6922,7 @@ func (*Isolation_None) ProtoMessage() {}
 
 func (x *Isolation_None) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[121]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7160,11 +6950,9 @@ type Isolation_Parallels struct {
 
 func (x *Isolation_Parallels) Reset() {
 	*x = Isolation_Parallels{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[122]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[122]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Parallels) String() string {
@@ -7175,7 +6963,7 @@ func (*Isolation_Parallels) ProtoMessage() {}
 
 func (x *Isolation_Parallels) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[122]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7234,11 +7022,9 @@ type Isolation_Container struct {
 
 func (x *Isolation_Container) Reset() {
 	*x = Isolation_Container{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[123]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[123]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Container) String() string {
@@ -7249,7 +7035,7 @@ func (*Isolation_Container) ProtoMessage() {}
 
 func (x *Isolation_Container) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[123]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7341,11 +7127,9 @@ type Isolation_Tart struct {
 
 func (x *Isolation_Tart) Reset() {
 	*x = Isolation_Tart{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[124]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[124]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Tart) String() string {
@@ -7356,7 +7140,7 @@ func (*Isolation_Tart) ProtoMessage() {}
 
 func (x *Isolation_Tart) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[124]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7469,11 +7253,9 @@ type Isolation_Vetu struct {
 
 func (x *Isolation_Vetu) Reset() {
 	*x = Isolation_Vetu{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[125]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[125]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Vetu) String() string {
@@ -7484,7 +7266,7 @@ func (*Isolation_Vetu) ProtoMessage() {}
 
 func (x *Isolation_Vetu) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[125]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7599,11 +7381,9 @@ type Isolation_Tart_Volume struct {
 
 func (x *Isolation_Tart_Volume) Reset() {
 	*x = Isolation_Tart_Volume{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[127]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[127]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Tart_Volume) String() string {
@@ -7614,7 +7394,7 @@ func (*Isolation_Tart_Volume) ProtoMessage() {}
 
 func (x *Isolation_Tart_Volume) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[127]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7674,11 +7454,9 @@ type Isolation_Vetu_Bridged struct {
 
 func (x *Isolation_Vetu_Bridged) Reset() {
 	*x = Isolation_Vetu_Bridged{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[128]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[128]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Vetu_Bridged) String() string {
@@ -7689,7 +7467,7 @@ func (*Isolation_Vetu_Bridged) ProtoMessage() {}
 
 func (x *Isolation_Vetu_Bridged) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[128]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -7719,11 +7497,9 @@ type Isolation_Vetu_Host struct {
 
 func (x *Isolation_Vetu_Host) Reset() {
 	*x = Isolation_Vetu_Host{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_api_cirrus_ci_service_proto_msgTypes[129]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
+	mi := &file_api_cirrus_ci_service_proto_msgTypes[129]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
 }
 
 func (x *Isolation_Vetu_Host) String() string {
@@ -7734,7 +7510,7 @@ func (*Isolation_Vetu_Host) ProtoMessage() {}
 
 func (x *Isolation_Vetu_Host) ProtoReflect() protoreflect.Message {
 	mi := &file_api_cirrus_ci_service_proto_msgTypes[129]
-	if protoimpl.UnsafeEnabled && x != nil {
+	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
 			ms.StoreMessageInfo(mi)
@@ -9887,1352 +9663,6 @@ func file_api_cirrus_ci_service_proto_init() {
 	if File_api_cirrus_ci_service_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_api_cirrus_ci_service_proto_msgTypes[0].Exporter = func(v any, i int) any {
-			switch v := v.(*CapabilitiesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[1].Exporter = func(v any, i int) any {
-			switch v := v.(*CapabilitiesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[2].Exporter = func(v any, i int) any {
-			switch v := v.(*AdditionalInstancesInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[3].Exporter = func(v any, i int) any {
-			switch v := v.(*EvaluateConfigRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[4].Exporter = func(v any, i int) any {
-			switch v := v.(*FileSystem); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[5].Exporter = func(v any, i int) any {
-			switch v := v.(*EvaluateConfigResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[6].Exporter = func(v any, i int) any {
-			switch v := v.(*RichError); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[7].Exporter = func(v any, i int) any {
-			switch v := v.(*Issue); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[8].Exporter = func(v any, i int) any {
-			switch v := v.(*JSONSchemaRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[9].Exporter = func(v any, i int) any {
-			switch v := v.(*JSONSchemaResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[10].Exporter = func(v any, i int) any {
-			switch v := v.(*EvaluateFunctionRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[11].Exporter = func(v any, i int) any {
-			switch v := v.(*EvaluateFunctionResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[12].Exporter = func(v any, i int) any {
-			switch v := v.(*RegisterRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[13].Exporter = func(v any, i int) any {
-			switch v := v.(*RegisterResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[14].Exporter = func(v any, i int) any {
-			switch v := v.(*PollRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[15].Exporter = func(v any, i int) any {
-			switch v := v.(*QueryRunningTasksRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[16].Exporter = func(v any, i int) any {
-			switch v := v.(*QueryRunningTasksResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[17].Exporter = func(v any, i int) any {
-			switch v := v.(*TaskFailedRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[18].Exporter = func(v any, i int) any {
-			switch v := v.(*PollResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[19].Exporter = func(v any, i int) any {
-			switch v := v.(*WorkerInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[20].Exporter = func(v any, i int) any {
-			switch v := v.(*UpdateStatusRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[21].Exporter = func(v any, i int) any {
-			switch v := v.(*WorkerStatus); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[22].Exporter = func(v any, i int) any {
-			switch v := v.(*MultipartCacheUploadCreateResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[23].Exporter = func(v any, i int) any {
-			switch v := v.(*MultipartCacheUploadPartRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[24].Exporter = func(v any, i int) any {
-			switch v := v.(*MultipartCacheUploadCommitRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[25].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalAttachedRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[26].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalAttachedResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[27].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalLifecycleRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[28].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalLifecycleResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[29].Exporter = func(v any, i int) any {
-			switch v := v.(*TaskIdentification); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[30].Exporter = func(v any, i int) any {
-			switch v := v.(*DataChunk); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[31].Exporter = func(v any, i int) any {
-			switch v := v.(*InitialCommandsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[32].Exporter = func(v any, i int) any {
-			switch v := v.(*LogEntry); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[33].Exporter = func(v any, i int) any {
-			switch v := v.(*UploadLogsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[34].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheKey); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[35].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheEntry); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[36].Exporter = func(v any, i int) any {
-			switch v := v.(*UploadCacheResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[37].Exporter = func(v any, i int) any {
-			switch v := v.(*ArtifactEntry); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[38].Exporter = func(v any, i int) any {
-			switch v := v.(*UploadArtifactsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[39].Exporter = func(v any, i int) any {
-			switch v := v.(*ArtifactFileInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[40].Exporter = func(v any, i int) any {
-			switch v := v.(*GenerateArtifactUploadURLsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[41].Exporter = func(v any, i int) any {
-			switch v := v.(*GenerateArtifactUploadURLsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[42].Exporter = func(v any, i int) any {
-			switch v := v.(*CommitUploadedArtifactsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[43].Exporter = func(v any, i int) any {
-			switch v := v.(*CommitUploadedArtifactsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[44].Exporter = func(v any, i int) any {
-			switch v := v.(*DownloadCacheRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[45].Exporter = func(v any, i int) any {
-			switch v := v.(*CommandsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[46].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportCommandUpdatesRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[47].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportCommandUpdatesResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[48].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAnnotationsCommandRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[49].Exporter = func(v any, i int) any {
-			switch v := v.(*Annotation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[50].Exporter = func(v any, i int) any {
-			switch v := v.(*HeartbeatRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[51].Exporter = func(v any, i int) any {
-			switch v := v.(*HeartbeatResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[52].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheInfoRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[53].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[54].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheInfoResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[55].Exporter = func(v any, i int) any {
-			switch v := v.(*DeleteCacheRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[56].Exporter = func(v any, i int) any {
-			switch v := v.(*DeleteCacheResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[57].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAgentProblemRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[58].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportStopHookRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[59].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAgentSignalRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[60].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAgentLogsRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[61].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheRetrievalAttempt); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[62].Exporter = func(v any, i int) any {
-			switch v := v.(*ResourceUtilization); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[63].Exporter = func(v any, i int) any {
-			switch v := v.(*ChartPoint); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[64].Exporter = func(v any, i int) any {
-			switch v := v.(*CommandResult); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[65].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAgentFinishedRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[66].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportAgentFinishedResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[67].Exporter = func(v any, i int) any {
-			switch v := v.(*Task); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[68].Exporter = func(v any, i int) any {
-			switch v := v.(*Command); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[69].Exporter = func(v any, i int) any {
-			switch v := v.(*ExitInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[70].Exporter = func(v any, i int) any {
-			switch v := v.(*ScriptInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[71].Exporter = func(v any, i int) any {
-			switch v := v.(*BackgroundScriptInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[72].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[73].Exporter = func(v any, i int) any {
-			switch v := v.(*UploadCacheInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[74].Exporter = func(v any, i int) any {
-			switch v := v.(*CloneInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[75].Exporter = func(v any, i int) any {
-			switch v := v.(*FileInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[76].Exporter = func(v any, i int) any {
-			switch v := v.(*ArtifactsInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[77].Exporter = func(v any, i int) any {
-			switch v := v.(*WaitForTerminalInstruction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[78].Exporter = func(v any, i int) any {
-			switch v := v.(*PipeInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[79].Exporter = func(v any, i int) any {
-			switch v := v.(*ContainerInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[80].Exporter = func(v any, i int) any {
-			switch v := v.(*PortMapping); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[81].Exporter = func(v any, i int) any {
-			switch v := v.(*AdditionalContainer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[82].Exporter = func(v any, i int) any {
-			switch v := v.(*PrebuiltImageInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[83].Exporter = func(v any, i int) any {
-			switch v := v.(*Volume); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[84].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[85].Exporter = func(v any, i int) any {
-			switch v := v.(*PersistentWorkerInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[86].Exporter = func(v any, i int) any {
-			switch v := v.(*MacOSInstance); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[87].Exporter = func(v any, i int) any {
-			switch v := v.(*DockerBuilder); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[88].Exporter = func(v any, i int) any {
-			switch v := v.(*GenerateURLResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[89].Exporter = func(v any, i int) any {
-			switch v := v.(*GenerateURLsResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[92].Exporter = func(v any, i int) any {
-			switch v := v.(*FileSystem_Memory); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[93].Exporter = func(v any, i int) any {
-			switch v := v.(*FileSystem_Github); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[97].Exporter = func(v any, i int) any {
-			switch v := v.(*PollResponse_AgentAwareTask); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[101].Exporter = func(v any, i int) any {
-			switch v := v.(*MultipartCacheUploadCommitRequest_Part); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[102].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalLifecycleRequest_Started); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[103].Exporter = func(v any, i int) any {
-			switch v := v.(*ReportTerminalLifecycleRequest_Expiring); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[104].Exporter = func(v any, i int) any {
-			switch v := v.(*LogEntry_LogKey); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[105].Exporter = func(v any, i int) any {
-			switch v := v.(*ArtifactEntry_ArtifactsUpload); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[106].Exporter = func(v any, i int) any {
-			switch v := v.(*ArtifactEntry_ArtifactChunk); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[107].Exporter = func(v any, i int) any {
-			switch v := v.(*GenerateArtifactUploadURLsResponse_UploadURL); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[110].Exporter = func(v any, i int) any {
-			switch v := v.(*Annotation_FileLocation); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[111].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheRetrievalAttempt_Hit); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[112].Exporter = func(v any, i int) any {
-			switch v := v.(*CacheRetrievalAttempt_Miss); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[114].Exporter = func(v any, i int) any {
-			switch v := v.(*Task_Metadata); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[121].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_None); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[122].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Parallels); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[123].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Container); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[124].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Tart); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[125].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Vetu); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[127].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Tart_Volume); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[128].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Vetu_Bridged); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_api_cirrus_ci_service_proto_msgTypes[129].Exporter = func(v any, i int) any {
-			switch v := v.(*Isolation_Vetu_Host); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	file_api_cirrus_ci_service_proto_msgTypes[4].OneofWrappers = []any{
 		(*FileSystem_Memory_)(nil),
 		(*FileSystem_Github_)(nil),
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
index a44f2266..a0b035b9 100644
--- a/pkg/parser/parser.go
+++ b/pkg/parser/parser.go
@@ -435,12 +435,6 @@ func (p *Parser) resolveDependenciesShallow(tasks []task.ParseableTaskLike) erro
 	for _, task := range tasks {
 		var dependsOnIDs []int64
 		for _, dependsOnName := range task.DependsOnNames() {
-			// Dependency may be missing due to only_if
-			if _, ok := p.disabledTaskNamesAndAliases[dependsOnName]; ok {
-				p.registerUnbalancedOnlyIfIssue(task, dependsOnName)
-				continue
-			}
-
 			var dependencyWasFound bool
 
 			for _, subTask := range tasks {
@@ -450,6 +444,12 @@ func (p *Parser) resolveDependenciesShallow(tasks []task.ParseableTaskLike) erro
 				}
 			}
 
+			// Dependency may be missing due to only_if
+			if _, ok := p.disabledTaskNamesAndAliases[dependsOnName]; ok && !dependencyWasFound {
+				p.registerUnbalancedOnlyIfIssue(task, dependsOnName)
+				continue
+			}
+
 			if !dependencyWasFound {
 				if _, ok := fallbackNames[dependsOnName]; ok {
 					return fmt.Errorf("%w: task '%s' depends on task '%s', which name was overridden by "+
diff --git a/pkg/parser/testdata/via-rpc/matrix-depends_on.env b/pkg/parser/testdata/via-rpc/matrix-depends_on.env
new file mode 100644
index 00000000..05cb6fc1
--- /dev/null
+++ b/pkg/parser/testdata/via-rpc/matrix-depends_on.env
@@ -0,0 +1 @@
+CIRRUS_BRANCH: master
diff --git a/pkg/parser/testdata/via-rpc/matrix-depends_on.fc b/pkg/parser/testdata/via-rpc/matrix-depends_on.fc
new file mode 100644
index 00000000..dc72fb93
--- /dev/null
+++ b/pkg/parser/testdata/via-rpc/matrix-depends_on.fc
@@ -0,0 +1 @@
+ci/Dockerfile: FROM openjdk:8
diff --git a/pkg/parser/testdata/via-rpc/matrix-depends_on.json b/pkg/parser/testdata/via-rpc/matrix-depends_on.json
new file mode 100644
index 00000000..e8782e9f
--- /dev/null
+++ b/pkg/parser/testdata/via-rpc/matrix-depends_on.json
@@ -0,0 +1,78 @@
+[
+  {
+    "commands": [
+      {
+        "cloneInstruction": {},
+        "name": "clone"
+      },
+      {
+        "name": "main",
+        "scriptInstruction": {
+          "scripts": [
+            "make lint"
+          ]
+        }
+      }
+    ],
+    "environment": {
+      "CIRRUS_OS": "linux"
+    },
+    "instance": {
+      "@type": "type.googleapis.com/org.cirruslabs.ci.services.cirruscigrpc.ContainerInstance",
+      "cpu": 2,
+      "image": "alpine:latest",
+      "memory": 4096
+    },
+    "metadata": {
+      "properties": {
+        "allow_failures": "false",
+        "auto_cancellation": "true",
+        "experimental": "false",
+        "indexWithinBuild": "0",
+        "timeout_in": "3600",
+        "trigger_type": "AUTOMATIC"
+      }
+    },
+    "name": "deploy"
+  },
+  {
+    "commands": [
+      {
+        "cloneInstruction": {},
+        "name": "clone"
+      },
+      {
+        "name": "main",
+        "scriptInstruction": {
+          "scripts": [
+            "make build"
+          ]
+        }
+      }
+    ],
+    "environment": {
+      "CIRRUS_OS": "linux"
+    },
+    "instance": {
+      "@type": "type.googleapis.com/org.cirruslabs.ci.services.cirruscigrpc.ContainerInstance",
+      "cpu": 2,
+      "image": "alpine:latest",
+      "memory": 4096
+    },
+    "localGroupId": "2",
+    "metadata": {
+      "properties": {
+        "allow_failures": "false",
+        "auto_cancellation": "true",
+        "experimental": "false",
+        "indexWithinBuild": "1",
+        "timeout_in": "3600",
+        "trigger_type": "AUTOMATIC"
+      }
+    },
+    "name": "migration",
+    "requiredGroups": [
+      "0"
+    ]
+  }
+]
diff --git a/pkg/parser/testdata/via-rpc/matrix-depends_on.yml b/pkg/parser/testdata/via-rpc/matrix-depends_on.yml
new file mode 100644
index 00000000..f02b2ea6
--- /dev/null
+++ b/pkg/parser/testdata/via-rpc/matrix-depends_on.yml
@@ -0,0 +1,20 @@
+container:
+  image: alpine:latest
+
+matrix_definition: &MATRIX_DEFINITION
+  - { only_if: ($CIRRUS_BRANCH == 'master') }
+  - { only_if: ($CIRRUS_PR_LABELS =~ '.*deploy-dev.*') }
+
+task:
+  name: deploy
+  matrix:
+    <<: *MATRIX_DEFINITION
+  script: make lint
+
+task:
+  name: migration
+  depends_on:
+    - deploy
+  matrix:
+    <<: *MATRIX_DEFINITION
+  script: make build
\ No newline at end of file