use ArchetypeID for tasks

Author: feiyang3cat

service/history/queues/executable.go

@@ -87,7 +87,7 @@ var (
 	taskResourceExhuastedReschedulePolicy      = common.CreateTaskResourceExhaustedReschedulePolicy()
 	dependencyTaskNotCompletedReschedulePolicy = common.CreateDependencyTaskNotCompletedReschedulePolicy()
 
-	_ MaybeTerminalTaskError = (*terminalTaskError)(nil)
+	_ MaybeTerminalTaskError = terminalTaskError{}
 )
 
 const (

service/history/timer_queue_active_task_executor.go

@@ -928,8 +928,14 @@ func (t *timerQueueActiveTaskExecutor) executeTimeSkippingTimerTask(
 		return consts.ErrWorkflowExecutionNotFound
 	}
 
-	// todo@time-skipping: chasm execution path is not implemented yet.
-	if !mutableState.IsWorkflow() {
+	// Route by execution archetype. Treat an unspecified archetype — a record persisted before
+	// archetype IDs existed, or a not-yet-initialized chasm tree — as the built-in workflow archetype.
+	archetypeID := mutableState.ChasmTree().ArchetypeID()
+	if archetypeID == chasm.UnspecifiedArchetypeID {
+		archetypeID = chasm.WorkflowArchetypeID
+	}
+	if archetypeID != chasm.WorkflowArchetypeID {
+		// TODO@time-skipping: chasm execution path is not implemented yet.
 		release(nil)
 		return nil
 	}

service/history/workflow/timeskipping.go

@@ -83,7 +83,11 @@ func (ms *MutableStateImpl) applyFastForward(propagatedTargetTime *timestamppb.T
 		targetTime = ms.Now().Add(tsc.GetFastForward().AsDuration())
 	}
 
-	currentVersionedTransition := ms.CurrentVersionedTransition()
+	currentVersionedTransition := &persistencespb.VersionedTransition{
+		NamespaceFailoverVersion: ms.GetCurrentVersion(),
+		TransitionCount:          ms.NextTransitionCount(),
+	}
+
 	tsi.FastForwardInfo = &persistencespb.FastForwardInfo{
 		TargetTime:                    timestamppb.New(targetTime),
 		HasReached:                    false,
@@ -269,12 +273,27 @@ func NewTimeSkippingInfoUtil(tsi *persistencespb.TimeSkippingInfo) *TimeSkipping
 	return &TimeSkippingInfoUtil{tsi: tsi}
 }
 
+// HasPendingFastForward reports whether time skipping is enabled and carries a fast-forward that has
+// not yet been reached and has a real (non-zero) target time. A fast-forward on a disabled config is
+// not "pending" because it can never fire. All accesses go through nil-safe proto getters, so a nil
+// util, nil info, nil config, or nil fast-forward all yield false.
 func (util *TimeSkippingInfoUtil) HasPendingFastForward() bool {
-	return util.tsi != nil && util.tsi.GetFastForwardInfo() != nil && !util.tsi.GetFastForwardInfo().GetHasReached() &&
-		util.tsi.GetFastForwardInfo().GetTargetTime() != nil && !util.tsi.GetFastForwardInfo().GetTargetTime().AsTime().IsZero()
+	if util == nil || !util.IsEnabled() {
+		return false
+	}
+	ff := util.tsi.GetFastForwardInfo()
+	return ff != nil &&
+		!ff.GetHasReached() &&
+		ff.GetTargetTime() != nil &&
+		!ff.GetTargetTime().AsTime().IsZero()
 }
 
+// IsEnabled reports whether time skipping is enabled. Nil-safe: a nil util, nil info, or nil config
+// all yield false.
 func (util *TimeSkippingInfoUtil) IsEnabled() bool {
+	if util == nil {
+		return false
+	}
 	return util.tsi.GetConfig().GetEnabled()
 }