fix

Author: davidporter-id-au

chasm/lib/activity/activity.go

@@ -217,7 +217,7 @@ func (a *Activity) createAddActivityTaskRequest(ctx chasm.Context, namespaceID s
 			WorkflowId: execKey.BusinessID,
 			RunId:      execKey.RunID,
 		}
-		req.ScheduledEventId = a.ActivityState.GetScheduledEventId()
+		req.ScheduledEventId = a.GetScheduledEventId()
 	}
 
 	return req, nil
@@ -256,7 +256,7 @@ func (a *Activity) GenerateRecordActivityTaskStartedResponse(
 
 	// For workflow-embedded activities, ActivityId is the SDK-provided activity ID string.
 	// For standalone activities, fall back to the execution key's BusinessID.
-	activityID := a.ActivityState.GetActivityId()
+	activityID := a.GetActivityId()
 	if activityID == "" {
 		activityID = key.BusinessID
 	}
@@ -918,7 +918,7 @@ func (a *Activity) BuildPendingActivityInfo(ctx chasm.Context) *workflowpb.Pendi
 
 	// For workflow-embedded activities, ActivityId is the SDK-provided activity ID string.
 	// For standalone activities, this will be empty (standalone activities don't use BuildPendingActivityInfo).
-	activityID := a.ActivityState.GetActivityId()
+	activityID := a.GetActivityId()
 
 	return &workflowpb.PendingActivityInfo{
 		ActivityId:         activityID,

chasm/lib/workflow/activity_events.go

@@ -3,8 +3,8 @@ package workflow
 import (
 	enumspb "go.temporal.io/api/enums/v1"
 	historypb "go.temporal.io/api/history/v1"
-	workflowservice "go.temporal.io/api/workflowservice/v1"
-	historyservice "go.temporal.io/server/api/historyservice/v1"
+	"go.temporal.io/api/workflowservice/v1"
+	"go.temporal.io/server/api/historyservice/v1"
 	"go.temporal.io/server/chasm"
 	chasmactivity "go.temporal.io/server/chasm/lib/activity"
 	activitypb "go.temporal.io/server/chasm/lib/activity/gen/activitypb/v1"
@@ -117,7 +117,7 @@ func (d ActivityTaskCompletedEventDefinition) Apply(ctx chasm.MutableContext, wf
 		return nil
 	}
 
-	delete(wf.Activities, act.ActivityState.GetActivityId())
+	delete(wf.Activities, act.GetActivityId())
 	return wf.ScheduleWorkflowTask()
 }
 
@@ -144,7 +144,7 @@ func (d ActivityTaskFailedEventDefinition) Apply(ctx chasm.MutableContext, wf *W
 		return nil
 	}
 
-	delete(wf.Activities, act.ActivityState.GetActivityId())
+	delete(wf.Activities, act.GetActivityId())
 	return wf.ScheduleWorkflowTask()
 }
 
@@ -171,7 +171,7 @@ func (d ActivityTaskTimedOutEventDefinition) Apply(ctx chasm.MutableContext, wf
 		return nil
 	}
 
-	delete(wf.Activities, act.ActivityState.GetActivityId())
+	delete(wf.Activities, act.GetActivityId())
 	return wf.ScheduleWorkflowTask()
 }
 
@@ -230,7 +230,7 @@ func (d ActivityTaskCanceledEventDefinition) Apply(ctx chasm.MutableContext, wf
 		return nil
 	}
 
-	delete(wf.Activities, act.ActivityState.GetActivityId())
+	delete(wf.Activities, act.GetActivityId())
 	return wf.ScheduleWorkflowTask()
 }
 

chasm/lib/workflow/workflow.go

@@ -76,7 +76,7 @@ func (w *Workflow) Terminate(
 // OnActivityCompleted implements ActivityStore for workflow-embedded activities.
 // Writes ActivityTaskStarted + ActivityTaskCompleted history events; Apply() handles cleanup.
 func (w *Workflow) OnActivityCompleted(ctx chasm.MutableContext, act *activity.Activity) error {
-	scheduledEventID := act.ActivityState.GetScheduledEventId()
+	scheduledEventID := act.GetScheduledEventId()
 	attempt := act.LastAttempt.Get(ctx)
 	startedEvent, err := addAndApplyHistoryEvent[ActivityTaskStartedEventDefinition](w, ctx, func(e *historypb.HistoryEvent) {
 		e.Attributes = &historypb.HistoryEvent_ActivityTaskStartedEventAttributes{
@@ -107,7 +107,7 @@ func (w *Workflow) OnActivityCompleted(ctx chasm.MutableContext, act *activity.A
 // OnActivityFailed implements ActivityStore for workflow-embedded activities.
 // Writes ActivityTaskStarted + ActivityTaskFailed history events; Apply() handles cleanup.
 func (w *Workflow) OnActivityFailed(ctx chasm.MutableContext, act *activity.Activity) error {
-	scheduledEventID := act.ActivityState.GetScheduledEventId()
+	scheduledEventID := act.GetScheduledEventId()
 	attempt := act.LastAttempt.Get(ctx)
 	startedEvent, err := addAndApplyHistoryEvent[ActivityTaskStartedEventDefinition](w, ctx, func(e *historypb.HistoryEvent) {
 		e.Attributes = &historypb.HistoryEvent_ActivityTaskStartedEventAttributes{
@@ -139,7 +139,7 @@ func (w *Workflow) OnActivityFailed(ctx chasm.MutableContext, act *activity.Acti
 // OnActivityTimedOut implements ActivityStore for workflow-embedded activities.
 // Writes ActivityTaskTimedOut (and optionally ActivityTaskStarted) history events; Apply() handles cleanup.
 func (w *Workflow) OnActivityTimedOut(ctx chasm.MutableContext, act *activity.Activity, timeoutFailure *failurepb.Failure, needsStartedEvent bool) error {
-	scheduledEventID := act.ActivityState.GetScheduledEventId()
+	scheduledEventID := act.GetScheduledEventId()
 	if timeoutFailure == nil {
 		return nil
 	}
@@ -178,14 +178,14 @@ func (w *Workflow) OnActivityTimedOut(ctx chasm.MutableContext, act *activity.Ac
 // OnActivityCanceled implements ActivityStore for workflow-embedded activities.
 // No ActivityTaskCanceled history event is written on the forward path in this prototype.
 func (w *Workflow) OnActivityCanceled(ctx chasm.MutableContext, act *activity.Activity) error {
-	activityID := act.ActivityState.GetActivityId()
+	activityID := act.GetActivityId()
 	delete(w.Activities, activityID)
 	return w.ScheduleWorkflowTask()
 }
 
 // OnActivityTerminated implements ActivityStore for workflow-embedded activities.
 func (w *Workflow) OnActivityTerminated(ctx chasm.MutableContext, act *activity.Activity) error {
-	activityID := act.ActivityState.GetActivityId()
+	activityID := act.GetActivityId()
 	delete(w.Activities, activityID)
 	return w.ScheduleWorkflowTask()
 }
@@ -311,7 +311,7 @@ func (w *Workflow) BuildPendingActivityInfos(ctx chasm.Context) ([]*workflowpb.P
 func (w *Workflow) FindActivityByScheduledEventID(ctx chasm.Context, scheduledEventID int64) *activity.Activity {
 	for _, field := range w.Activities {
 		act := field.Get(ctx)
-		if act.ActivityState.GetScheduledEventId() == scheduledEventID {
+		if act.GetScheduledEventId() == scheduledEventID {
 			return act
 		}
 	}

service/history/workflow/mutable_state_impl.go

@@ -3339,11 +3339,6 @@ func (ms *MutableStateImpl) ScheduleWorkflowTask() error {
 	return ScheduleWorkflowTask(ms)
 }
 
-// WriteActivityTaskStartedHistoryEvent implements chasm.NodeBackend. It writes an
-// ActivityTaskStarted history event for a workflow-embedded CHASM activity.
-// The event is buffered — the real event ID is assigned during FlushBufferToCurrentBatch.
-// Both started and completed events must be written in the same transaction so that
-// the history builder can wire the started event ID into the completed event automatically.
 // AddWorkflowTaskScheduledEventAsHeartbeat is to record the first WorkflowTaskScheduledEvent during workflow task heartbeat.
 func (ms *MutableStateImpl) AddWorkflowTaskScheduledEventAsHeartbeat(
 	bypassTaskGeneration bool,