Set GH_AW_WORKFLOW_ID at job level in consolidated safe_outputs job

- Added job-level Env map with GH_AW_WORKFLOW_ID in buildConsolidatedSafeOutputsJob
- Removed duplicate GH_AW_WORKFLOW_ID from create_pull_request step config (now inherited from job level)
- Updated integration tests to check job.Env for GH_AW_WORKFLOW_ID in consolidated jobs
- Tests now properly verify job-level env vars instead of looking for them in step content

Co-authored-by: pelikhan <[email protected]>

Author: Copilot

pkg/workflow/compiler_safe_outputs_consolidated.go

@@ -504,9 +504,12 @@ func (c *Compiler) buildConsolidatedSafeOutputsJob(data *WorkflowData, mainJobNa
 		RunsOn:         c.formatSafeOutputsRunsOn(data.SafeOutputs),
 		Permissions:    permissions.RenderToYAML(),
 		TimeoutMinutes: 15, // Slightly longer timeout for consolidated job with multiple steps
-		Steps:          steps,
-		Outputs:        outputs,
-		Needs:          needs,
+		Env: map[string]string{
+			"GH_AW_WORKFLOW_ID": fmt.Sprintf("%q", mainJobName),
+		},
+		Steps:   steps,
+		Outputs: outputs,
+		Needs:   needs,
 	}
 
 	consolidatedSafeOutputsLog.Printf("Built consolidated safe outputs job with %d steps", len(safeOutputStepNames))
@@ -638,9 +641,8 @@ func (c *Compiler) buildCreatePullRequestStepConfig(data *WorkflowData, mainJobN
 	cfg := data.SafeOutputs.CreatePullRequests
 
 	var customEnvVars []string
-	// Pass the workflow ID for branch naming (required by create_pull_request.cjs)
-	customEnvVars = append(customEnvVars, fmt.Sprintf("          GH_AW_WORKFLOW_ID: %q\n", mainJobName))
 	// Pass the base branch from GitHub context (required by create_pull_request.cjs)
+	// Note: GH_AW_WORKFLOW_ID is now set at the job level and inherited by all steps
 	customEnvVars = append(customEnvVars, "          GH_AW_BASE_BRANCH: ${{ github.ref_name }}\n")
 	customEnvVars = append(customEnvVars, buildTitlePrefixEnvVar("GH_AW_PR_TITLE_PREFIX", cfg.TitlePrefix)...)
 	customEnvVars = append(customEnvVars, buildLabelsEnvVar("GH_AW_PR_LABELS", cfg.Labels)...)

pkg/workflow/safe_outputs_integration_test.go

@@ -592,8 +592,19 @@ func TestConsolidatedSafeOutputsJobIntegration(t *testing.T) {
 			// Convert steps to string for verification
 			stepsContent := strings.Join(job.Steps, "")
 
-			// Verify expected environment variables and step content
+			// For consolidated job, GH_AW_WORKFLOW_ID should be at job level, not in steps
+			// Check job.Env for this variable
+			if job.Env == nil || job.Env["GH_AW_WORKFLOW_ID"] == "" {
+				t.Errorf("GH_AW_WORKFLOW_ID should be set at job level in consolidated job for %s.\nJob.Env: %v",
+					tt.name, job.Env)
+			}
+
+			// Verify other expected environment variables and step content (excluding GH_AW_WORKFLOW_ID)
 			for _, expectedContent := range tt.expectedStepsContaining {
+				if expectedContent == "GH_AW_WORKFLOW_ID" {
+					// Skip GH_AW_WORKFLOW_ID check in steps since it's now at job level
+					continue
+				}
 				if !strings.Contains(stepsContent, expectedContent) {
 					t.Errorf("Expected content %q not found in consolidated job for %s.\nJob steps:\n%s",
 						expectedContent, tt.name, stepsContent)
@@ -855,10 +866,9 @@ func TestConsolidatedSafeOutputsJobWithCustomEnv(t *testing.T) {
 		}
 	}
 
-	// Verify GH_AW_WORKFLOW_ID is present
-	// Known issue: GH_AW_WORKFLOW_ID may be missing from consolidated job for certain configurations
-	if !strings.Contains(stepsContent, "GH_AW_WORKFLOW_ID") {
-		t.Log("Known issue: GH_AW_WORKFLOW_ID not present in consolidated job - this should be fixed")
+	// Verify GH_AW_WORKFLOW_ID is present at job level
+	if job.Env == nil || job.Env["GH_AW_WORKFLOW_ID"] == "" {
+		t.Error("GH_AW_WORKFLOW_ID should be set at job level in consolidated job")
 	}
 
 	t.Logf("✓ Consolidated job with custom env vars built successfully with %d steps: %v", len(stepNames), stepNames)