Correct profile test boundaries and fallback coverage

internal/adapters/promptkit/adapter_test.go

@@ -12,10 +12,7 @@ import (
 	"time"
 
 	promptkit "gitea.maximumdirect.net/eric/promptkit"
-	"gitea.maximumdirect.net/eric/weatherreporter/internal/app"
-	appconfig "gitea.maximumdirect.net/eric/weatherreporter/internal/config"
 	"gitea.maximumdirect.net/eric/weatherreporter/internal/promptexec"
-	"gitea.maximumdirect.net/eric/weatherreporter/internal/report"
 )
 
 type fakeClient struct {
@@ -161,44 +158,6 @@ func TestMaintainedWeatherLightLocalProfileExampleInspectsOffline(t *testing.T)
 	assertProfile(t, adapter, "weather-light", "", "weather-local")
 }
 
-func TestApplicationPreflightResolvesEmbeddedAndOverriddenProfilesOffline(t *testing.T) {
-	lookupEnv := func(string) (string, bool) { return "test-key", true }
-	inspect := func(t *testing.T, adapter *Adapter, id report.ID, profile string, wantID string, wantBackend string, wantModel string) {
-		t.Helper()
-		result, err := app.InspectPromptExecution(context.Background(), app.PromptInspectionRequest{
-			Resolved:  resolvedPromptProfile(t, id),
-			Executor:  adapter,
-			Promptkit: appconfig.PromptkitConfig{Profile: profile},
-			LookupEnv: lookupEnv,
-		})
-		if err != nil {
-			t.Fatalf("InspectPromptExecution() error = %v", err)
-		}
-		if result.ProfileID != wantID || result.BackendID != wantBackend || result.ModelName != wantModel {
-			t.Fatalf("inspection = %#v, want profile/backend/model %q/%q/%q", result, wantID, wantBackend, wantModel)
-		}
-	}
-
-	embedded, err := newAdapterForTest(Config{}, &fakeClient{})
-	if err != nil {
-		t.Fatalf("newAdapterForTest(embedded) error = %v", err)
-	}
-	inspect(t, embedded, report.Hourly, "", "weather-light", "openrouter", "deepseek/deepseek-v4-flash")
-	inspect(t, embedded, report.Daily, "", "weather-balanced", "openrouter", "~google/gemini-flash-latest")
-	inspect(t, embedded, report.Today, "", "weather-balanced", "openrouter", "~google/gemini-flash-latest")
-	inspect(t, embedded, report.Tomorrow, "", "weather-balanced", "openrouter", "~google/gemini-flash-latest")
-	inspect(t, embedded, report.Daily, "weather-deep", "weather-deep", "openrouter", "~anthropic/claude-sonnet-latest")
-
-	override, err := newAdapterForTest(Config{ProfileFile: writeProfileFile(t, `id: weather-light
-endpoint: https://local.example/v1
-model: local-weather
-`)}, &fakeClient{})
-	if err != nil {
-		t.Fatalf("newAdapterForTest(override) error = %v", err)
-	}
-	inspect(t, override, report.Hourly, "", "weather-light", "", "local-weather")
-}
-
 func TestProfileResolutionFallsThroughOnlyWhenTheConfiguredIDIsAbsent(t *testing.T) {
 	absentAdapter, err := New(Config{ProfileDirectory: testProfileDirectory(t, `id: other-profile
 backend: openrouter
@@ -283,6 +242,44 @@ func TestExecuteUsesPreparedInlineDataPackage(t *testing.T) {
 	}
 }
 
+func TestExecuteEmbeddedHourlyProfileThroughPreparedPath(t *testing.T) {
+	t.Setenv("OPENROUTER_API_KEY", "test-openrouter-key")
+	client := &fakeClient{response: hourlyValidResponse()}
+	adapter, err := newAdapter(Config{}, promptkit.WithLLMClient(client))
+	if err != nil {
+		t.Fatalf("newAdapter() error = %v", err)
+	}
+	request := promptexec.ExecuteRequest{
+		PromptID:        "weather.hourly_generated_text",
+		PromptVersion:   "1.1.0",
+		ProfileID:       "weather-light",
+		DataPackage:     []byte("report:\n  id: hourly\nbriefing: {}\n"),
+		DataPackagePath: "data-packages/hourly/data_package.yaml",
+	}
+	var preparation promptexec.Preparation
+	prepared := false
+	result, err := adapter.Execute(context.Background(), request, func(value promptexec.Preparation, _ *promptexec.PreparationDebug) error {
+		if client.callCount() != 0 {
+			t.Fatal("provider was called before preparation completed")
+		}
+		preparation = value
+		prepared = true
+		return nil
+	})
+	if err != nil {
+		t.Fatalf("Execute() error = %v", err)
+	}
+	if !prepared || preparation.ProfileID != "weather-light" || preparation.BackendID != "openrouter" || preparation.ModelName != "deepseek/deepseek-v4-flash" {
+		t.Fatalf("preparation = %#v", preparation)
+	}
+	if result == nil || result.ProfileID != "weather-light" || result.BackendID != "openrouter" || result.ModelName != "deepseek/deepseek-v4-flash" || result.Validation.Status != promptexec.ValidationPassed {
+		t.Fatalf("execution = %#v", result)
+	}
+	if client.callCount() != 1 || client.request().Target.Model != "deepseek/deepseek-v4-flash" {
+		t.Fatalf("provider calls/request = %d/%#v", client.callCount(), client.request())
+	}
+}
+
 func TestExecuteUsesExactInlineDataPackageProvenance(t *testing.T) {
 	client := &fakeClient{response: validResponse()}
 	reader := &recordingReader{}
@@ -528,20 +525,6 @@ func writeProfileFile(t *testing.T, profile string) string {
 	return path
 }
 
-func resolvedPromptProfile(t *testing.T, id report.ID) report.Resolved {
-	t.Helper()
-	now := time.Date(2026, 5, 29, 12, 0, 0, 0, time.UTC)
-	request := report.ResolveRequest{Now: now, Location: time.UTC}
-	if id == report.Daily {
-		request.Date = now
-	}
-	resolved, err := report.DefaultRegistry().Resolve(id, request)
-	if err != nil {
-		t.Fatalf("Resolve(%q) error = %v", id, err)
-	}
-	return resolved
-}
-
 func testExecuteRequest() promptexec.ExecuteRequest {
 	return promptexec.ExecuteRequest{
 		PromptID:        "weather.daily_generated_text",
@@ -558,3 +541,10 @@ func validResponse() *promptkit.GenerateResponse {
 		Usage:   promptkit.TokenUsage{PromptTokens: 12, CompletionTokens: 8, TotalTokens: 20},
 	}
 }
+
+func hourlyValidResponse() *promptkit.GenerateResponse {
+	return &promptkit.GenerateResponse{
+		Content: `{"summary":"A quiet hour is expected.","forecast_discussion":"Conditions remain settled.","precipitation_timing":""}`,
+		Usage:   promptkit.TokenUsage{PromptTokens: 12, CompletionTokens: 8, TotalTokens: 20},
+	}
+}

internal/app/prompt_profile_integration_test.go

@@ -0,0 +1,73 @@
+package app_test
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	promptkitadapter "gitea.maximumdirect.net/eric/weatherreporter/internal/adapters/promptkit"
+	"gitea.maximumdirect.net/eric/weatherreporter/internal/app"
+	"gitea.maximumdirect.net/eric/weatherreporter/internal/config"
+	"gitea.maximumdirect.net/eric/weatherreporter/internal/report"
+)
+
+func TestPromptInspectionResolvesEmbeddedAndOverriddenProfilesOffline(t *testing.T) {
+	lookupEnv := func(string) (string, bool) { return "test-key", true }
+	inspect := func(t *testing.T, adapter *promptkitadapter.Adapter, id report.ID, profile string, wantID string, wantBackend string, wantModel string) {
+		t.Helper()
+		result, err := app.InspectPromptExecution(context.Background(), app.PromptInspectionRequest{
+			Resolved:  resolvedPromptProfile(t, id),
+			Executor:  adapter,
+			Promptkit: config.PromptkitConfig{Profile: profile},
+			LookupEnv: lookupEnv,
+		})
+		if err != nil {
+			t.Fatalf("InspectPromptExecution() error = %v", err)
+		}
+		if result.ProfileID != wantID || result.BackendID != wantBackend || result.ModelName != wantModel {
+			t.Fatalf("inspection = %#v, want profile/backend/model %q/%q/%q", result, wantID, wantBackend, wantModel)
+		}
+	}
+
+	embedded, err := promptkitadapter.New(promptkitadapter.Config{})
+	if err != nil {
+		t.Fatalf("New(embedded) error = %v", err)
+	}
+	inspect(t, embedded, report.Hourly, "", "weather-light", "openrouter", "deepseek/deepseek-v4-flash")
+	inspect(t, embedded, report.Daily, "", "weather-balanced", "openrouter", "~google/gemini-flash-latest")
+	inspect(t, embedded, report.Daily, "weather-deep", "weather-deep", "openrouter", "~anthropic/claude-sonnet-latest")
+
+	override, err := promptkitadapter.New(promptkitadapter.Config{ProfileFile: writeProfileFile(t, `id: weather-light
+endpoint: https://local.example/v1
+model: local-weather
+`)})
+	if err != nil {
+		t.Fatalf("New(override) error = %v", err)
+	}
+	inspect(t, override, report.Hourly, "", "weather-light", "", "local-weather")
+}
+
+func resolvedPromptProfile(t *testing.T, id report.ID) report.Resolved {
+	t.Helper()
+	now := time.Date(2026, 5, 29, 12, 0, 0, 0, time.UTC)
+	request := report.ResolveRequest{Now: now, Location: time.UTC}
+	if id == report.Daily {
+		request.Date = now
+	}
+	resolved, err := report.DefaultRegistry().Resolve(id, request)
+	if err != nil {
+		t.Fatalf("Resolve(%q) error = %v", id, err)
+	}
+	return resolved
+}
+
+func writeProfileFile(t *testing.T, profile string) string {
+	t.Helper()
+	path := filepath.Join(t.TempDir(), "profile.yml")
+	if err := os.WriteFile(path, []byte(profile), 0o600); err != nil {
+		t.Fatalf("write profile: %v", err)
+	}
+	return path
+}

internal/app/single_report_workflow_test.go

@@ -51,6 +51,8 @@ type workflowExecutor struct {
 	beforeProvider       func()
 	preparationDebug     *promptexec.PreparationDebug
 	executionDebug       *promptexec.ExecutionDebug
+	preparation          *promptexec.Preparation
+	execution            *promptexec.Execution
 }
 
 func (e *workflowExecutor) InspectPrompt(_ context.Context, id, version string) (promptexec.PromptInspection, error) {
@@ -93,6 +95,7 @@ func (e *workflowExecutor) Execute(_ context.Context, req promptexec.ExecuteRequ
 		RenderedPromptHash: "rendered-hash", ProfileID: req.ProfileID, BackendID: profile.BackendID,
 		ModelName: profile.ModelName, DataPackagePath: req.DataPackagePath, StartedAt: stamp, EndedAt: stamp,
 	}
+	e.preparation = &preparation
 	if err := callback(preparation, e.preparationDebug); err != nil {
 		return nil, err
 	}
@@ -110,14 +113,16 @@ func (e *workflowExecutor) Execute(_ context.Context, req promptexec.ExecuteRequ
 	if validation == "" {
 		validation = promptexec.ValidationPassed
 	}
-	return &promptexec.Execution{
+	execution := &promptexec.Execution{
 		RunID: "provider-run", PromptID: req.PromptID, PromptVersion: req.PromptVersion,
 		PromptHash: "prompt-hash", RenderedPromptHash: "rendered-hash", ProfileID: req.ProfileID,
 		BackendID: profile.BackendID, ModelName: profile.ModelName, GeneratedHash: "generated-hash",
 		StartedAt: stamp, EndedAt: stamp, DataPackagePath: req.DataPackagePath, RawOutput: e.raw,
 		Debug:      e.executionDebug,
 		Validation: promptexec.NewValidation(validation, "json_schema", e.definition.GeneratedTextSchemaID+".generated_text.schema.json", nil),
-	}, nil
+	}
+	e.execution = execution
+	return execution, nil
 }
 
 type workflowNotifier struct {
@@ -251,7 +256,7 @@ func TestGenerateDetailedPreservesSelectedProfileThroughExecution(t *testing.T)
 				definition: definition, prompt: logicalPromptInspection(definition), profile: test.profile, raw: []byte(test.raw),
 			}
 			bundle := workflowBundle(t)
-			result, err := GenerateDetailed(context.Background(), GenerateRequest{
+			_, err := GenerateDetailed(context.Background(), GenerateRequest{
 				Config: cfg, Report: test.kind, Date: workflowTime("2026-05-29T12:00:00-05:00"), Now: workflowTime("2026-05-29T08:30:00-05:00"),
 				Collector: &workflowCollector{result: &collect.Result{Bundle: &bundle}}, Executor: executor, Notifier: &workflowNotifier{},
 			})
@@ -261,23 +266,11 @@ func TestGenerateDetailedPreservesSelectedProfileThroughExecution(t *testing.T)
 			if executor.request.ProfileID != test.profile.ProfileID {
 				t.Fatalf("execution profile = %q, want %q", executor.request.ProfileID, test.profile.ProfileID)
 			}
-			store, err := state.NewFilesystemStore(cfg.Workspace)
-			if err != nil {
-				t.Fatalf("NewFilesystemStore() error = %v", err)
+			if executor.preparation == nil || executor.preparation.ProfileID != test.profile.ProfileID || executor.preparation.BackendID != test.profile.BackendID || executor.preparation.ModelName != test.profile.ModelName {
+				t.Fatalf("prepared profile = %#v, want %q/%q/%q", executor.preparation, test.profile.ProfileID, test.profile.BackendID, test.profile.ModelName)
 			}
-			preparation, err := store.LoadPromptPreparation(context.Background(), result.PreparationPath)
-			if err != nil || preparation.Preparation == nil || preparation.Preparation.ProfileID != test.profile.ProfileID || preparation.Preparation.BackendID != test.profile.BackendID || preparation.Preparation.ModelName != test.profile.ModelName {
-				t.Fatalf("preparation/error = %#v/%v", preparation, err)
-			}
-			execution, err := store.LoadPromptExecution(context.Background(), result.ExecutionPath)
-			if err != nil || execution.Provenance == nil || execution.Provenance.ProfileID != test.profile.ProfileID || execution.Provenance.BackendID != test.profile.BackendID || execution.Provenance.ModelName != test.profile.ModelName {
-				t.Fatalf("execution/error = %#v/%v", execution, err)
-			}
-			for _, path := range []string{result.MetadataPath, result.PreparationPath, result.ExecutionPath} {
-				data, err := os.ReadFile(path)
-				if err != nil || strings.Contains(string(data), "https://") || strings.Contains(string(data), "api_key") {
-					t.Fatalf("ordinary artifact %q leaks sensitive profile details or could not be read: %v", path, err)
-				}
+			if executor.execution == nil || executor.execution.ProfileID != test.profile.ProfileID || executor.execution.BackendID != test.profile.BackendID || executor.execution.ModelName != test.profile.ModelName {
+				t.Fatalf("executed profile = %#v, want %q/%q/%q", executor.execution, test.profile.ProfileID, test.profile.BackendID, test.profile.ModelName)
 			}
 		})
 	}