Use DisjunctionNode for buildOr with 3+ conditions

- Updated buildOr to return DisjunctionNode for 3+ conditions instead of nested OrNode structures - DisjunctionNode renders as flat OR chain (a || b || c) avoiding deep nesting - Updated test expectations to match new flat rendering - All tests pass successfully Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot · Oct 11, 2025 · Oct 11, 2025 · Oct 11, 2025 · Oct 11, 2025 · Oct 11, 2025
commit c71032169bbd56b8343b8949d4755b2b38fefc8a
diff --git a/.github/workflows/brave.lock.yml b/.github/workflows/brave.lock.yml
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
diff --git a/.github/workflows/pdf-summary.lock.yml b/.github/workflows/pdf-summary.lock.yml
diff --git a/.github/workflows/scout.lock.yml b/.github/workflows/scout.lock.yml
diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml
diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml
diff --git a/pkg/workflow/expressions.go b/pkg/workflow/expressions.go
@@ -207,7 +207,7 @@ func buildConditionTree(existingCondition string, draftCondition string) Conditi
 
 // buildOr creates an OR condition from two or more condition nodes.
 // When called with 2 arguments, it creates a simple OR node.
-// When called with more arguments, it creates a right-associative OR tree: a || (b || (c || ...))
+// When called with more arguments, it creates a DisjunctionNode to avoid deep nesting.
 func buildOr(conditions ...ConditionNode) ConditionNode {
 	if len(conditions) == 0 {
 		return nil
@@ -219,12 +219,8 @@ func buildOr(conditions ...ConditionNode) ConditionNode {
 		return &OrNode{Left: conditions[0], Right: conditions[1]}
 	}
 
-	// Build a right-associative OR tree for 3+ conditions: a || (b || (c || ...))
-	result := conditions[len(conditions)-1]
-	for i := len(conditions) - 2; i >= 0; i-- {
-		result = &OrNode{Left: conditions[i], Right: result}
-	}
-	return result
+	// Use DisjunctionNode for 3+ conditions to avoid deep nesting
+	return &DisjunctionNode{Terms: conditions}
 }
 
 func buildAnd(left ConditionNode, right ConditionNode) ConditionNode {

diff --git a/pkg/workflow/expressions_test.go b/pkg/workflow/expressions_test.go
@@ -761,7 +761,7 @@ func TestBuildOr(t *testing.T) {
 				BuildPropertyAccess("github.event.pull_request.number"),
 				BuildPropertyAccess("github.event.discussion.number"),
 			},
-			expected: "(github.event.issue.number) || ((github.event.pull_request.number) || (github.event.discussion.number))",
+			expected: "github.event.issue.number || github.event.pull_request.number || github.event.discussion.number",
 		},
 		{
 			name: "four conditions",
@@ -771,7 +771,7 @@ func TestBuildOr(t *testing.T) {
 				&ExpressionNode{Expression: "c"},
 				&ExpressionNode{Expression: "d"},
 			},
-			expected: "(a) || ((b) || ((c) || (d)))",
+			expected: "a || b || c || d",
 		},
 		{
 			name: "mixed node types",
@@ -780,7 +780,7 @@ func TestBuildOr(t *testing.T) {
 				BuildEventTypeEquals("pull_request"),
 				BuildPropertyAccess("github.event.issue.number"),
 			},
-			expected: "(github.event.action == 'opened') || ((github.event_name == 'pull_request') || (github.event.issue.number))",
+			expected: "github.event.action == 'opened' || github.event_name == 'pull_request' || github.event.issue.number",
 		},
 	}