Refactor the template variable framework

internal/app/app_test.go

@@ -450,8 +450,20 @@ func TestGenerateHourlyReportUsesGeneratedTextTemplateWorkflow(t *testing.T) {
 	if err != nil {
 		t.Fatalf("read render context: %v", err)
 	}
-	if !strings.Contains(string(renderContext), `"ReportTitle": "Hourly Report"`) || !strings.Contains(string(renderContext), `"LocationName": "Brentwood, MO"`) {
-		t.Fatalf("render context missing deterministic fields:\n%s", string(renderContext))
+	for _, want := range []string{
+		`"Report": {`,
+		`"Title": "Hourly Report"`,
+		`"LocationName": "Brentwood, MO"`,
+		`"GeneratedText": {`,
+		`"Modules": {`,
+		`"CurrentConditions": {`,
+		`"HourlyForecast": {`,
+		`"Collected": {`,
+		`"Derived": {`,
+	} {
+		if !strings.Contains(string(renderContext), want) {
+			t.Fatalf("render context missing %q:\n%s", want, string(renderContext))
+		}
 	}
 	reportData, err := os.ReadFile(result.ReportPath)
 	if err != nil {
@@ -751,54 +763,6 @@ func TestGenerateHourlyReportPreservesRawTextOnValidationFailure(t *testing.T) {
 	}
 }
 
-func TestGenerateHourlyReportPreservesValidatedTextOnRenderContextFailure(t *testing.T) {
-	server := hourlyBundleServer(t)
-	cfg := hourlyGeneratedTextConfigWithModules(t, server, []string{
-		"metadata",
-		"hourly_forecast",
-		"precip_timing",
-		"alert_digest",
-		"area_forecast_discussion",
-		"weather_story",
-		"spc_convective_outlooks",
-	})
-	resolved, store, notifier, outputPath := resolveHourlyGeneratedTextFixture(t, cfg)
-	renderer := &recordingRenderer{
-		renderResult:        &scriptorium.RenderResult{ExitCode: 0},
-		structuredRunResult: &scriptorium.StructuredRunResult{ExitCode: 0},
-		structuredRunBody:   validHourlyGeneratedTextJSON(),
-	}
-
-	_, err := GenerateReport(context.Background(), ReportRequest{
-		Config:     cfg,
-		Resolved:   resolved,
-		OutputPath: outputPath,
-		Renderer:   renderer,
-		Store:      store,
-		Notifier:   notifier,
-	})
-	assertGeneratedReportError(t, err, resolved, "build render context")
-	assertNoGeneratedFailureSideEffects(t, notifier, outputPath)
-
-	paths := hourlyArtifactPaths(t, store, resolved)
-	assertPathsExist(t, paths.Preflight, paths.Metadata, paths.GeneratedTextRaw, paths.GeneratedTextResult, paths.GeneratedText)
-	assertPathsMissing(t, paths.RenderContext, paths.RenderedReport)
-	generatedText, readErr := os.ReadFile(paths.GeneratedText)
-	if readErr != nil {
-		t.Fatalf("read validated generated text: %v", readErr)
-	}
-	if string(generatedText) != validHourlyGeneratedTextJSON() {
-		t.Fatalf("validated generated text = %s, want normalized JSON", generatedText)
-	}
-	metadataData, readErr := os.ReadFile(paths.Metadata)
-	if readErr != nil {
-		t.Fatalf("read metadata: %v", readErr)
-	}
-	if !strings.Contains(string(metadataData), paths.GeneratedText) {
-		t.Fatalf("metadata missing validated generated text link:\n%s", string(metadataData))
-	}
-}
-
 func TestGenerateHourlyReportRejectsUnsupportedTemplateBeforeRenderContext(t *testing.T) {
 	cfg, resolved, store, notifier, outputPath := hourlyGeneratedTextFixture(t)
 	resolved.Definition.TemplateID = "missing-template"