diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
index 85de60a3be..acb4b787d0 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
+++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.cc
@@ -515,6 +515,7 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fadmin_2fagent_2eproto::o
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, outputs_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, message_),
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, log_links_),
+  PROTOBUF_FIELD_OFFSET(::flyteidl::admin::Resource, phase_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::flyteidl::admin::DeleteTaskRequest, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -601,17 +602,17 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SE
   { 55, -1, sizeof(::flyteidl::admin::GetTaskRequest)},
   { 62, -1, sizeof(::flyteidl::admin::GetTaskResponse)},
   { 69, -1, sizeof(::flyteidl::admin::Resource)},
-  { 78, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)},
-  { 85, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)},
-  { 90, -1, sizeof(::flyteidl::admin::Agent)},
-  { 97, -1, sizeof(::flyteidl::admin::GetAgentRequest)},
-  { 103, -1, sizeof(::flyteidl::admin::GetAgentResponse)},
-  { 109, -1, sizeof(::flyteidl::admin::ListAgentsRequest)},
-  { 114, -1, sizeof(::flyteidl::admin::ListAgentsResponse)},
-  { 120, -1, sizeof(::flyteidl::admin::GetTaskMetricsRequest)},
-  { 131, -1, sizeof(::flyteidl::admin::GetTaskMetricsResponse)},
-  { 137, -1, sizeof(::flyteidl::admin::GetTaskLogsRequest)},
-  { 146, -1, sizeof(::flyteidl::admin::GetTaskLogsResponse)},
+  { 79, -1, sizeof(::flyteidl::admin::DeleteTaskRequest)},
+  { 86, -1, sizeof(::flyteidl::admin::DeleteTaskResponse)},
+  { 91, -1, sizeof(::flyteidl::admin::Agent)},
+  { 98, -1, sizeof(::flyteidl::admin::GetAgentRequest)},
+  { 104, -1, sizeof(::flyteidl::admin::GetAgentResponse)},
+  { 110, -1, sizeof(::flyteidl::admin::ListAgentsRequest)},
+  { 115, -1, sizeof(::flyteidl::admin::ListAgentsResponse)},
+  { 121, -1, sizeof(::flyteidl::admin::GetTaskMetricsRequest)},
+  { 132, -1, sizeof(::flyteidl::admin::GetTaskMetricsResponse)},
+  { 138, -1, sizeof(::flyteidl::admin::GetTaskLogsRequest)},
+  { 147, -1, sizeof(::flyteidl::admin::GetTaskLogsResponse)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -675,39 +676,41 @@ const char descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto[] =
   "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta"
   "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 "
   "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin"
-  "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\230\001\n\010Res"
-  "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St"
-  "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit"
-  "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 "
-  "\003(\0132\026.flyteidl.core.TaskLog\"=\n\021DeleteTas"
-  "kRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_"
-  "meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agen"
-  "t\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030"
-  "\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8"
-  "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt"
-  "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n"
-  "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl"
-  "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq"
-  "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta"
-  "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 "
-  "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t"
-  "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n"
-  "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O"
-  "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003("
-  "\0132$.flyteidl.core.ExecutionMetricResult\""
-  "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t"
-  "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r"
-  "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007"
-  "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n"
-  "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR"
-  "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED"
-  "ED\020\004B=Z;github.com/flyteorg/flyte/flytei"
-  "dl/gen/pb-go/flyteidl/adminb\006proto3"
+  "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\317\001\n\010Res"
+  "ource\022(\n\005state\030\001 \001(\0162\025.flyteidl.admin.St"
+  "ateB\002\030\001\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core"
+  ".LiteralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_link"
+  "s\030\004 \003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase"
+  "\030\005 \001(\0162\".flyteidl.core.TaskExecution.Pha"
+  "se\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001"
+  "(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskR"
+  "esponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024suppor"
+  "ted_task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022"
+  "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age"
+  "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA"
+  "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag"
+  "ents\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025Ge"
+  "tTaskMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025"
+  "\n\rresource_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022."
+  "\n\nstart_time\030\004 \001(\0132\032.google.protobuf.Tim"
+  "estamp\022,\n\010end_time\030\005 \001(\0132\032.google.protob"
+  "uf.Timestamp\022\'\n\004step\030\006 \001(\0132\031.google.prot"
+  "obuf.Duration\"O\n\026GetTaskMetricsResponse\022"
+  "5\n\007results\030\001 \003(\0132$.flyteidl.core.Executi"
+  "onMetricResult\"\\\n\022GetTaskLogsRequest\022\021\n\t"
+  "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r"
+  "\n\005lines\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskL"
+  "ogsResponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 "
+  "\001(\t*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021P"
+  "ERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNI"
+  "NG\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteo"
+  "rg/flyte/flyteidl/gen/pb-go/flyteidl/adm"
+  "inb\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fadmin_2fagent_2eproto = {
   false, InitDefaults_flyteidl_2fadmin_2fagent_2eproto, 
   descriptor_table_protodef_flyteidl_2fadmin_2fagent_2eproto,
-  "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2355,
+  "flyteidl/admin/agent.proto", &assign_descriptors_table_flyteidl_2fadmin_2fagent_2eproto, 2410,
 };
 
 void AddDescriptors_flyteidl_2fadmin_2fagent_2eproto() {
@@ -3441,6 +3444,7 @@ const int Resource::kStateFieldNumber;
 const int Resource::kOutputsFieldNumber;
 const int Resource::kMessageFieldNumber;
 const int Resource::kLogLinksFieldNumber;
+const int Resource::kPhaseFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Resource::Resource()
@@ -3462,7 +3466,9 @@ Resource::Resource(const Resource& from)
   } else {
     outputs_ = nullptr;
   }
-  state_ = from.state_;
+  ::memcpy(&state_, &from.state_,
+    static_cast<size_t>(reinterpret_cast<char*>(&phase_) -
+    reinterpret_cast<char*>(&state_)) + sizeof(phase_));
   // @@protoc_insertion_point(copy_constructor:flyteidl.admin.Resource)
 }
 
@@ -3471,8 +3477,8 @@ void Resource::SharedCtor() {
       &scc_info_Resource_flyteidl_2fadmin_2fagent_2eproto.base);
   message_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&outputs_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&state_) -
-      reinterpret_cast<char*>(&outputs_)) + sizeof(state_));
+      reinterpret_cast<char*>(&phase_) -
+      reinterpret_cast<char*>(&outputs_)) + sizeof(phase_));
 }
 
 Resource::~Resource() {
@@ -3506,7 +3512,9 @@ void Resource::Clear() {
     delete outputs_;
   }
   outputs_ = nullptr;
-  state_ = 0;
+  ::memset(&state_, 0, static_cast<size_t>(
+      reinterpret_cast<char*>(&phase_) -
+      reinterpret_cast<char*>(&state_)) + sizeof(phase_));
   _internal_metadata_.Clear();
 }
 
@@ -3523,7 +3531,7 @@ const char* Resource::_InternalParse(const char* begin, const char* end, void* o
     ptr = ::google::protobuf::io::Parse32(ptr, &tag);
     GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
     switch (tag >> 3) {
-      // .flyteidl.admin.State state = 1;
+      // .flyteidl.admin.State state = 1 [deprecated = true];
       case 1: {
         if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
         ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
@@ -3576,6 +3584,14 @@ const char* Resource::_InternalParse(const char* begin, const char* end, void* o
         } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1));
         break;
       }
+      // .flyteidl.core.TaskExecution.Phase phase = 5;
+      case 5: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 40) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        msg->set_phase(static_cast<::flyteidl::core::TaskExecution_Phase>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
       default: {
       handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
@@ -3610,7 +3626,7 @@ bool Resource::MergePartialFromCodedStream(
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // .flyteidl.admin.State state = 1;
+      // .flyteidl.admin.State state = 1 [deprecated = true];
       case 1: {
         if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
           int value = 0;
@@ -3661,6 +3677,20 @@ bool Resource::MergePartialFromCodedStream(
         break;
       }
 
+      // .flyteidl.core.TaskExecution.Phase phase = 5;
+      case 5: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (40 & 0xFF)) {
+          int value = 0;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          set_phase(static_cast< ::flyteidl::core::TaskExecution_Phase >(value));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -3688,7 +3718,7 @@ void Resource::SerializeWithCachedSizes(
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .flyteidl.admin.State state = 1;
+  // .flyteidl.admin.State state = 1 [deprecated = true];
   if (this->state() != 0) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->state(), output);
@@ -3719,6 +3749,12 @@ void Resource::SerializeWithCachedSizes(
       output);
   }
 
+  // .flyteidl.core.TaskExecution.Phase phase = 5;
+  if (this->phase() != 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      5, this->phase(), output);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
@@ -3732,7 +3768,7 @@ ::google::protobuf::uint8* Resource::InternalSerializeWithCachedSizesToArray(
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .flyteidl.admin.State state = 1;
+  // .flyteidl.admin.State state = 1 [deprecated = true];
   if (this->state() != 0) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->state(), target);
@@ -3764,6 +3800,12 @@ ::google::protobuf::uint8* Resource::InternalSerializeWithCachedSizesToArray(
         4, this->log_links(static_cast<int>(i)), target);
   }
 
+  // .flyteidl.core.TaskExecution.Phase phase = 5;
+  if (this->phase() != 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      5, this->phase(), target);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
@@ -3810,12 +3852,18 @@ size_t Resource::ByteSizeLong() const {
         *outputs_);
   }
 
-  // .flyteidl.admin.State state = 1;
+  // .flyteidl.admin.State state = 1 [deprecated = true];
   if (this->state() != 0) {
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->state());
   }
 
+  // .flyteidl.core.TaskExecution.Phase phase = 5;
+  if (this->phase() != 0) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->phase());
+  }
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
@@ -3854,6 +3902,9 @@ void Resource::MergeFrom(const Resource& from) {
   if (from.state() != 0) {
     set_state(from.state());
   }
+  if (from.phase() != 0) {
+    set_phase(from.phase());
+  }
 }
 
 void Resource::CopyFrom(const ::google::protobuf::Message& from) {
@@ -3886,6 +3937,7 @@ void Resource::InternalSwap(Resource* other) {
     GetArenaNoVirtual());
   swap(outputs_, other->outputs_);
   swap(state_, other->state_);
+  swap(phase_, other->phase_);
 }
 
 ::google::protobuf::Metadata Resource::GetMetadata() const {
diff --git a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
index 78238b32c1..4912d899c8 100644
--- a/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
+++ b/flyteidl/gen/pb-cpp/flyteidl/admin/agent.pb.h
@@ -1133,11 +1133,17 @@ class Resource final :
   ::flyteidl::core::LiteralMap* mutable_outputs();
   void set_allocated_outputs(::flyteidl::core::LiteralMap* outputs);
 
-  // .flyteidl.admin.State state = 1;
-  void clear_state();
-  static const int kStateFieldNumber = 1;
-  ::flyteidl::admin::State state() const;
-  void set_state(::flyteidl::admin::State value);
+  // .flyteidl.admin.State state = 1 [deprecated = true];
+  PROTOBUF_DEPRECATED void clear_state();
+  PROTOBUF_DEPRECATED static const int kStateFieldNumber = 1;
+  PROTOBUF_DEPRECATED ::flyteidl::admin::State state() const;
+  PROTOBUF_DEPRECATED void set_state(::flyteidl::admin::State value);
+
+  // .flyteidl.core.TaskExecution.Phase phase = 5;
+  void clear_phase();
+  static const int kPhaseFieldNumber = 5;
+  ::flyteidl::core::TaskExecution_Phase phase() const;
+  void set_phase(::flyteidl::core::TaskExecution_Phase value);
 
   // @@protoc_insertion_point(class_scope:flyteidl.admin.Resource)
  private:
@@ -1148,6 +1154,7 @@ class Resource final :
   ::google::protobuf::internal::ArenaStringPtr message_;
   ::flyteidl::core::LiteralMap* outputs_;
   int state_;
+  int phase_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_flyteidl_2fadmin_2fagent_2eproto;
 };
@@ -3360,7 +3367,7 @@ GetTaskResponse::log_links() const {
 
 // Resource
 
-// .flyteidl.admin.State state = 1;
+// .flyteidl.admin.State state = 1 [deprecated = true];
 inline void Resource::clear_state() {
   state_ = 0;
 }
@@ -3499,6 +3506,20 @@ Resource::log_links() const {
   return log_links_;
 }
 
+// .flyteidl.core.TaskExecution.Phase phase = 5;
+inline void Resource::clear_phase() {
+  phase_ = 0;
+}
+inline ::flyteidl::core::TaskExecution_Phase Resource::phase() const {
+  // @@protoc_insertion_point(field_get:flyteidl.admin.Resource.phase)
+  return static_cast< ::flyteidl::core::TaskExecution_Phase >(phase_);
+}
+inline void Resource::set_phase(::flyteidl::core::TaskExecution_Phase value) {
+  
+  phase_ = value;
+  // @@protoc_insertion_point(field_set:flyteidl.admin.Resource.phase)
+}
+
 // -------------------------------------------------------------------
 
 // DeleteTaskRequest
diff --git a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
index 7c53c6fc7d..a3f2e327d9 100644
--- a/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
+++ b/flyteidl/gen/pb-go/flyteidl/admin/agent.pb.go
@@ -398,8 +398,8 @@ func (m *GetTaskResponse) GetLogLinks() []*core.TaskLog {
 }
 
 type Resource struct {
-	// The state of the execution is used to control its visibility in the UI/CLI.
-	State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"`
+	// DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
+	State State `protobuf:"varint,1,opt,name=state,proto3,enum=flyteidl.admin.State" json:"state,omitempty"` // Deprecated: Do not use.
 	// The outputs of the execution. It's typically used by sql task. Agent service will create a
 	// Structured dataset pointing to the query result table.
 	// +optional
@@ -407,10 +407,12 @@ type Resource struct {
 	// A descriptive message for the current state. e.g. waiting for cluster.
 	Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
 	// log information for the task execution.
-	LogLinks             []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
-	XXX_unrecognized     []byte          `json:"-"`
-	XXX_sizecache        int32           `json:"-"`
+	LogLinks []*core.TaskLog `protobuf:"bytes,4,rep,name=log_links,json=logLinks,proto3" json:"log_links,omitempty"`
+	// The phase of the execution is used to determine the phase of the plugin's execution.
+	Phase                core.TaskExecution_Phase `protobuf:"varint,5,opt,name=phase,proto3,enum=flyteidl.core.TaskExecution_Phase" json:"phase,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
 func (m *Resource) Reset()         { *m = Resource{} }
@@ -438,6 +440,7 @@ func (m *Resource) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_Resource proto.InternalMessageInfo
 
+// Deprecated: Do not use.
 func (m *Resource) GetState() State {
 	if m != nil {
 		return m.State
@@ -466,6 +469,13 @@ func (m *Resource) GetLogLinks() []*core.TaskLog {
 	return nil
 }
 
+func (m *Resource) GetPhase() core.TaskExecution_Phase {
+	if m != nil {
+		return m.Phase
+	}
+	return core.TaskExecution_UNDEFINED
+}
+
 // A message used to delete a task.
 type DeleteTaskRequest struct {
 	// A predefined yet extensible Task type identifier.
@@ -1026,74 +1036,76 @@ func init() {
 func init() { proto.RegisterFile("flyteidl/admin/agent.proto", fileDescriptor_c434e52bb0028071) }
 
 var fileDescriptor_c434e52bb0028071 = []byte{
-	// 1098 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x6f, 0x6f, 0xdb, 0xd4,
-	0x17, 0x5e, 0xfe, 0x36, 0x39, 0xe9, 0xb6, 0xe4, 0xb6, 0xd9, 0xcf, 0x4d, 0xf7, 0x83, 0xca, 0x50,
-	0x54, 0x31, 0xd5, 0x61, 0x2d, 0x8c, 0x0e, 0xc4, 0xa6, 0xb4, 0x35, 0x5d, 0xa5, 0x34, 0xaa, 0x6e,
-	0x53, 0x34, 0x90, 0x20, 0x72, 0x92, 0x53, 0x63, 0xc5, 0xb1, 0x3d, 0xdf, 0xeb, 0x6a, 0x45, 0xbc,
-	0x82, 0xaf, 0xc0, 0x0b, 0xbe, 0x0b, 0x5f, 0x0e, 0xf9, 0xde, 0x6b, 0x27, 0x0e, 0xd9, 0xe8, 0xc4,
-	0xde, 0xf9, 0xfc, 0x7b, 0xce, 0x73, 0x9f, 0x73, 0xec, 0x6b, 0x68, 0x5d, 0xb9, 0x37, 0x1c, 0x9d,
-	0xb1, 0xdb, 0xb6, 0xc6, 0x53, 0xc7, 0x6b, 0x5b, 0x36, 0x7a, 0xdc, 0x08, 0x42, 0x9f, 0xfb, 0xe4,
-	0x5e, 0x12, 0x33, 0x44, 0xac, 0xf5, 0x30, 0xcd, 0x1d, 0xf9, 0x21, 0xb6, 0x5d, 0x87, 0x63, 0x68,
-	0xb9, 0x4c, 0x66, 0xb7, 0x36, 0xb2, 0x51, 0x6e, 0xb1, 0x49, 0x12, 0xfa, 0x20, 0x1b, 0x72, 0xc6,
-	0xe8, 0x71, 0xe7, 0xca, 0xc1, 0x50, 0xc5, 0xff, 0x9f, 0x8d, 0xe3, 0x6b, 0x1c, 0x45, 0xdc, 0xf1,
-	0x3d, 0x15, 0xde, 0xcc, 0x86, 0xa7, 0xc8, 0x43, 0x67, 0x94, 0x62, 0xdb, 0xbe, 0x6f, 0xbb, 0xd8,
-	0x16, 0xd6, 0x30, 0xba, 0x6a, 0x8f, 0xa3, 0xd0, 0x9a, 0x2b, 0xfe, 0x70, 0x31, 0xce, 0x9d, 0x29,
-	0x32, 0x6e, 0x4d, 0x03, 0x99, 0xa0, 0xff, 0x59, 0x82, 0x66, 0xdf, 0x62, 0x13, 0x33, 0xe9, 0x7a,
-	0x86, 0xdc, 0x1a, 0x5b, 0xdc, 0x22, 0x14, 0x1a, 0xf1, 0x29, 0x06, 0x29, 0x9f, 0x81, 0x33, 0xd6,
-	0x72, 0x5b, 0xb9, 0x9d, 0xda, 0xde, 0x27, 0x46, 0xaa, 0x4d, 0xcc, 0xc9, 0xc8, 0x00, 0x9c, 0xa6,
-	0xe7, 0xa3, 0xf7, 0x79, 0x36, 0x40, 0x1e, 0x42, 0xd5, 0xb3, 0xa6, 0xc8, 0x02, 0x6b, 0x84, 0x5a,
-	0x7e, 0x2b, 0xb7, 0x53, 0xa5, 0x33, 0x07, 0x39, 0x85, 0xb2, 0x6b, 0x0d, 0xd1, 0x65, 0x5a, 0x61,
-	0xab, 0xb0, 0x53, 0xdb, 0x7b, 0x6c, 0x64, 0x47, 0x60, 0x2c, 0x25, 0x6a, 0x74, 0x45, 0x8d, 0xe9,
-	0xf1, 0xf0, 0x86, 0x2a, 0x00, 0xf2, 0x12, 0x6a, 0x96, 0xe7, 0xf9, 0x5c, 0x68, 0xc1, 0xb4, 0xa2,
-	0xc0, 0x7b, 0x72, 0x3b, 0xbc, 0xce, 0xac, 0x50, 0x82, 0xce, 0x43, 0x11, 0x03, 0xd6, 0x26, 0x07,
-	0x6c, 0xc0, 0x30, 0xbc, 0x76, 0x46, 0x38, 0xb0, 0x46, 0x23, 0x3f, 0xf2, 0xb8, 0x56, 0x12, 0x87,
-	0x69, 0x4c, 0x0e, 0xd8, 0x85, 0x8c, 0x74, 0x64, 0x80, 0x70, 0x68, 0xa2, 0x77, 0xed, 0x84, 0xbe,
-	0x37, 0x45, 0x8f, 0x0f, 0xae, 0xad, 0xd0, 0xb1, 0x86, 0x2e, 0x32, 0xad, 0x2c, 0x38, 0x3d, 0xbf,
-	0x1d, 0x27, 0x73, 0x06, 0xf1, 0x5d, 0x82, 0x20, 0xc9, 0xad, 0xe3, 0x92, 0x50, 0xeb, 0x29, 0xd4,
-	0xe6, 0x64, 0x21, 0x75, 0x28, 0x4c, 0xf0, 0x46, 0x4c, 0xaf, 0x4a, 0xe3, 0x47, 0xb2, 0x0e, 0xa5,
-	0x6b, 0xcb, 0x8d, 0x92, 0x29, 0x48, 0xe3, 0xab, 0xfc, 0x41, 0xae, 0xf5, 0x0c, 0xea, 0x8b, 0x0a,
-	0xbc, 0x53, 0xfd, 0x09, 0x6c, 0xbc, 0x91, 0xed, 0xbb, 0x00, 0xe9, 0xbf, 0xe7, 0xa1, 0x71, 0x14,
-	0xa2, 0xc5, 0x31, 0xd6, 0x84, 0xe2, 0xab, 0x08, 0x19, 0x27, 0x8f, 0xa1, 0xec, 0x78, 0x41, 0xc4,
-	0x99, 0xda, 0xc5, 0x8d, 0x85, 0x5d, 0xec, 0xca, 0xf7, 0xf2, 0xcc, 0x0a, 0xa8, 0x4a, 0x24, 0x5f,
-	0x42, 0x85, 0xe3, 0x34, 0x70, 0x2d, 0x2e, 0xbb, 0xd4, 0xf6, 0x36, 0x97, 0x2c, 0x70, 0x5f, 0xa5,
-	0xd0, 0x34, 0x99, 0x7c, 0x04, 0x77, 0xfd, 0x88, 0x07, 0x11, 0x1f, 0x04, 0x21, 0x5e, 0x39, 0xaf,
-	0xb5, 0x82, 0xe0, 0xb8, 0x2a, 0x9d, 0xe7, 0xc2, 0x47, 0x7e, 0x84, 0xff, 0x2d, 0xbc, 0x27, 0x53,
-	0x35, 0x35, 0xad, 0x28, 0x9a, 0x6d, 0xdf, 0x6a, 0xc4, 0xb4, 0xc9, 0x97, 0xb9, 0xf5, 0x5f, 0x80,
-	0xcc, 0x8b, 0xc0, 0x02, 0xdf, 0x63, 0x48, 0xb6, 0xe1, 0x6e, 0x88, 0xcc, 0x8f, 0xc2, 0x11, 0x8a,
-	0x76, 0x42, 0x8c, 0xd5, 0x17, 0x77, 0xe8, 0x6a, 0xe2, 0x8e, 0x01, 0xc8, 0x13, 0xa8, 0x24, 0xb6,
-	0x3a, 0xb9, 0xb6, 0x48, 0x86, 0xaa, 0xf8, 0x8b, 0x3b, 0x34, 0xcd, 0x3d, 0x2c, 0x41, 0x21, 0x44,
-	0xa6, 0x53, 0xb8, 0x77, 0x82, 0x7c, 0x5e, 0xfd, 0x4d, 0xa8, 0x8a, 0xc3, 0xf2, 0x9b, 0x00, 0xd5,
-	0x14, 0x2b, 0xb1, 0xa3, 0x7f, 0x13, 0x08, 0xb9, 0xb2, 0xa4, 0xe2, 0x96, 0xab, 0x59, 0x4a, 0xfa,
-	0xaf, 0x70, 0x3f, 0xc5, 0x54, 0x87, 0xf9, 0x7c, 0x8e, 0x65, 0xee, 0xed, 0x2c, 0x67, 0x1c, 0xc9,
-	0x3e, 0x54, 0x5d, 0xdf, 0x1e, 0xb8, 0x8e, 0x37, 0x61, 0x5a, 0x5e, 0xbc, 0x4c, 0x0f, 0x96, 0x8c,
-	0xb5, 0xeb, 0xdb, 0xb4, 0xe2, 0xfa, 0x76, 0x37, 0xce, 0xd3, 0xff, 0xca, 0x41, 0x25, 0xc1, 0x22,
-	0x8f, 0xa0, 0xc4, 0x78, 0xbc, 0x14, 0x71, 0xd3, 0x7b, 0x7b, 0xcd, 0xc5, 0xa6, 0x17, 0x71, 0x90,
-	0xca, 0x1c, 0xb2, 0x0f, 0x2b, 0x72, 0xec, 0x4c, 0x29, 0xf9, 0x96, 0xc5, 0x4b, 0x32, 0x89, 0x06,
-	0x2b, 0x53, 0x64, 0xcc, 0xb2, 0x51, 0xad, 0x4e, 0x62, 0x66, 0xd9, 0x17, 0x6f, 0xc9, 0xfe, 0x12,
-	0x1a, 0xc7, 0xe8, 0x62, 0xf6, 0x85, 0xf8, 0xef, 0x23, 0x59, 0x07, 0x32, 0x0f, 0x2b, 0xa7, 0xa2,
-	0x9f, 0x41, 0xa9, 0x13, 0x5f, 0x87, 0x84, 0x40, 0x31, 0xfe, 0x46, 0x2b, 0x6c, 0xf1, 0x4c, 0x3e,
-	0x83, 0x75, 0x16, 0x05, 0x81, 0x1f, 0x72, 0x1c, 0x0f, 0xd2, 0xf6, 0x72, 0x0e, 0x55, 0x4a, 0xd2,
-	0x58, 0x5f, 0x11, 0x61, 0xfa, 0xb6, 0x98, 0xbb, 0x40, 0x4c, 0x98, 0x2f, 0x01, 0xd6, 0x9f, 0x43,
-	0x7d, 0x96, 0xa6, 0xf6, 0xe3, 0x11, 0x94, 0xc4, 0xc5, 0xac, 0x96, 0xe3, 0x1f, 0x73, 0x92, 0xd9,
-	0x32, 0x47, 0x5f, 0x83, 0x46, 0xd7, 0x61, 0x12, 0x81, 0xa9, 0x4e, 0xfa, 0x11, 0x90, 0x79, 0xa7,
-	0xc2, 0xdd, 0x85, 0xb2, 0xa8, 0x89, 0x3f, 0x25, 0x85, 0x37, 0x03, 0xab, 0x24, 0xfd, 0x8f, 0x3c,
-	0x34, 0xd5, 0xea, 0x9e, 0xc9, 0x4b, 0xf8, 0xbd, 0x8d, 0x20, 0x5e, 0x94, 0x57, 0x11, 0x86, 0x0e,
-	0xca, 0xbb, 0xaf, 0x4a, 0x13, 0x93, 0x3c, 0x05, 0x60, 0xdc, 0x0a, 0xf9, 0x20, 0xbe, 0xb9, 0xd5,
-	0x17, 0xa5, 0x65, 0xc8, 0x6b, 0xdd, 0x48, 0xae, 0x75, 0xa3, 0x9f, 0x5c, 0xeb, 0xb4, 0x2a, 0xb2,
-	0x63, 0x9b, 0x7c, 0x01, 0x15, 0xf4, 0xc6, 0xb2, 0xb0, 0xf4, 0xaf, 0x85, 0x2b, 0xe8, 0x8d, 0x45,
-	0xd9, 0x2e, 0x14, 0x19, 0xc7, 0x40, 0x2b, 0xab, 0x35, 0x5f, 0x2c, 0x39, 0x56, 0xbf, 0x18, 0x54,
-	0xa4, 0xe9, 0x2f, 0xe1, 0xc1, 0xa2, 0x2a, 0x4a, 0xdf, 0x67, 0xb0, 0x12, 0x22, 0x8b, 0xdc, 0x54,
-	0xe0, 0x8f, 0x17, 0x36, 0x7c, 0xfe, 0x6b, 0x17, 0x3a, 0x23, 0x2a, 0x92, 0x69, 0x52, 0xa4, 0xff,
-	0x96, 0x03, 0xa2, 0xa0, 0xbb, 0xbe, 0xfd, 0x1e, 0xd5, 0x5e, 0x87, 0x92, 0xeb, 0x78, 0x42, 0xeb,
-	0xdc, 0x4e, 0x91, 0x4a, 0x23, 0xf6, 0x72, 0x7f, 0x82, 0x9e, 0x10, 0xb9, 0x4a, 0xa5, 0xa1, 0x9b,
-	0xb0, 0x96, 0xe1, 0xa0, 0xce, 0xa6, 0x65, 0xcf, 0x56, 0x4d, 0x59, 0xcf, 0x60, 0xf2, 0x73, 0x30,
-	0x9f, 0xfe, 0x04, 0x25, 0xf1, 0x39, 0x21, 0x4d, 0x68, 0x50, 0xb3, 0x4f, 0xbf, 0xef, 0x1c, 0x76,
-	0xcd, 0xc1, 0xb7, 0x9d, 0xd3, 0xee, 0x25, 0x35, 0xeb, 0x77, 0x62, 0xf7, 0xb9, 0x49, 0xcf, 0x3a,
-	0x3d, 0xb3, 0xd7, 0x4f, 0xdd, 0x39, 0x52, 0x83, 0x95, 0x73, 0xb3, 0x77, 0x7c, 0xda, 0x3b, 0xa9,
-	0xe7, 0x63, 0x83, 0x5e, 0xf6, 0x7a, 0xb1, 0x51, 0x20, 0x77, 0xa1, 0x7a, 0x71, 0x79, 0x74, 0x64,
-	0x9a, 0xc7, 0xe6, 0x71, 0xbd, 0x78, 0xf8, 0xcd, 0x0f, 0x5f, 0xdb, 0x0e, 0xff, 0x39, 0x1a, 0x1a,
-	0x23, 0x7f, 0xda, 0x16, 0x32, 0xfb, 0xa1, 0x2d, 0x1f, 0xda, 0xe9, 0x1f, 0xa4, 0x8d, 0x5e, 0x3b,
-	0x18, 0xee, 0xda, 0x7e, 0x3b, 0xfb, 0xe3, 0x3b, 0x2c, 0x8b, 0xe9, 0xee, 0xff, 0x1d, 0x00, 0x00,
-	0xff, 0xff, 0xaf, 0x08, 0xa3, 0x3f, 0x11, 0x0b, 0x00, 0x00,
+	// 1123 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xef, 0x6f, 0xdb, 0xc4,
+	0x1b, 0x5f, 0x7e, 0x36, 0x79, 0xd2, 0x75, 0xc9, 0xad, 0xd9, 0xd7, 0xcb, 0xf6, 0x85, 0xc9, 0x30,
+	0x54, 0x81, 0xe6, 0xb0, 0x0e, 0x46, 0x07, 0x62, 0x53, 0xda, 0x9a, 0xad, 0x52, 0x1a, 0x55, 0xb7,
+	0x14, 0x0d, 0x24, 0x88, 0x2e, 0xc9, 0x53, 0xcf, 0x8a, 0x63, 0x7b, 0xbe, 0x73, 0xb5, 0x22, 0x5e,
+	0xc1, 0xbf, 0xc0, 0x0b, 0xfe, 0x55, 0xde, 0x21, 0xdf, 0x9d, 0x9d, 0x38, 0x64, 0xa3, 0x13, 0x7b,
+	0xe7, 0xe7, 0xd7, 0xe7, 0xf9, 0x3c, 0x3f, 0x7c, 0x77, 0xd0, 0x39, 0xf3, 0x2e, 0x04, 0xba, 0x53,
+	0xaf, 0xcb, 0xa6, 0x73, 0xd7, 0xef, 0x32, 0x07, 0x7d, 0x61, 0x85, 0x51, 0x20, 0x02, 0xb2, 0x95,
+	0xda, 0x2c, 0x69, 0xeb, 0xdc, 0xce, 0x7c, 0x27, 0x41, 0x84, 0x5d, 0xcf, 0x15, 0x18, 0x31, 0x8f,
+	0x2b, 0xef, 0xce, 0xcd, 0xbc, 0x55, 0x30, 0x3e, 0x4b, 0x4d, 0x1f, 0xe4, 0x4d, 0xee, 0x14, 0x7d,
+	0xe1, 0x9e, 0xb9, 0x18, 0x69, 0xfb, 0xff, 0xf3, 0x76, 0x7c, 0x8d, 0x93, 0x58, 0xb8, 0x81, 0xaf,
+	0xcd, 0xb7, 0xf2, 0xe6, 0x39, 0x8a, 0xc8, 0x9d, 0x64, 0xd8, 0x4e, 0x10, 0x38, 0x1e, 0x76, 0xa5,
+	0x34, 0x8e, 0xcf, 0xba, 0xd3, 0x38, 0x62, 0x4b, 0xc1, 0x1f, 0xae, 0xda, 0x85, 0x3b, 0x47, 0x2e,
+	0xd8, 0x3c, 0x54, 0x0e, 0xe6, 0x9f, 0x15, 0x68, 0x0f, 0x19, 0x9f, 0xd9, 0x69, 0xd6, 0x63, 0x14,
+	0x6c, 0xca, 0x04, 0x23, 0x14, 0x5a, 0x49, 0x15, 0xa3, 0x8c, 0xcf, 0xc8, 0x9d, 0x1a, 0x85, 0x3b,
+	0x85, 0x9d, 0xc6, 0xee, 0x27, 0x56, 0xd6, 0x9b, 0x84, 0x93, 0x95, 0x03, 0x38, 0xca, 0xea, 0xa3,
+	0xd7, 0x44, 0xde, 0x40, 0x6e, 0x43, 0xdd, 0x67, 0x73, 0xe4, 0x21, 0x9b, 0xa0, 0x51, 0xbc, 0x53,
+	0xd8, 0xa9, 0xd3, 0x85, 0x82, 0x1c, 0x41, 0xd5, 0x63, 0x63, 0xf4, 0xb8, 0x51, 0xba, 0x53, 0xda,
+	0x69, 0xec, 0xde, 0xb7, 0xf2, 0x23, 0xb0, 0xd6, 0x12, 0xb5, 0xfa, 0x32, 0xc6, 0xf6, 0x45, 0x74,
+	0x41, 0x35, 0x00, 0x79, 0x01, 0x0d, 0xe6, 0xfb, 0x81, 0x90, 0xbd, 0xe0, 0x46, 0x59, 0xe2, 0x3d,
+	0xbc, 0x1c, 0x5e, 0x6f, 0x11, 0xa8, 0x40, 0x97, 0xa1, 0x88, 0x05, 0xd7, 0x67, 0x7b, 0x7c, 0xc4,
+	0x31, 0x3a, 0x77, 0x27, 0x38, 0x62, 0x93, 0x49, 0x10, 0xfb, 0xc2, 0xa8, 0xc8, 0x62, 0x5a, 0xb3,
+	0x3d, 0xfe, 0x5c, 0x59, 0x7a, 0xca, 0x40, 0x04, 0xb4, 0xd1, 0x3f, 0x77, 0xa3, 0xc0, 0x9f, 0xa3,
+	0x2f, 0x46, 0xe7, 0x2c, 0x72, 0xd9, 0xd8, 0x43, 0x6e, 0x54, 0x25, 0xa7, 0x27, 0x97, 0xe3, 0x64,
+	0x2f, 0x20, 0xbe, 0x4f, 0x11, 0x14, 0xb9, 0x6d, 0x5c, 0x63, 0xea, 0x3c, 0x82, 0xc6, 0x52, 0x5b,
+	0x48, 0x13, 0x4a, 0x33, 0xbc, 0x90, 0xd3, 0xab, 0xd3, 0xe4, 0x93, 0x6c, 0x43, 0xe5, 0x9c, 0x79,
+	0x71, 0x3a, 0x05, 0x25, 0x7c, 0x5d, 0xdc, 0x2b, 0x74, 0x1e, 0x43, 0x73, 0xb5, 0x03, 0xef, 0x14,
+	0xff, 0x14, 0x6e, 0xbe, 0x91, 0xed, 0xbb, 0x00, 0x99, 0xbf, 0x17, 0xa1, 0x75, 0x10, 0x21, 0x13,
+	0x98, 0xf4, 0x84, 0xe2, 0xab, 0x18, 0xb9, 0x20, 0xf7, 0xa1, 0xea, 0xfa, 0x61, 0x2c, 0xb8, 0xde,
+	0xc5, 0x9b, 0x2b, 0xbb, 0xd8, 0x57, 0xff, 0xe5, 0x31, 0x0b, 0xa9, 0x76, 0x24, 0x5f, 0x41, 0x4d,
+	0xe0, 0x3c, 0xf4, 0x98, 0x50, 0x59, 0x1a, 0xbb, 0xb7, 0xd6, 0x2c, 0xf0, 0x50, 0xbb, 0xd0, 0xcc,
+	0x99, 0x7c, 0x04, 0x57, 0x83, 0x58, 0x84, 0xb1, 0x18, 0x85, 0x11, 0x9e, 0xb9, 0xaf, 0x8d, 0x92,
+	0xe4, 0xb8, 0xa9, 0x94, 0x27, 0x52, 0x47, 0x7e, 0x82, 0xff, 0xad, 0xfc, 0x27, 0x73, 0x3d, 0x35,
+	0xa3, 0x2c, 0x93, 0xdd, 0xbd, 0xd4, 0x88, 0x69, 0x5b, 0xac, 0x53, 0x9b, 0xbf, 0x00, 0x59, 0x6e,
+	0x02, 0x0f, 0x03, 0x9f, 0x23, 0xb9, 0x0b, 0x57, 0x23, 0xe4, 0x41, 0x1c, 0x4d, 0x50, 0xa6, 0x93,
+	0xcd, 0xd8, 0x7c, 0x76, 0x85, 0x6e, 0xa6, 0xea, 0x04, 0x80, 0x3c, 0x84, 0x5a, 0x2a, 0xeb, 0xca,
+	0x8d, 0x55, 0x32, 0x54, 0xdb, 0x9f, 0x5d, 0xa1, 0x99, 0xef, 0x7e, 0x05, 0x4a, 0x11, 0x72, 0x93,
+	0xc2, 0xd6, 0x53, 0x14, 0xcb, 0xdd, 0xbf, 0x05, 0x75, 0x59, 0xac, 0xb8, 0x08, 0x51, 0x4f, 0xb1,
+	0x96, 0x28, 0x86, 0x17, 0xa1, 0x6c, 0x57, 0x9e, 0x54, 0x92, 0x72, 0x33, 0x4f, 0xc9, 0xfc, 0x15,
+	0xae, 0x65, 0x98, 0xba, 0x98, 0x2f, 0x96, 0x58, 0x16, 0xde, 0xce, 0x72, 0xc1, 0x91, 0x3c, 0x80,
+	0xba, 0x17, 0x38, 0x23, 0xcf, 0xf5, 0x67, 0xdc, 0x28, 0xca, 0x9f, 0xe9, 0xc6, 0x9a, 0xb1, 0xf6,
+	0x03, 0x87, 0xd6, 0xbc, 0xc0, 0xe9, 0x27, 0x7e, 0xe6, 0x5f, 0x05, 0xa8, 0xa5, 0x58, 0xa4, 0x0b,
+	0x15, 0x2e, 0x92, 0xa5, 0x48, 0x92, 0x6e, 0xed, 0xb6, 0x57, 0x93, 0x3e, 0x4f, 0x8c, 0xfb, 0x45,
+	0xa3, 0x40, 0x95, 0x1f, 0x79, 0x00, 0x1b, 0x6a, 0xf4, 0x5c, 0x77, 0xf3, 0x2d, 0xcb, 0x97, 0x7a,
+	0x12, 0x03, 0x36, 0xe6, 0xc8, 0x39, 0x73, 0x50, 0xaf, 0x4f, 0x2a, 0xe6, 0x2b, 0x28, 0x5f, 0xae,
+	0x02, 0xb2, 0x07, 0x95, 0xf0, 0x25, 0xe3, 0x28, 0x4f, 0x9c, 0xad, 0x5d, 0xf3, 0x6d, 0x47, 0xb1,
+	0x75, 0x92, 0x78, 0x52, 0x15, 0x60, 0x9e, 0x42, 0xeb, 0x10, 0x3d, 0xcc, 0xff, 0x4e, 0xff, 0x7d,
+	0xa0, 0xdb, 0x40, 0x96, 0x61, 0xd5, 0x4c, 0xcd, 0x63, 0xa8, 0xf4, 0x92, 0xcb, 0x94, 0x10, 0x28,
+	0x27, 0x27, 0xbc, 0xc6, 0x96, 0xdf, 0xe4, 0x73, 0xd8, 0xe6, 0x71, 0x18, 0x06, 0x91, 0xc0, 0xe9,
+	0x28, 0x4b, 0xaf, 0xa6, 0x58, 0xa7, 0x24, 0xb3, 0x0d, 0x35, 0x11, 0x6e, 0xde, 0x95, 0x5b, 0x23,
+	0x11, 0x53, 0xe6, 0x6b, 0x80, 0xcd, 0x27, 0xd0, 0x5c, 0xb8, 0xe9, 0xed, 0xfa, 0x0c, 0x2a, 0xf2,
+	0x5a, 0xd7, 0xab, 0xf5, 0x8f, 0x29, 0x2b, 0x6f, 0xe5, 0x63, 0x5e, 0x87, 0x56, 0xdf, 0xe5, 0x0a,
+	0x81, 0xeb, 0x4c, 0xe6, 0x01, 0x90, 0x65, 0xa5, 0xc6, 0xbd, 0x07, 0x55, 0x19, 0x93, 0x1c, 0x44,
+	0xa5, 0x37, 0x03, 0x6b, 0x27, 0xf3, 0x8f, 0x22, 0xb4, 0xf5, 0xe2, 0x1f, 0xab, 0x2b, 0xfc, 0xbd,
+	0x8d, 0x20, 0x59, 0xb1, 0x57, 0x31, 0x46, 0x2e, 0xaa, 0x9b, 0xb3, 0x4e, 0x53, 0x91, 0x3c, 0x02,
+	0xe0, 0x82, 0x45, 0x62, 0x94, 0xdc, 0xfb, 0xfa, 0x3c, 0xea, 0x58, 0xea, 0x51, 0x60, 0xa5, 0x8f,
+	0x02, 0x6b, 0x98, 0x3e, 0x0a, 0x68, 0x5d, 0x7a, 0x27, 0x32, 0xf9, 0x12, 0x6a, 0xe8, 0x4f, 0x55,
+	0x60, 0xe5, 0x5f, 0x03, 0x37, 0xd0, 0x9f, 0xca, 0xb0, 0x7b, 0x50, 0xe6, 0x02, 0x43, 0xa3, 0xaa,
+	0x7f, 0x90, 0xd5, 0x90, 0x43, 0xfd, 0x40, 0xa1, 0xd2, 0xcd, 0x7c, 0x01, 0x37, 0x56, 0xbb, 0xa2,
+	0xfb, 0xfb, 0x18, 0x36, 0x22, 0xe4, 0xb1, 0x97, 0x35, 0xf8, 0xe3, 0x95, 0x55, 0x5f, 0x3e, 0x2b,
+	0x23, 0x77, 0x42, 0xa5, 0x33, 0x4d, 0x83, 0xcc, 0xdf, 0x0a, 0x40, 0x34, 0x74, 0x3f, 0x70, 0xde,
+	0x63, 0xb7, 0xb7, 0xa1, 0xe2, 0xb9, 0xbe, 0xec, 0x75, 0x61, 0xa7, 0x4c, 0x95, 0x90, 0x68, 0x45,
+	0x30, 0x43, 0x5f, 0x36, 0xb9, 0x4e, 0x95, 0x60, 0xda, 0x70, 0x3d, 0xc7, 0x41, 0xd7, 0x66, 0xe4,
+	0x6b, 0xab, 0x67, 0xac, 0x17, 0x30, 0xc5, 0x25, 0x98, 0x4f, 0x7f, 0x86, 0x8a, 0x3c, 0x8c, 0x48,
+	0x1b, 0x5a, 0xd4, 0x1e, 0xd2, 0x1f, 0x7a, 0xfb, 0x7d, 0x7b, 0xf4, 0x5d, 0xef, 0xa8, 0x7f, 0x4a,
+	0xed, 0xe6, 0x95, 0x44, 0x7d, 0x62, 0xd3, 0xe3, 0xde, 0xc0, 0x1e, 0x0c, 0x33, 0x75, 0x81, 0x34,
+	0x60, 0xe3, 0xc4, 0x1e, 0x1c, 0x1e, 0x0d, 0x9e, 0x36, 0x8b, 0x89, 0x40, 0x4f, 0x07, 0x83, 0x44,
+	0x28, 0x91, 0xab, 0x50, 0x7f, 0x7e, 0x7a, 0x70, 0x60, 0xdb, 0x87, 0xf6, 0x61, 0xb3, 0xbc, 0xff,
+	0xed, 0x8f, 0xdf, 0x38, 0xae, 0x78, 0x19, 0x8f, 0xad, 0x49, 0x30, 0xef, 0xca, 0x36, 0x07, 0x91,
+	0xa3, 0x3e, 0xba, 0xd9, 0xfb, 0xd3, 0x41, 0xbf, 0x1b, 0x8e, 0xef, 0x39, 0x41, 0x37, 0xff, 0x6c,
+	0x1e, 0x57, 0xe5, 0x74, 0x1f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xd1, 0x03, 0x06, 0x4f,
+	0x0b, 0x00, 0x00,
 }
diff --git a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
index 33eb5cf445..8567fe5f09 100644
--- a/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
+++ b/flyteidl/gen/pb-go/flyteidl/service/agent.swagger.json
@@ -322,7 +322,7 @@
       "properties": {
         "state": {
           "$ref": "#/definitions/flyteidladminState",
-          "description": "The state of the execution is used to control its visibility in the UI/CLI."
+          "description": "DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI."
         },
         "outputs": {
           "$ref": "#/definitions/coreLiteralMap",
@@ -338,6 +338,10 @@
             "$ref": "#/definitions/coreTaskLog"
           },
           "description": "log information for the task execution."
+        },
+        "phase": {
+          "$ref": "#/definitions/coreTaskExecutionPhase",
+          "description": "The phase of the execution is used to determine the phase of the plugin's execution."
         }
       }
     },
@@ -1203,6 +1207,21 @@
       },
       "description": "Encapsulation of fields that identify a Flyte task execution entity."
     },
+    "coreTaskExecutionPhase": {
+      "type": "string",
+      "enum": [
+        "UNDEFINED",
+        "QUEUED",
+        "RUNNING",
+        "SUCCEEDED",
+        "ABORTED",
+        "FAILED",
+        "INITIALIZING",
+        "WAITING_FOR_RESOURCES"
+      ],
+      "default": "UNDEFINED",
+      "title": "- INITIALIZING: To indicate cases where task is initializing, like: ErrImagePull, ContainerCreating, PodInitializing\n - WAITING_FOR_RESOURCES: To address cases, where underlying resource is not available: Backoff error, Resource quota exceeded"
+    },
     "coreTaskLog": {
       "type": "object",
       "properties": {
diff --git a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
index 4bdcefaea6..e5422d0656 100644
--- a/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
+++ b/flyteidl/gen/pb-java/flyteidl/admin/AgentOuterClass.java
@@ -6178,20 +6178,20 @@ public interface ResourceOrBuilder extends
 
     /**
      * <pre>
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      * </pre>
      *
-     * <code>.flyteidl.admin.State state = 1;</code>
+     * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
      */
-    int getStateValue();
+    @java.lang.Deprecated int getStateValue();
     /**
      * <pre>
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      * </pre>
      *
-     * <code>.flyteidl.admin.State state = 1;</code>
+     * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
      */
-    flyteidl.admin.AgentOuterClass.State getState();
+    @java.lang.Deprecated flyteidl.admin.AgentOuterClass.State getState();
 
     /**
      * <pre>
@@ -6285,6 +6285,23 @@ public interface ResourceOrBuilder extends
      */
     flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     * </pre>
+     *
+     * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+     */
+    int getPhaseValue();
+    /**
+     * <pre>
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     * </pre>
+     *
+     * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+     */
+    flyteidl.core.Execution.TaskExecution.Phase getPhase();
   }
   /**
    * Protobuf type {@code flyteidl.admin.Resource}
@@ -6302,6 +6319,7 @@ private Resource() {
       state_ = 0;
       message_ = "";
       logLinks_ = java.util.Collections.emptyList();
+      phase_ = 0;
     }
 
     @java.lang.Override
@@ -6362,6 +6380,12 @@ private Resource(
                   input.readMessage(flyteidl.core.Execution.TaskLog.parser(), extensionRegistry));
               break;
             }
+            case 40: {
+              int rawValue = input.readEnum();
+
+              phase_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -6402,22 +6426,22 @@ private Resource(
     private int state_;
     /**
      * <pre>
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      * </pre>
      *
-     * <code>.flyteidl.admin.State state = 1;</code>
+     * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
      */
-    public int getStateValue() {
+    @java.lang.Deprecated public int getStateValue() {
       return state_;
     }
     /**
      * <pre>
-     * The state of the execution is used to control its visibility in the UI/CLI.
+     * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
      * </pre>
      *
-     * <code>.flyteidl.admin.State state = 1;</code>
+     * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
      */
-    public flyteidl.admin.AgentOuterClass.State getState() {
+    @java.lang.Deprecated public flyteidl.admin.AgentOuterClass.State getState() {
       @SuppressWarnings("deprecation")
       flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_);
       return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result;
@@ -6559,6 +6583,31 @@ public flyteidl.core.Execution.TaskLogOrBuilder getLogLinksOrBuilder(
       return logLinks_.get(index);
     }
 
+    public static final int PHASE_FIELD_NUMBER = 5;
+    private int phase_;
+    /**
+     * <pre>
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     * </pre>
+     *
+     * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+     */
+    public int getPhaseValue() {
+      return phase_;
+    }
+    /**
+     * <pre>
+     * The phase of the execution is used to determine the phase of the plugin's execution.
+     * </pre>
+     *
+     * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+     */
+    public flyteidl.core.Execution.TaskExecution.Phase getPhase() {
+      @SuppressWarnings("deprecation")
+      flyteidl.core.Execution.TaskExecution.Phase result = flyteidl.core.Execution.TaskExecution.Phase.valueOf(phase_);
+      return result == null ? flyteidl.core.Execution.TaskExecution.Phase.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -6585,6 +6634,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < logLinks_.size(); i++) {
         output.writeMessage(4, logLinks_.get(i));
       }
+      if (phase_ != flyteidl.core.Execution.TaskExecution.Phase.UNDEFINED.getNumber()) {
+        output.writeEnum(5, phase_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -6609,6 +6661,10 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, logLinks_.get(i));
       }
+      if (phase_ != flyteidl.core.Execution.TaskExecution.Phase.UNDEFINED.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(5, phase_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -6634,6 +6690,7 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getMessage())) return false;
       if (!getLogLinksList()
           .equals(other.getLogLinksList())) return false;
+      if (phase_ != other.phase_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -6657,6 +6714,8 @@ public int hashCode() {
         hash = (37 * hash) + LOG_LINKS_FIELD_NUMBER;
         hash = (53 * hash) + getLogLinksList().hashCode();
       }
+      hash = (37 * hash) + PHASE_FIELD_NUMBER;
+      hash = (53 * hash) + phase_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -6807,6 +6866,8 @@ public Builder clear() {
         } else {
           logLinksBuilder_.clear();
         }
+        phase_ = 0;
+
         return this;
       }
 
@@ -6851,6 +6912,7 @@ public flyteidl.admin.AgentOuterClass.Resource buildPartial() {
         } else {
           result.logLinks_ = logLinksBuilder_.build();
         }
+        result.phase_ = phase_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -6936,6 +6998,9 @@ public Builder mergeFrom(flyteidl.admin.AgentOuterClass.Resource other) {
             }
           }
         }
+        if (other.phase_ != 0) {
+          setPhaseValue(other.getPhaseValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -6969,46 +7034,46 @@ public Builder mergeFrom(
       private int state_ = 0;
       /**
        * <pre>
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        * </pre>
        *
-       * <code>.flyteidl.admin.State state = 1;</code>
+       * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
        */
-      public int getStateValue() {
+      @java.lang.Deprecated public int getStateValue() {
         return state_;
       }
       /**
        * <pre>
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        * </pre>
        *
-       * <code>.flyteidl.admin.State state = 1;</code>
+       * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
        */
-      public Builder setStateValue(int value) {
+      @java.lang.Deprecated public Builder setStateValue(int value) {
         state_ = value;
         onChanged();
         return this;
       }
       /**
        * <pre>
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        * </pre>
        *
-       * <code>.flyteidl.admin.State state = 1;</code>
+       * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
        */
-      public flyteidl.admin.AgentOuterClass.State getState() {
+      @java.lang.Deprecated public flyteidl.admin.AgentOuterClass.State getState() {
         @SuppressWarnings("deprecation")
         flyteidl.admin.AgentOuterClass.State result = flyteidl.admin.AgentOuterClass.State.valueOf(state_);
         return result == null ? flyteidl.admin.AgentOuterClass.State.UNRECOGNIZED : result;
       }
       /**
        * <pre>
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        * </pre>
        *
-       * <code>.flyteidl.admin.State state = 1;</code>
+       * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
        */
-      public Builder setState(flyteidl.admin.AgentOuterClass.State value) {
+      @java.lang.Deprecated public Builder setState(flyteidl.admin.AgentOuterClass.State value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7019,12 +7084,12 @@ public Builder setState(flyteidl.admin.AgentOuterClass.State value) {
       }
       /**
        * <pre>
-       * The state of the execution is used to control its visibility in the UI/CLI.
+       * DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
        * </pre>
        *
-       * <code>.flyteidl.admin.State state = 1;</code>
+       * <code>.flyteidl.admin.State state = 1 [deprecated = true];</code>
        */
-      public Builder clearState() {
+      @java.lang.Deprecated public Builder clearState() {
         
         state_ = 0;
         onChanged();
@@ -7602,6 +7667,71 @@ public flyteidl.core.Execution.TaskLog.Builder addLogLinksBuilder(
         }
         return logLinksBuilder_;
       }
+
+      private int phase_ = 0;
+      /**
+       * <pre>
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       * </pre>
+       *
+       * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+       */
+      public int getPhaseValue() {
+        return phase_;
+      }
+      /**
+       * <pre>
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       * </pre>
+       *
+       * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+       */
+      public Builder setPhaseValue(int value) {
+        phase_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       * </pre>
+       *
+       * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+       */
+      public flyteidl.core.Execution.TaskExecution.Phase getPhase() {
+        @SuppressWarnings("deprecation")
+        flyteidl.core.Execution.TaskExecution.Phase result = flyteidl.core.Execution.TaskExecution.Phase.valueOf(phase_);
+        return result == null ? flyteidl.core.Execution.TaskExecution.Phase.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       * </pre>
+       *
+       * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+       */
+      public Builder setPhase(flyteidl.core.Execution.TaskExecution.Phase value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        phase_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The phase of the execution is used to determine the phase of the plugin's execution.
+       * </pre>
+       *
+       * <code>.flyteidl.core.TaskExecution.Phase phase = 5;</code>
+       */
+      public Builder clearPhase() {
+        
+        phase_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -16592,34 +16722,36 @@ public flyteidl.admin.AgentOuterClass.GetTaskLogsResponse getDefaultInstanceForT
       "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" +
       "\030\002 \001(\014\"h\n\017GetTaskResponse\022*\n\010resource\030\001 " +
       "\001(\0132\030.flyteidl.admin.Resource\022)\n\tlog_lin" +
-      "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\230\001\n\010Res" +
-      "ource\022$\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" +
-      "ate\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core.Lit" +
-      "eralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_links\030\004 " +
-      "\003(\0132\026.flyteidl.core.TaskLog\"=\n\021DeleteTas" +
-      "kRequest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_" +
-      "meta\030\002 \001(\014\"\024\n\022DeleteTaskResponse\"3\n\005Agen" +
-      "t\022\014\n\004name\030\001 \001(\t\022\034\n\024supported_task_types\030" +
-      "\002 \003(\t\"\037\n\017GetAgentRequest\022\014\n\004name\030\001 \001(\t\"8" +
-      "\n\020GetAgentResponse\022$\n\005agent\030\001 \001(\0132\025.flyt" +
-      "eidl.admin.Agent\"\023\n\021ListAgentsRequest\";\n" +
-      "\022ListAgentsResponse\022%\n\006agents\030\001 \003(\0132\025.fl" +
-      "yteidl.admin.Agent\"\331\001\n\025GetTaskMetricsReq" +
-      "uest\022\021\n\ttask_type\030\001 \001(\t\022\025\n\rresource_meta" +
-      "\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022.\n\nstart_time\030\004 " +
-      "\001(\0132\032.google.protobuf.Timestamp\022,\n\010end_t" +
-      "ime\030\005 \001(\0132\032.google.protobuf.Timestamp\022\'\n" +
-      "\004step\030\006 \001(\0132\031.google.protobuf.Duration\"O" +
-      "\n\026GetTaskMetricsResponse\0225\n\007results\030\001 \003(" +
-      "\0132$.flyteidl.core.ExecutionMetricResult\"" +
-      "\\\n\022GetTaskLogsRequest\022\021\n\ttask_type\030\001 \001(\t" +
-      "\022\025\n\rresource_meta\030\002 \001(\014\022\r\n\005lines\030\003 \001(\004\022\r" +
-      "\n\005token\030\004 \001(\t\"5\n\023GetTaskLogsResponse\022\017\n\007" +
-      "results\030\001 \003(\t\022\r\n\005token\030\002 \001(\t*^\n\005State\022\025\n" +
-      "\021RETRYABLE_FAILURE\020\000\022\025\n\021PERMANENT_FAILUR" +
-      "E\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEED" +
-      "ED\020\004B=Z;github.com/flyteorg/flyte/flytei" +
-      "dl/gen/pb-go/flyteidl/adminb\006proto3"
+      "ks\030\002 \003(\0132\026.flyteidl.core.TaskLog\"\317\001\n\010Res" +
+      "ource\022(\n\005state\030\001 \001(\0162\025.flyteidl.admin.St" +
+      "ateB\002\030\001\022*\n\007outputs\030\002 \001(\0132\031.flyteidl.core" +
+      ".LiteralMap\022\017\n\007message\030\003 \001(\t\022)\n\tlog_link" +
+      "s\030\004 \003(\0132\026.flyteidl.core.TaskLog\0221\n\005phase" +
+      "\030\005 \001(\0162\".flyteidl.core.TaskExecution.Pha" +
+      "se\"=\n\021DeleteTaskRequest\022\021\n\ttask_type\030\001 \001" +
+      "(\t\022\025\n\rresource_meta\030\002 \001(\014\"\024\n\022DeleteTaskR" +
+      "esponse\"3\n\005Agent\022\014\n\004name\030\001 \001(\t\022\034\n\024suppor" +
+      "ted_task_types\030\002 \003(\t\"\037\n\017GetAgentRequest\022" +
+      "\014\n\004name\030\001 \001(\t\"8\n\020GetAgentResponse\022$\n\005age" +
+      "nt\030\001 \001(\0132\025.flyteidl.admin.Agent\"\023\n\021ListA" +
+      "gentsRequest\";\n\022ListAgentsResponse\022%\n\006ag" +
+      "ents\030\001 \003(\0132\025.flyteidl.admin.Agent\"\331\001\n\025Ge" +
+      "tTaskMetricsRequest\022\021\n\ttask_type\030\001 \001(\t\022\025" +
+      "\n\rresource_meta\030\002 \001(\014\022\017\n\007queries\030\003 \003(\t\022." +
+      "\n\nstart_time\030\004 \001(\0132\032.google.protobuf.Tim" +
+      "estamp\022,\n\010end_time\030\005 \001(\0132\032.google.protob" +
+      "uf.Timestamp\022\'\n\004step\030\006 \001(\0132\031.google.prot" +
+      "obuf.Duration\"O\n\026GetTaskMetricsResponse\022" +
+      "5\n\007results\030\001 \003(\0132$.flyteidl.core.Executi" +
+      "onMetricResult\"\\\n\022GetTaskLogsRequest\022\021\n\t" +
+      "task_type\030\001 \001(\t\022\025\n\rresource_meta\030\002 \001(\014\022\r" +
+      "\n\005lines\030\003 \001(\004\022\r\n\005token\030\004 \001(\t\"5\n\023GetTaskL" +
+      "ogsResponse\022\017\n\007results\030\001 \003(\t\022\r\n\005token\030\002 " +
+      "\001(\t*^\n\005State\022\025\n\021RETRYABLE_FAILURE\020\000\022\025\n\021P" +
+      "ERMANENT_FAILURE\020\001\022\013\n\007PENDING\020\002\022\013\n\007RUNNI" +
+      "NG\020\003\022\r\n\tSUCCEEDED\020\004B=Z;github.com/flyteo" +
+      "rg/flyte/flyteidl/gen/pb-go/flyteidl/adm" +
+      "inb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -16693,7 +16825,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_flyteidl_admin_Resource_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_flyteidl_admin_Resource_descriptor,
-        new java.lang.String[] { "State", "Outputs", "Message", "LogLinks", });
+        new java.lang.String[] { "State", "Outputs", "Message", "LogLinks", "Phase", });
     internal_static_flyteidl_admin_DeleteTaskRequest_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_flyteidl_admin_DeleteTaskRequest_fieldAccessorTable = new
diff --git a/flyteidl/gen/pb-js/flyteidl.d.ts b/flyteidl/gen/pb-js/flyteidl.d.ts
index 8d9f8ed346..383aedc0c3 100644
--- a/flyteidl/gen/pb-js/flyteidl.d.ts
+++ b/flyteidl/gen/pb-js/flyteidl.d.ts
@@ -9168,6 +9168,9 @@ export namespace flyteidl {
 
             /** Resource logLinks */
             logLinks?: (flyteidl.core.ITaskLog[]|null);
+
+            /** Resource phase */
+            phase?: (flyteidl.core.TaskExecution.Phase|null);
         }
 
         /** Represents a Resource. */
@@ -9191,6 +9194,9 @@ export namespace flyteidl {
             /** Resource logLinks. */
             public logLinks: flyteidl.core.ITaskLog[];
 
+            /** Resource phase. */
+            public phase: flyteidl.core.TaskExecution.Phase;
+
             /**
              * Creates a new Resource instance using the specified properties.
              * @param [properties] Properties to set
diff --git a/flyteidl/gen/pb-js/flyteidl.js b/flyteidl/gen/pb-js/flyteidl.js
index 3de32e71c4..748a626fc7 100644
--- a/flyteidl/gen/pb-js/flyteidl.js
+++ b/flyteidl/gen/pb-js/flyteidl.js
@@ -22456,6 +22456,7 @@
                  * @property {flyteidl.core.ILiteralMap|null} [outputs] Resource outputs
                  * @property {string|null} [message] Resource message
                  * @property {Array.<flyteidl.core.ITaskLog>|null} [logLinks] Resource logLinks
+                 * @property {flyteidl.core.TaskExecution.Phase|null} [phase] Resource phase
                  */
     
                 /**
@@ -22506,6 +22507,14 @@
                  */
                 Resource.prototype.logLinks = $util.emptyArray;
     
+                /**
+                 * Resource phase.
+                 * @member {flyteidl.core.TaskExecution.Phase} phase
+                 * @memberof flyteidl.admin.Resource
+                 * @instance
+                 */
+                Resource.prototype.phase = 0;
+    
                 /**
                  * Creates a new Resource instance using the specified properties.
                  * @function create
@@ -22539,6 +22548,8 @@
                     if (message.logLinks != null && message.logLinks.length)
                         for (var i = 0; i < message.logLinks.length; ++i)
                             $root.flyteidl.core.TaskLog.encode(message.logLinks[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
+                    if (message.phase != null && message.hasOwnProperty("phase"))
+                        writer.uint32(/* id 5, wireType 0 =*/40).int32(message.phase);
                     return writer;
                 };
     
@@ -22574,6 +22585,9 @@
                                 message.logLinks = [];
                             message.logLinks.push($root.flyteidl.core.TaskLog.decode(reader, reader.uint32()));
                             break;
+                        case 5:
+                            message.phase = reader.int32();
+                            break;
                         default:
                             reader.skipType(tag & 7);
                             break;
@@ -22621,6 +22635,20 @@
                                 return "logLinks." + error;
                         }
                     }
+                    if (message.phase != null && message.hasOwnProperty("phase"))
+                        switch (message.phase) {
+                        default:
+                            return "phase: enum value expected";
+                        case 0:
+                        case 1:
+                        case 2:
+                        case 3:
+                        case 4:
+                        case 5:
+                        case 6:
+                        case 7:
+                            break;
+                        }
                     return null;
                 };
     
diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
index b2d282011b..f23ad50819 100644
--- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
+++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.py
@@ -20,7 +20,7 @@
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xbb\x01\n\x08Resource\x12+\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateR\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66lyteidl/admin/agent.proto\x12\x0e\x66lyteidl.admin\x1a\x1c\x66lyteidl/core/literals.proto\x1a\x19\x66lyteidl/core/tasks.proto\x1a\x1e\x66lyteidl/core/identifier.proto\x1a\x1d\x66lyteidl/core/execution.proto\x1a\x1b\x66lyteidl/core/metrics.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x98\x05\n\x15TaskExecutionMetadata\x12R\n\x11task_execution_id\x18\x01 \x01(\x0b\x32&.flyteidl.core.TaskExecutionIdentifierR\x0ftaskExecutionId\x12\x1c\n\tnamespace\x18\x02 \x01(\tR\tnamespace\x12I\n\x06labels\x18\x03 \x03(\x0b\x32\x31.flyteidl.admin.TaskExecutionMetadata.LabelsEntryR\x06labels\x12X\n\x0b\x61nnotations\x18\x04 \x03(\x0b\x32\x36.flyteidl.admin.TaskExecutionMetadata.AnnotationsEntryR\x0b\x61nnotations\x12.\n\x13k8s_service_account\x18\x05 \x01(\tR\x11k8sServiceAccount\x12t\n\x15\x65nvironment_variables\x18\x06 \x03(\x0b\x32?.flyteidl.admin.TaskExecutionMetadata.EnvironmentVariablesEntryR\x14\x65nvironmentVariables\x1a\x39\n\x0bLabelsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a>\n\x10\x41nnotationsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1aG\n\x19\x45nvironmentVariablesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\"\x83\x02\n\x11\x43reateTaskRequest\x12\x31\n\x06inputs\x18\x01 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x06inputs\x12\x37\n\x08template\x18\x02 \x01(\x0b\x32\x1b.flyteidl.core.TaskTemplateR\x08template\x12#\n\routput_prefix\x18\x03 \x01(\tR\x0coutputPrefix\x12]\n\x17task_execution_metadata\x18\x04 \x01(\x0b\x32%.flyteidl.admin.TaskExecutionMetadataR\x15taskExecutionMetadata\"z\n\x12\x43reateTaskResponse\x12%\n\rresource_meta\x18\x01 \x01(\x0cH\x00R\x0cresourceMeta\x12\x36\n\x08resource\x18\x02 \x01(\x0b\x32\x18.flyteidl.admin.ResourceH\x00R\x08resourceB\x05\n\x03res\"R\n\x0eGetTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"|\n\x0fGetTaskResponse\x12\x34\n\x08resource\x18\x01 \x01(\x0b\x32\x18.flyteidl.admin.ResourceR\x08resource\x12\x33\n\tlog_links\x18\x02 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\"\xf9\x01\n\x08Resource\x12/\n\x05state\x18\x01 \x01(\x0e\x32\x15.flyteidl.admin.StateB\x02\x18\x01R\x05state\x12\x33\n\x07outputs\x18\x02 \x01(\x0b\x32\x19.flyteidl.core.LiteralMapR\x07outputs\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12\x33\n\tlog_links\x18\x04 \x03(\x0b\x32\x16.flyteidl.core.TaskLogR\x08logLinks\x12\x38\n\x05phase\x18\x05 \x01(\x0e\x32\".flyteidl.core.TaskExecution.PhaseR\x05phase\"U\n\x11\x44\x65leteTaskRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\"\x14\n\x12\x44\x65leteTaskResponse\"M\n\x05\x41gent\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x30\n\x14supported_task_types\x18\x02 \x03(\tR\x12supportedTaskTypes\"%\n\x0fGetAgentRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"?\n\x10GetAgentResponse\x12+\n\x05\x61gent\x18\x01 \x01(\x0b\x32\x15.flyteidl.admin.AgentR\x05\x61gent\"\x13\n\x11ListAgentsRequest\"C\n\x12ListAgentsResponse\x12-\n\x06\x61gents\x18\x01 \x03(\x0b\x32\x15.flyteidl.admin.AgentR\x06\x61gents\"\x94\x02\n\x15GetTaskMetricsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x18\n\x07queries\x18\x03 \x03(\tR\x07queries\x12\x39\n\nstart_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12-\n\x04step\x18\x06 \x01(\x0b\x32\x19.google.protobuf.DurationR\x04step\"X\n\x16GetTaskMetricsResponse\x12>\n\x07results\x18\x01 \x03(\x0b\x32$.flyteidl.core.ExecutionMetricResultR\x07results\"\x82\x01\n\x12GetTaskLogsRequest\x12\x1b\n\ttask_type\x18\x01 \x01(\tR\x08taskType\x12#\n\rresource_meta\x18\x02 \x01(\x0cR\x0cresourceMeta\x12\x14\n\x05lines\x18\x03 \x01(\x04R\x05lines\x12\x14\n\x05token\x18\x04 \x01(\tR\x05token\"E\n\x13GetTaskLogsResponse\x12\x18\n\x07results\x18\x01 \x03(\tR\x07results\x12\x14\n\x05token\x18\x02 \x01(\tR\x05token*^\n\x05State\x12\x15\n\x11RETRYABLE_FAILURE\x10\x00\x12\x15\n\x11PERMANENT_FAILURE\x10\x01\x12\x0b\n\x07PENDING\x10\x02\x12\x0b\n\x07RUNNING\x10\x03\x12\r\n\tSUCCEEDED\x10\x04\x42\xb6\x01\n\x12\x63om.flyteidl.adminB\nAgentProtoP\x01Z;github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin\xa2\x02\x03\x46\x41X\xaa\x02\x0e\x46lyteidl.Admin\xca\x02\x0e\x46lyteidl\\Admin\xe2\x02\x1a\x46lyteidl\\Admin\\GPBMetadata\xea\x02\x0f\x46lyteidl::Adminb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -35,8 +35,10 @@
   _TASKEXECUTIONMETADATA_ANNOTATIONSENTRY._serialized_options = b'8\001'
   _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._options = None
   _TASKEXECUTIONMETADATA_ENVIRONMENTVARIABLESENTRY._serialized_options = b'8\001'
-  _globals['_STATE']._serialized_start=2668
-  _globals['_STATE']._serialized_end=2762
+  _RESOURCE.fields_by_name['state']._options = None
+  _RESOURCE.fields_by_name['state']._serialized_options = b'\030\001'
+  _globals['_STATE']._serialized_start=2730
+  _globals['_STATE']._serialized_end=2824
   _globals['_TASKEXECUTIONMETADATA']._serialized_start=261
   _globals['_TASKEXECUTIONMETADATA']._serialized_end=925
   _globals['_TASKEXECUTIONMETADATA_LABELSENTRY']._serialized_start=731
@@ -54,27 +56,27 @@
   _globals['_GETTASKRESPONSE']._serialized_start=1397
   _globals['_GETTASKRESPONSE']._serialized_end=1521
   _globals['_RESOURCE']._serialized_start=1524
-  _globals['_RESOURCE']._serialized_end=1711
-  _globals['_DELETETASKREQUEST']._serialized_start=1713
-  _globals['_DELETETASKREQUEST']._serialized_end=1798
-  _globals['_DELETETASKRESPONSE']._serialized_start=1800
-  _globals['_DELETETASKRESPONSE']._serialized_end=1820
-  _globals['_AGENT']._serialized_start=1822
-  _globals['_AGENT']._serialized_end=1899
-  _globals['_GETAGENTREQUEST']._serialized_start=1901
-  _globals['_GETAGENTREQUEST']._serialized_end=1938
-  _globals['_GETAGENTRESPONSE']._serialized_start=1940
-  _globals['_GETAGENTRESPONSE']._serialized_end=2003
-  _globals['_LISTAGENTSREQUEST']._serialized_start=2005
-  _globals['_LISTAGENTSREQUEST']._serialized_end=2024
-  _globals['_LISTAGENTSRESPONSE']._serialized_start=2026
-  _globals['_LISTAGENTSRESPONSE']._serialized_end=2093
-  _globals['_GETTASKMETRICSREQUEST']._serialized_start=2096
-  _globals['_GETTASKMETRICSREQUEST']._serialized_end=2372
-  _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2374
-  _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2462
-  _globals['_GETTASKLOGSREQUEST']._serialized_start=2465
-  _globals['_GETTASKLOGSREQUEST']._serialized_end=2595
-  _globals['_GETTASKLOGSRESPONSE']._serialized_start=2597
-  _globals['_GETTASKLOGSRESPONSE']._serialized_end=2666
+  _globals['_RESOURCE']._serialized_end=1773
+  _globals['_DELETETASKREQUEST']._serialized_start=1775
+  _globals['_DELETETASKREQUEST']._serialized_end=1860
+  _globals['_DELETETASKRESPONSE']._serialized_start=1862
+  _globals['_DELETETASKRESPONSE']._serialized_end=1882
+  _globals['_AGENT']._serialized_start=1884
+  _globals['_AGENT']._serialized_end=1961
+  _globals['_GETAGENTREQUEST']._serialized_start=1963
+  _globals['_GETAGENTREQUEST']._serialized_end=2000
+  _globals['_GETAGENTRESPONSE']._serialized_start=2002
+  _globals['_GETAGENTRESPONSE']._serialized_end=2065
+  _globals['_LISTAGENTSREQUEST']._serialized_start=2067
+  _globals['_LISTAGENTSREQUEST']._serialized_end=2086
+  _globals['_LISTAGENTSRESPONSE']._serialized_start=2088
+  _globals['_LISTAGENTSRESPONSE']._serialized_end=2155
+  _globals['_GETTASKMETRICSREQUEST']._serialized_start=2158
+  _globals['_GETTASKMETRICSREQUEST']._serialized_end=2434
+  _globals['_GETTASKMETRICSRESPONSE']._serialized_start=2436
+  _globals['_GETTASKMETRICSRESPONSE']._serialized_end=2524
+  _globals['_GETTASKLOGSREQUEST']._serialized_start=2527
+  _globals['_GETTASKLOGSREQUEST']._serialized_end=2657
+  _globals['_GETTASKLOGSRESPONSE']._serialized_start=2659
+  _globals['_GETTASKLOGSRESPONSE']._serialized_end=2728
 # @@protoc_insertion_point(module_scope)
diff --git a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
index 2d7254090f..7b7c6beb07 100644
--- a/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
+++ b/flyteidl/gen/pb_python/flyteidl/admin/agent_pb2.pyi
@@ -100,16 +100,18 @@ class GetTaskResponse(_message.Message):
     def __init__(self, resource: _Optional[_Union[Resource, _Mapping]] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ...
 
 class Resource(_message.Message):
-    __slots__ = ["state", "outputs", "message", "log_links"]
+    __slots__ = ["state", "outputs", "message", "log_links", "phase"]
     STATE_FIELD_NUMBER: _ClassVar[int]
     OUTPUTS_FIELD_NUMBER: _ClassVar[int]
     MESSAGE_FIELD_NUMBER: _ClassVar[int]
     LOG_LINKS_FIELD_NUMBER: _ClassVar[int]
+    PHASE_FIELD_NUMBER: _ClassVar[int]
     state: State
     outputs: _literals_pb2.LiteralMap
     message: str
     log_links: _containers.RepeatedCompositeFieldContainer[_execution_pb2.TaskLog]
-    def __init__(self, state: _Optional[_Union[State, str]] = ..., outputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., message: _Optional[str] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ...) -> None: ...
+    phase: _execution_pb2.TaskExecution.Phase
+    def __init__(self, state: _Optional[_Union[State, str]] = ..., outputs: _Optional[_Union[_literals_pb2.LiteralMap, _Mapping]] = ..., message: _Optional[str] = ..., log_links: _Optional[_Iterable[_Union[_execution_pb2.TaskLog, _Mapping]]] = ..., phase: _Optional[_Union[_execution_pb2.TaskExecution.Phase, str]] = ...) -> None: ...
 
 class DeleteTaskRequest(_message.Message):
     __slots__ = ["task_type", "resource_meta"]
diff --git a/flyteidl/gen/pb_rust/flyteidl.admin.rs b/flyteidl/gen/pb_rust/flyteidl.admin.rs
index 87932411a0..56d2426597 100644
--- a/flyteidl/gen/pb_rust/flyteidl.admin.rs
+++ b/flyteidl/gen/pb_rust/flyteidl.admin.rs
@@ -87,7 +87,8 @@ pub struct GetTaskResponse {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Resource {
-    /// The state of the execution is used to control its visibility in the UI/CLI.
+    /// DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
+    #[deprecated]
     #[prost(enumeration="State", tag="1")]
     pub state: i32,
     /// The outputs of the execution. It's typically used by sql task. Agent service will create a
@@ -101,6 +102,9 @@ pub struct Resource {
     /// log information for the task execution.
     #[prost(message, repeated, tag="4")]
     pub log_links: ::prost::alloc::vec::Vec<super::core::TaskLog>,
+    /// The phase of the execution is used to determine the phase of the plugin's execution.
+    #[prost(enumeration="super::core::task_execution::Phase", tag="5")]
+    pub phase: i32,
 }
 /// A message used to delete a task.
 #[allow(clippy::derive_partial_eq_without_eq)]
diff --git a/flyteidl/protos/flyteidl/admin/agent.proto b/flyteidl/protos/flyteidl/admin/agent.proto
index 601e8b61e6..5b7043e86f 100644
--- a/flyteidl/protos/flyteidl/admin/agent.proto
+++ b/flyteidl/protos/flyteidl/admin/agent.proto
@@ -78,8 +78,8 @@ message GetTaskResponse {
 }
 
 message Resource {
-  // The state of the execution is used to control its visibility in the UI/CLI.
-  State state = 1;
+  // DEPRECATED. The state of the execution is used to control its visibility in the UI/CLI.
+  State state = 1 [deprecated = true];
   // The outputs of the execution. It's typically used by sql task. Agent service will create a
   // Structured dataset pointing to the query result table.
   // +optional
@@ -88,6 +88,8 @@ message Resource {
   string message = 3;
   // log information for the task execution.
   repeated core.TaskLog log_links = 4;
+  // The phase of the execution is used to determine the phase of the plugin's execution.
+  core.TaskExecution.Phase phase = 5;
 }
 
 // A message used to delete a task.
diff --git a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go
index f14ae2c8a0..0ab46081e9 100644
--- a/flyteplugins/go/tasks/pluginmachinery/k8s/client.go
+++ b/flyteplugins/go/tasks/pluginmachinery/k8s/client.go
@@ -69,7 +69,7 @@ func NewKubeClient(config *rest.Config, options Options) (core.KubeClient, error
 	if options.ClientOptions == nil {
 		options.ClientOptions = &client.Options{
 			HTTPClient: httpClient,
-			Mapper: mapper,
+			Mapper:     mapper,
 		}
 	}
 
diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go
index b20bd62d7a..7a9f92caaa 100644
--- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go
+++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin.go
@@ -42,7 +42,8 @@ type Plugin struct {
 }
 
 type ResourceWrapper struct {
-	State    admin.State
+	Phase    flyteIdl.TaskExecution_Phase
+	State    admin.State // This is deprecated.
 	Outputs  *flyteIdl.LiteralMap
 	Message  string
 	LogLinks []*flyteIdl.TaskLog
@@ -121,6 +122,7 @@ func (p Plugin) Create(ctx context.Context, taskCtx webapi.TaskExecutionContextR
 		logger.Infof(ctx, "Agent is executing a synchronous task.")
 		return nil,
 			ResourceWrapper{
+				Phase:    res.GetResource().Phase,
 				State:    res.GetResource().State,
 				Outputs:  res.GetResource().Outputs,
 				Message:  res.GetResource().Message,
@@ -159,6 +161,7 @@ func (p Plugin) Get(ctx context.Context, taskCtx webapi.GetContext) (latest weba
 	}
 
 	return ResourceWrapper{
+		Phase:    res.Resource.Phase,
 		State:    res.Resource.State,
 		Outputs:  res.Resource.Outputs,
 		Message:  res.Resource.Message,
@@ -190,6 +193,34 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase
 	resource := taskCtx.Resource().(ResourceWrapper)
 	taskInfo := &core.TaskInfo{Logs: resource.LogLinks}
 
+	switch resource.Phase {
+	case flyteIdl.TaskExecution_QUEUED:
+		return core.PhaseInfoQueuedWithTaskInfo(core.DefaultPhaseVersion, resource.Message, taskInfo), nil
+	case flyteIdl.TaskExecution_WAITING_FOR_RESOURCES:
+		return core.PhaseInfoWaitingForResourcesInfo(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil
+	case flyteIdl.TaskExecution_INITIALIZING:
+		return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil
+	case flyteIdl.TaskExecution_RUNNING:
+		return core.PhaseInfoRunning(core.DefaultPhaseVersion, taskInfo), nil
+	case flyteIdl.TaskExecution_SUCCEEDED:
+		err = writeOutput(ctx, taskCtx, resource)
+		if err != nil {
+			logger.Errorf(ctx, "Failed to write output with err %s", err.Error())
+			return core.PhaseInfoUndefined, err
+		}
+		return core.PhaseInfoSuccess(taskInfo), nil
+	case flyteIdl.TaskExecution_ABORTED:
+		return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job with aborted phase", taskInfo), nil
+	case flyteIdl.TaskExecution_FAILED:
+		return core.PhaseInfoFailure(pluginErrors.TaskFailedWithError, "failed to run the job", taskInfo), nil
+	}
+
+	// The default phase is undefined.
+	if resource.Phase != flyteIdl.TaskExecution_UNDEFINED {
+		return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution phase [%v].", resource.Phase)
+	}
+
+	// If the phase is undefined, we will use state to determine the phase.
 	switch resource.State {
 	case admin.State_PENDING:
 		return core.PhaseInfoInitializing(time.Now(), core.DefaultPhaseVersion, resource.Message, taskInfo), nil
@@ -207,7 +238,7 @@ func (p Plugin) Status(ctx context.Context, taskCtx webapi.StatusContext) (phase
 		}
 		return core.PhaseInfoSuccess(taskInfo), nil
 	}
-	return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution phase [%v].", resource.State)
+	return core.PhaseInfoUndefined, pluginErrors.Errorf(core.SystemErrorCode, "unknown execution state [%v].", resource.State)
 }
 
 func writeOutput(ctx context.Context, taskCtx webapi.StatusContext, resource ResourceWrapper) error {
diff --git a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go
index b9fd7e1b35..d5b5fae5fe 100644
--- a/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go
+++ b/flyteplugins/go/tasks/plugins/webapi/agent/plugin_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/flyteorg/flyte/flyteidl/clients/go/coreutils"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/admin"
+	flyteIdl "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	flyteIdlCore "github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery"
@@ -219,6 +220,118 @@ func TestPlugin(t *testing.T) {
 		assert.Error(t, err)
 		assert.Equal(t, pluginsCore.PhaseUndefined, phase.Phase())
 	})
+
+	t.Run("test TaskExecution_UNDEFINED Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_UNDEFINED,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhaseRetryableFailure, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_QUEUED Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_QUEUED,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhaseQueued, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_WAITING_FOR_RESOURCES Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_WAITING_FOR_RESOURCES,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhaseWaitingForResources, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_INITIALIZING Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_INITIALIZING,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhaseInitializing, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_RUNNING Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_RUNNING,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhaseRunning, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_ABORTED Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_ABORTED,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhasePermanentFailure, phase.Phase())
+	})
+
+	t.Run("test TaskExecution_FAILED Status", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			Phase:    flyteIdl.TaskExecution_FAILED,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.NoError(t, err)
+		assert.Equal(t, pluginsCore.PhasePermanentFailure, phase.Phase())
+	})
+
+	t.Run("test UNDEFINED Phase", func(t *testing.T) {
+		taskContext := new(webapiPlugin.StatusContext)
+		taskContext.On("Resource").Return(ResourceWrapper{
+			State:    8,
+			Outputs:  nil,
+			Message:  "",
+			LogLinks: []*flyteIdlCore.TaskLog{{Uri: "http://localhost:3000/log", Name: "Log Link"}},
+		})
+
+		phase, err := plugin.Status(context.Background(), taskContext)
+		assert.Error(t, err)
+		assert.Equal(t, pluginsCore.PhaseUndefined, phase.Phase())
+	})
 }
 
 func TestInitializeAgentRegistry(t *testing.T) {