agent_patch
runs/2026-02-28__13-38-10__gpt-5-4/flux-pr-1240/flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/agent-logs/agent.patch
11014 bytes
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/astnormalization.go b/app/pkg/astnormalization/astnormalization.go
index 7cb6e18..1454123 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/astnormalization.go
+++ b/app/pkg/astnormalization/astnormalization.go
@@ -175,7 +175,6 @@ func (o *OperationNormalizer) setupOperationWalkers() {
other := astvisitor.NewWalker(48)
removeSelfAliasing(&other)
mergeInlineFragments(&other)
- mergeFieldSelections(&other)
deduplicateFields(&other)
if o.options.removeFragmentDefinitions {
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/inline_fragment_merging.go b/app/pkg/astnormalization/inline_fragment_merging.go
index ca7f0df..f66feb1 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/inline_fragment_merging.go
+++ b/app/pkg/astnormalization/inline_fragment_merging.go
@@ -46,6 +46,33 @@ func (m *mergeInlineFragmentsVisitor) resolveInlineFragment(set, index, inlineFr
m.operation.ReplaceSelectionOnSelectionSet(set, index, m.operation.InlineFragments[inlineFragment].SelectionSet)
}
+func (m *mergeInlineFragmentsVisitor) fieldsCanMerge(left, right int) bool {
+ leftName := m.operation.FieldNameBytes(left)
+ rightName := m.operation.FieldNameBytes(right)
+ leftAlias := m.operation.FieldAliasBytes(left)
+ rightAlias := m.operation.FieldAliasBytes(right)
+
+ if !bytes.Equal(leftName, rightName) || !bytes.Equal(leftAlias, rightAlias) {
+ return false
+ }
+
+ leftDirectives := m.operation.FieldDirectives(left)
+ rightDirectives := m.operation.FieldDirectives(right)
+
+ return m.operation.DirectiveSetsAreEqual(leftDirectives, rightDirectives)
+}
+
+func (m *mergeInlineFragmentsVisitor) fieldsHaveSelections(left, right int) bool {
+ return m.operation.Fields[left].HasSelections && m.operation.Fields[right].HasSelections
+}
+
+func (m *mergeInlineFragmentsVisitor) mergeFields(left, right int) {
+ leftSet := m.operation.Fields[left].SelectionSet
+ rightSet := m.operation.Fields[right].SelectionSet
+ m.operation.SelectionSets[leftSet].SelectionRefs = append(m.operation.SelectionSets[leftSet].SelectionRefs, m.operation.SelectionSets[rightSet].SelectionRefs...)
+ m.operation.Fields[left].Directives.Refs = append(m.operation.Fields[left].Directives.Refs, m.operation.Fields[right].Directives.Refs...)
+}
+
func (m *mergeInlineFragmentsVisitor) EnterSelectionSet(ref int) {
for index, selection := range m.operation.SelectionSets[ref].SelectionRefs {
@@ -60,4 +87,35 @@ func (m *mergeInlineFragmentsVisitor) EnterSelectionSet(ref int) {
m.RevisitNode()
return
}
+
+ if len(m.operation.SelectionSets[ref].SelectionRefs) < 2 {
+ return
+ }
+
+ for _, leftSelection := range m.operation.SelectionSets[ref].SelectionRefs {
+ if m.operation.Selections[leftSelection].Kind != ast.SelectionKindField {
+ continue
+ }
+ leftField := m.operation.Selections[leftSelection].Ref
+ for i, rightSelection := range m.operation.SelectionSets[ref].SelectionRefs {
+ if m.operation.Selections[rightSelection].Kind != ast.SelectionKindField {
+ continue
+ }
+ if leftSelection == rightSelection {
+ continue
+ }
+ rightField := m.operation.Selections[rightSelection].Ref
+ if !m.fieldsHaveSelections(leftField, rightField) {
+ continue
+ }
+ if !m.fieldsCanMerge(leftField, rightField) {
+ continue
+ }
+
+ m.operation.RemoveFromSelectionSet(ref, i)
+ m.mergeFields(leftField, rightField)
+ m.RevisitNode()
+ return
+ }
+ }
}
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/inline_fragment_merging_test.go b/app/pkg/astnormalization/inline_fragment_merging_test.go
index f292dd2..48e131e 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/app/pkg/astnormalization/inline_fragment_merging_test.go
+++ b/app/pkg/astnormalization/inline_fragment_merging_test.go
@@ -2,55 +2,30 @@ package astnormalization
import "testing"
-func TestResolveInlineFragments(t *testing.T) {
- t.Run("simple", func(t *testing.T) {
+func TestMergeInlineFragments(t *testing.T) {
+ t.Run("merges field selections created by inlining fragments", func(t *testing.T) {
run(mergeInlineFragments, testDefinition, `
- query conflictingBecauseAlias {
+ query q {
dog {
- ... {
- name
- }
... on Dog {
- nickname
+ extra {
+ string
+ }
}
- ... {
- ... {
- doubleNested
- ... on Dog {
- nestedDogName
- }
+ ... on Dog {
+ extra {
+ noString: string
}
}
- extra { string }
- extra { string: noString }
- }
- }`,
- `
- query conflictingBecauseAlias {
- dog {
- name
- nickname
- doubleNested
- nestedDogName
- extra { string }
- extra { string: noString }
}
- }`)
- })
- t.Run("with interface type", func(t *testing.T) {
- run(mergeInlineFragments, testDefinition, `
- query conflictingBecauseAlias {
+ }`, `
+ query q {
dog {
- ... on Pet {
- name
+ extra {
+ string
+ noString: string
}
}
- }`,
- `
- query conflictingBecauseAlias {
- dog {
- name
- }
}`)
})
}
diff --git a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/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-4/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-4/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-4/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-4/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go b/app/v2/pkg/astnormalization/inline_fragment_selection_merging.go
index 39c94ff..52b3fbd 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/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
@@ -83,4 +118,32 @@ func (f *inlineFragmentSelectionMergeVisitor) EnterSelectionSet(ref int) {
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-4/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go b/app/v2/pkg/astnormalization/inline_fragment_selection_merging_test.go
index 8433719..c4d49bf 100644
--- a/tmp/agent-patch-flux-pr-1240.1-of-1.2026-02-28__13-38-10__gpt-5-4/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("merges nested field selections after merging fragments", func(t *testing.T) {
+ run(t, mergeInlineFragmentSelections, testDefinition, `
+ query a {
+ pet {
+ ... on Dog {
+ extra {
+ string
+ }
+ }
+ ... on Dog {
+ extra {
+ noString: string
+ }
+ }
+ }
+ }`, `
+ query a {
+ pet {
+ ... on Dog {
+ extra {
+ string
+ noString: string
+ }
+ }
+ }
+ }`)
+ })
}