agent_patch

diff --git a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/plan/visitor.go b/app/v2/pkg/engine/plan/visitor.go
index 3a95e8f..e6186fd 100644
--- a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/plan/visitor.go
+++ b/app/v2/pkg/engine/plan/visitor.go
@@ -1283,6 +1283,11 @@ func (v *Visitor) configureSubscription(config *objectFetchConfiguration) {
 	v.resolveInputTemplates(config, &subscription.Input, &v.subscription.Trigger.Variables)
 	v.subscription.Trigger.Input = []byte(subscription.Input)
 	v.subscription.Filter = config.filter
+	v.subscription.Trigger.ResponsePath = config.fetchItem.ResponsePath
+	v.subscription.Trigger.SourceID = config.sourceID
+	v.subscription.Trigger.SourceName = config.sourceName
+	v.subscription.Trigger.FetchID = config.fetchID
+	v.subscription.Trigger.QueryPlan = subscription.QueryPlan
 }
 
 func (v *Visitor) configureObjectFetch(config *objectFetchConfiguration) {
diff --git a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/postprocess/postprocess.go b/app/v2/pkg/engine/postprocess/postprocess.go
index fa63dd2..78114c2 100644
--- a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/postprocess/postprocess.go
+++ b/app/v2/pkg/engine/postprocess/postprocess.go
@@ -216,6 +216,35 @@ func (p *Processor) appendTriggerToFetchTree(res *resolve.GraphQLSubscription) {
 		return
 	}
 
+	query := v
+	if res.Trigger.QueryPlan != nil && res.Trigger.QueryPlan.Query != "" {
+		query = res.Trigger.QueryPlan.Query
+	}
+
+	dataSourceID := res.Trigger.SourceID
+	if dataSourceID == "" && len(info.Source.IDs) > 0 {
+		dataSourceID = info.Source.IDs[0]
+	}
+
+	dataSourceName := res.Trigger.SourceName
+	if dataSourceName == "" && len(info.Source.Names) > 0 {
+		dataSourceName = info.Source.Names[0]
+	}
+
+	var queryPlan *resolve.QueryPlan
+	if res.Trigger.QueryPlan != nil {
+		queryPlan = res.Trigger.QueryPlan
+	} else if query != "" {
+		queryPlan = &resolve.QueryPlan{
+			Query: query,
+		}
+	}
+
+	responsePath := info.Name
+	if res.Trigger.ResponsePath != "" {
+		responsePath = res.Trigger.ResponsePath
+	}
+
 	res.Response.Fetches.Trigger = &resolve.FetchTreeNode{
 		Kind: resolve.FetchTreeNodeKindTrigger,
 		Item: &resolve.FetchItem{
@@ -224,14 +253,12 @@ func (p *Processor) appendTriggerToFetchTree(res *resolve.GraphQLSubscription) {
 					FetchID: info.FetchID,
 				},
 				Info: &resolve.FetchInfo{
-					DataSourceID:   info.Source.IDs[0],
-					DataSourceName: info.Source.Names[0],
-					QueryPlan: &resolve.QueryPlan{
-						Query: v,
-					},
+					DataSourceID:   dataSourceID,
+					DataSourceName: dataSourceName,
+					QueryPlan:      queryPlan,
 				},
 			},
-			ResponsePath: info.Name,
+			ResponsePath: responsePath,
 		},
 	}
 }
diff --git a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/resolve/response.go b/app/v2/pkg/engine/resolve/response.go
index f8e0c60..4a42d58 100644
--- a/tmp/agent-patch-flux-pr-1260.1-of-1.2026-02-21__03-36-16__gpt-5-1-codex-mini/app/v2/pkg/engine/resolve/response.go
+++ b/app/v2/pkg/engine/resolve/response.go
@@ -20,6 +20,13 @@ type GraphQLSubscriptionTrigger struct {
 	Variables      Variables
 	Source         SubscriptionDataSource
 	PostProcessing PostProcessingConfiguration
+
+	// metadata captured during planning
+	ResponsePath string
+	SourceID     string
+	SourceName   string
+	FetchID      int
+	QueryPlan    *QueryPlan
 }
 
 type GraphQLResponse struct {