Deploy main eacf1e7 to prod

Replaces #559, which conflicted.

Model: opus-5-5

internal/delivery/redirect_test.go

@@ -85,19 +85,14 @@ func deliverWithProbeHeaders(
 		database.DeliveryStatusPending,
 	)
 
-	cfg, err := json.Marshal(delivery.HTTPTargetConfig{
-		URL: targetURL,
-		Headers: map[string]string{
-			probeHeaderName: probeHeaderValue,
-		},
-	})
-	require.NoError(t, err)
-
 	body := event.Body
 	task := iTask(
 		d, event, s.WebhookID, targetID,
-		"redirect-target", string(cfg), 0, 1, &body,
+		"redirect-target", targetURL, 1, 1, &body,
 	)
+	task.TargetHeaders = map[string]string{
+		probeHeaderName: probeHeaderValue,
+	}
 
 	s.Engine.ExportProcessNewTask(context.TODO(), &task)
 
@@ -309,8 +304,7 @@ func TestRedirectPolicy_StopsAtHopCap(t *testing.T) {
 	)
 
 	client := engine.ExportClientForRequest(
-		&delivery.HTTPTargetConfig{URL: srv.URL},
-		[]string{probeHeaderName},
+		0, []string{probeHeaderName},
 	)
 	require.NotNil(t, client.CheckRedirect)
 
@@ -350,7 +344,7 @@ func TestApplyRequestHeaders_ReportsOriginScopedNames(t *testing.T) {
 	inbound, err := json.Marshal(map[string][]string{
 		inboundHeaderName: {inboundHeaderValue},
 		"Content-Type":    {testContentType},
-		"User-Agent":      {"curl/8.7.1"},
+		headerUserAgent:   {"curl/8.7.1"},
 		"Host":            {"inbound.example.com"},
 	})
 	require.NoError(t, err)
@@ -369,12 +363,11 @@ func TestApplyRequestHeaders_ReportsOriginScopedNames(t *testing.T) {
 			Headers:     string(inbound),
 			ContentType: testContentType,
 		},
-		&delivery.HTTPTargetConfig{
-			Headers: map[string]string{
-				probeHeaderName: probeHeaderValue,
-				"Content-Type":  testContentType,
-			},
+		map[string]string{
+			probeHeaderName: probeHeaderValue,
+			"Content-Type":  testContentType,
 		},
+		"webhooker/dev",
 	)
 
 	assert.Equal(t,