Set auto config hint for empty polls

service/matching/handler/engine.go

@@ -539,6 +539,10 @@ pollLoop:
 		if err != nil {
 			return nil, fmt.Errorf("couldn't load tasklist namanger: %w", err)
 		}
+		pollerWaitTimeMs := int64(0)
+		if deadline, ok := pollerCtx.Deadline(); ok {
+			pollerWaitTimeMs = int64(time.Until(deadline).Milliseconds())
+		}
 		task, err := tlMgr.GetTask(pollerCtx, nil)
 		if err != nil {
 			// TODO: Is empty poll the best reply for errPumpClosed?
@@ -564,6 +568,10 @@ pollLoop:
 				return &types.MatchingPollForDecisionTaskResponse{
 					PartitionConfig:   tlMgr.TaskListPartitionConfig(),
 					LoadBalancerHints: tlMgr.LoadBalancerHints(),
+					AutoConfigHint: &types.AutoConfigHint{
+						EnableAutoConfig:   tlMgr.EnableClientAutoConfig(),
+						PollerWaitTimeInMs: pollerWaitTimeMs,
+					},
 				}, nil
 			}
 			return nil, fmt.Errorf("couldn't get task: %w", err)

service/matching/tasklist/interfaces.go

@@ -64,6 +64,7 @@ type (
 		UpdateTaskListPartitionConfig(context.Context, *types.TaskListPartitionConfig) error
 		RefreshTaskListPartitionConfig(context.Context, *types.TaskListPartitionConfig) error
 		LoadBalancerHints() *types.LoadBalancerHints
+		EnableClientAutoConfig() bool
 	}
 
 	TaskMatcher interface {

service/matching/tasklist/task_list_manager.go

@@ -971,6 +971,11 @@ func (c *taskListManagerImpl) emitMisconfiguredPartitionMetrics() {
 	}
 }
 
+// EnableClientAutoConfig checks if there client auto config is enabled for tasklist
+func (c *taskListManagerImpl) EnableClientAutoConfig() bool {
+	return c.config.EnableClientAutoConfig()
+}
+
 func getTaskListTypeTag(taskListType int) metrics.Tag {
 	switch taskListType {
 	case persistence.TaskListTypeActivity: