agent_patch
runs/2026-02-28__13-38-10__gpt-5-3-codex/flux-pr-1240/flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/agent-logs/agent.patch
8837 bytes
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/abstract_field_normalizer.go b/app/v2/pkg/astnormalization/abstract_field_normalizer.go
index 1684566..16c365a 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/abstract_field_normalizer.go
+++ b/app/v2/pkg/astnormalization/abstract_field_normalizer.go
@@ -31,7 +31,6 @@ func NewAbstractFieldNormalizer(operation *ast.Document, definition *ast.Documen
mergeInlineFragmentSelections(&walker)
inlineSelectionsFromInlineFragments(&walker)
- mergeFieldSelections(&walker)
deduplicateFields(&walker)
return normalizer
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/astnormalization.go b/app/v2/pkg/astnormalization/astnormalization.go
index 60ff1f2..6a26867 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/astnormalization.go
+++ b/app/v2/pkg/astnormalization/astnormalization.go
@@ -212,7 +212,6 @@ func (o *OperationNormalizer) setupOperationWalkers() {
directiveIncludeSkip(&directivesIncludeSkip)
cleanup := astvisitor.NewWalker(8)
- mergeFieldSelections(&cleanup)
deduplicateFields(&cleanup)
if o.options.removeUnusedVariables {
del := deleteUnusedVariables(&cleanup)
@@ -272,7 +271,7 @@ func (o *OperationNormalizer) setupOperationWalkers() {
}
o.operationWalkers = append(o.operationWalkers, walkerStage{
- name: "mergeFieldSelections, deduplicateFields, deleteUnusedVariables",
+ name: "deduplicateFields, deleteUnusedVariables",
walker: &cleanup,
})
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/field_selection_merging.go b/app/v2/pkg/astnormalization/field_selection_merging.go
index b0592db..0e6c5b2 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/field_selection_merging.go
+++ b/app/v2/pkg/astnormalization/field_selection_merging.go
@@ -1,95 +1,7 @@
package astnormalization
-import (
- "bytes"
-
- "github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
- "github.com/wundergraph/graphql-go-tools/v2/pkg/astvisitor"
-)
+import "github.com/wundergraph/graphql-go-tools/v2/pkg/astvisitor"
func mergeFieldSelections(walker *astvisitor.Walker) {
- visitor := fieldSelectionMergeVisitor{
- Walker: walker,
- }
- walker.RegisterEnterDocumentVisitor(&visitor)
- walker.RegisterEnterSelectionSetVisitor(&visitor)
-}
-
-type fieldSelectionMergeVisitor struct {
- *astvisitor.Walker
- operation *ast.Document
-}
-
-func (f *fieldSelectionMergeVisitor) EnterDocument(operation, definition *ast.Document) {
- f.operation = operation
-}
-
-func (f *fieldSelectionMergeVisitor) fieldsCanMerge(left, right int) bool {
- leftName := f.operation.FieldNameBytes(left)
- rightName := f.operation.FieldNameBytes(right)
- leftAlias := f.operation.FieldAliasBytes(left)
- rightAlias := f.operation.FieldAliasBytes(right)
-
- if !bytes.Equal(leftName, rightName) || !bytes.Equal(leftAlias, rightAlias) {
- return false
- }
-
- leftDirectives := f.operation.FieldDirectives(left)
- rightDirectives := f.operation.FieldDirectives(right)
-
- return f.operation.DirectiveSetsAreEqual(leftDirectives, rightDirectives)
-}
-
-func (f *fieldSelectionMergeVisitor) fieldsHaveSelections(left, right int) bool {
- return f.operation.Fields[left].HasSelections && f.operation.Fields[right].HasSelections
-}
-
-func (f *fieldSelectionMergeVisitor) mergeFields(left, right int) (ok bool) {
- var leftSet, rightSet int
- leftSet, ok = f.operation.FieldSelectionSet(left)
- if !ok {
- return false
- }
- rightSet, ok = f.operation.FieldSelectionSet(right)
- if !ok {
- return false
- }
-
- f.operation.AppendSelectionSet(leftSet, rightSet)
- return true
-}
-
-func (f *fieldSelectionMergeVisitor) EnterSelectionSet(ref int) {
-
- if len(f.operation.SelectionSets[ref].SelectionRefs) < 2 {
- return
- }
-
- for _, leftSelection := range f.operation.SelectionSets[ref].SelectionRefs {
- if !f.operation.SelectionIsFieldSelection(leftSelection) {
- continue
- }
- leftField := f.operation.Selections[leftSelection].Ref
- for i, rightSelection := range f.operation.SelectionSets[ref].SelectionRefs {
- if !f.operation.SelectionIsFieldSelection(rightSelection) {
- continue
- }
- if leftSelection == rightSelection {
- continue
- }
- rightField := f.operation.Selections[rightSelection].Ref
- if !f.fieldsHaveSelections(leftField, rightField) {
- continue
- }
- if !f.fieldsCanMerge(leftField, rightField) {
- continue
- }
-
- if f.mergeFields(leftField, rightField) {
- f.operation.RemoveFromSelectionSet(ref, i)
- f.RevisitNode()
- }
- return
- }
- }
+ mergeInlineFragmentSelections(walker)
}
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go b/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go
index 39c94ff..94c4c63 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go
+++ b/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go
@@ -54,6 +54,41 @@ func (f *inlineFragmentSelectionMergeVisitor) mergeInlineFragments(left, right i
return true
}
+func (f *inlineFragmentSelectionMergeVisitor) fieldsCanMerge(left, right int) bool {
+ leftName := f.operation.FieldNameBytes(left)
+ rightName := f.operation.FieldNameBytes(right)
+ leftAlias := f.operation.FieldAliasBytes(left)
+ rightAlias := f.operation.FieldAliasBytes(right)
+
+ if !bytes.Equal(leftName, rightName) || !bytes.Equal(leftAlias, rightAlias) {
+ return false
+ }
+
+ leftDirectives := f.operation.FieldDirectives(left)
+ rightDirectives := f.operation.FieldDirectives(right)
+
+ return f.operation.DirectiveSetsAreEqual(leftDirectives, rightDirectives)
+}
+
+func (f *inlineFragmentSelectionMergeVisitor) fieldsHaveSelections(left, right int) bool {
+ return f.operation.Fields[left].HasSelections && f.operation.Fields[right].HasSelections
+}
+
+func (f *inlineFragmentSelectionMergeVisitor) mergeFields(left, right int) (ok bool) {
+ var leftSet, rightSet int
+ leftSet, ok = f.operation.FieldSelectionSet(left)
+ if !ok {
+ return false
+ }
+ rightSet, ok = f.operation.FieldSelectionSet(right)
+ if !ok {
+ return false
+ }
+
+ f.operation.AppendSelectionSet(leftSet, rightSet)
+ return true
+}
+
func (f *inlineFragmentSelectionMergeVisitor) EnterSelectionSet(ref int) {
if len(f.operation.SelectionSets[ref].SelectionRefs) < 2 {
return
@@ -79,7 +114,33 @@ func (f *inlineFragmentSelectionMergeVisitor) EnterSelectionSet(ref int) {
f.operation.RemoveFromSelectionSet(ref, i)
f.RevisitNode()
}
+ return
+ }
+ }
+ for _, leftSelection := range f.operation.SelectionSets[ref].SelectionRefs {
+ if !f.operation.SelectionIsFieldSelection(leftSelection) {
+ continue
+ }
+ leftField := f.operation.Selections[leftSelection].Ref
+ for i, rightSelection := range f.operation.SelectionSets[ref].SelectionRefs {
+ if !f.operation.SelectionIsFieldSelection(rightSelection) {
+ continue
+ }
+ if leftSelection == rightSelection {
+ continue
+ }
+ rightField := f.operation.Selections[rightSelection].Ref
+ if !f.fieldsHaveSelections(leftField, rightField) {
+ continue
+ }
+ if !f.fieldsCanMerge(leftField, rightField) {
+ continue
+ }
+ if f.mergeFields(leftField, rightField) {
+ f.operation.RemoveFromSelectionSet(ref, i)
+ f.RevisitNode()
+ }
return
}
}
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go b/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go
index 8433719..f1019f9 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-3-codex/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go
+++ b/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go
@@ -121,4 +121,32 @@ func TestMergeInlineFragmentSelections(t *testing.T) {
}
}`)
})
+
+ t.Run("merged fragments also merge nested field selections", func(t *testing.T) {
+ run(t, mergeInlineFragmentSelections, testDefinition, `
+ query a {
+ pet {
+ ... on Dog {
+ extras {
+ string
+ }
+ }
+ ... on Dog {
+ extras {
+ noString: string
+ }
+ }
+ }
+ }`, `
+ query a {
+ pet {
+ ... on Dog {
+ extras {
+ string
+ noString: string
+ }
+ }
+ }
+ }`)
+ })
}