fix: address reviewer comments on merge-base validation and tests

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/2b4ea663-bae9-4763-b9ed-30316e844c32

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

actions/setup/js/safe_output_type_validator.cjs

@@ -445,7 +445,7 @@ function executeCustomValidation(item, customValidation, lineNum, itemType) {
   // Parse custom validation rule
   if (customValidation.startsWith("requiresOneOf:")) {
     const fields = customValidation.slice("requiresOneOf:".length).split(",");
-    const hasValidField = fields.some(field => item[field] !== undefined);
+    const hasValidField = fields.some(field => item[field] !== undefined && item[field] !== false);
     if (!hasValidField) {
       return {
         isValid: false,

actions/setup/js/safe_output_type_validator.test.cjs

@@ -46,6 +46,16 @@ const SAMPLE_VALIDATION_CONFIG = {
       issue_number: { issueOrPRNumber: true },
     },
   },
+  update_pull_request: {
+    defaultMax: 1,
+    customValidation: "requiresOneOf:title,body,merge_base",
+    fields: {
+      title: { type: "string", sanitize: true, maxLength: 256 },
+      body: { type: "string", sanitize: true, maxLength: 65000 },
+      merge_base: { type: "boolean" },
+      pull_request_number: { issueOrPRNumber: true },
+    },
+  },
   assign_to_agent: {
     defaultMax: 1,
     customValidation: "requiresOneOf:issue_number,pull_number",
@@ -399,6 +409,23 @@ describe("safe_output_type_validator", () => {
       expect(result.error).toContain("issue_number");
       expect(result.error).toContain("pull_number");
     });
+
+    it("should fail for update_pull_request when merge_base is false and no title/body is provided", async () => {
+      const { validateItem } = await import("./safe_output_type_validator.cjs");
+
+      const result = validateItem({ type: "update_pull_request", merge_base: false }, "update_pull_request", 1);
+
+      expect(result.isValid).toBe(false);
+      expect(result.error).toContain("requires at least one of");
+    });
+
+    it("should pass for update_pull_request when merge_base is true", async () => {
+      const { validateItem } = await import("./safe_output_type_validator.cjs");
+
+      const result = validateItem({ type: "update_pull_request", merge_base: true }, "update_pull_request", 1);
+
+      expect(result.isValid).toBe(true);
+    });
   });
 
   describe("custom validation: startLineLessOrEqualLine", () => {

pkg/workflow/compiler_safe_outputs_config_test.go

@@ -1236,9 +1236,11 @@ func TestUpdatePullRequestMergeBaseHandlerConfig(t *testing.T) {
 
 			var steps []string
 			compiler.addHandlerManagerConfigEnvVar(&steps, workflowData)
+			foundHandlerConfig := false
 
 			for _, step := range steps {
 				if strings.Contains(step, "GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG") {
+					foundHandlerConfig = true
 					parts := strings.Split(step, "GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: ")
 					if len(parts) == 2 {
 						jsonStr := strings.TrimSpace(parts[1])
@@ -1258,6 +1260,8 @@ func TestUpdatePullRequestMergeBaseHandlerConfig(t *testing.T) {
 					}
 				}
 			}
+
+			require.True(t, foundHandlerConfig, "Expected GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG in generated steps")
 		})
 	}
 }