Handle additional NWS forecast discussion formats

.dockerignore

@@ -1,7 +1,8 @@
 .git
 .gitignore
 **/*.md
+!docs/*.md
+!docs/**/*.md
 dist/
 tmp/
 .DS_Store
-

README.md

@@ -29,8 +29,10 @@ current working directory.
 - [Operations guide](docs/operations.md)
 - [Troubleshooting guide](docs/troubleshooting.md)
 - [Example configs](examples/)
+- [Go consumer guide](docs/consumers/api.md)
 - [Event wire contract](docs/integrations/events.md)
 - [Postgres table contract](docs/integrations/postgres.md)
+- [Feedkit integration notes](docs/integrations/feedkit.md)
 - [NWS integration notes](docs/integrations/nws.md)
 - [SPC integration notes](docs/integrations/spc.md)
 - [Open-Meteo integration notes](docs/integrations/openmeteo.md)

docs/config.md

@@ -147,7 +147,7 @@ URL omits it or sets another unit system.
 
 ## SPC Convective Outlook Params
 
-`spc_convective_outlook` fetches the twelve required Day 1-3 GeoJSON outlook
+`spc_convective_outlook` fetches the nine required Day 1-3 GeoJSON outlook
 products and the three required Day 1-3 print pages as one atomic bundle.
 
 | Param | Required | Description |
@@ -165,8 +165,8 @@ products and the three required Day 1-3 print pages as one atomic bundle.
 
 GeoJSON product keys are `day1_categorical`, `day1_tornado`, `day1_hail`,
 `day1_wind`, `day2_categorical`, `day2_tornado`, `day2_hail`, `day2_wind`,
-`day3_categorical`, `day3_tornado`, `day3_hail`, and `day3_wind`.
+and `day3_categorical`. SPC does not provide Day 3 tornado, hail, or wind
-Discussion keys are `day1`, `day2`, and `day3`.
+GeoJSON products. Discussion keys are `day1`, `day2`, and `day3`.
 
 ```yaml
 sources:

docs/consumers/api.md

@@ -0,0 +1,92 @@
+# Consumer API Guide
+
+## Purpose
+
+This guide is for developers and LLM coding agents integrating `weatherfeeder`
+from another Go codebase.
+
+`weatherfeeder` is primarily a daemon, not an SDK. Its public integration
+surface is intentionally narrow:
+
+- `model`: canonical weather payload structs.
+- `standards`: schema strings, event kind strings, and shared WMO constants.
+- JSON event output from stdout and NATS sinks.
+- Postgres tables written by the optional Postgres sink.
+
+Packages under `internal/` are implementation details and are not public
+integration surfaces.
+
+## Recommended Workflow
+
+Consumers should switch on the event `schema` value and decode `payload` into
+the matching `model` type.
+
+Minimal example:
+
+```go
+package consumer
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"gitea.maximumdirect.net/ejr/weatherfeeder/model"
+	"gitea.maximumdirect.net/ejr/weatherfeeder/standards"
+)
+
+type Event struct {
+	ID      string          `json:"id"`
+	Kind    string          `json:"kind"`
+	Schema  string          `json:"schema"`
+	Payload json.RawMessage `json:"payload"`
+}
+
+func Decode(payload []byte) (any, error) {
+	var evt Event
+	if err := json.Unmarshal(payload, &evt); err != nil {
+		return nil, err
+	}
+
+	switch evt.Schema {
+	case standards.SchemaWeatherObservationV1:
+		var out model.WeatherObservation
+		return &out, json.Unmarshal(evt.Payload, &out)
+	case standards.SchemaWeatherForecastV1:
+		var out model.WeatherForecastRun
+		return &out, json.Unmarshal(evt.Payload, &out)
+	case standards.SchemaWeatherForecastDiscussionV1:
+		var out model.WeatherForecastDiscussion
+		return &out, json.Unmarshal(evt.Payload, &out)
+	case standards.SchemaWeatherStoryV1:
+		var out model.WeatherStoryRun
+		return &out, json.Unmarshal(evt.Payload, &out)
+	case standards.SchemaWeatherAlertV1:
+		var out model.WeatherAlertRun
+		return &out, json.Unmarshal(evt.Payload, &out)
+	case standards.SchemaWeatherOutlookV2:
+		var out model.WeatherOutlookRun
+		return &out, json.Unmarshal(evt.Payload, &out)
+	default:
+		return nil, fmt.Errorf("unsupported weatherfeeder schema %q", evt.Schema)
+	}
+}
+```
+
+## Consumer Responsibilities
+
+- Treat event IDs as opaque.
+- Treat absent `omitempty` fields as unknown, not zero.
+- Prefer schema constants from `standards` over string literals in Go code.
+- Expect canonical numeric measurements to use metric units.
+- Expect canonical timestamps from normalizers to be UTC unless a field-specific
+  contract says otherwise.
+- Handle additive fields within the same schema version.
+- Do not import `internal/...` packages.
+
+## Canonical References
+
+- Public payload package: [`pkg-model.md`](pkg-model.md).
+- Public constants package: [`pkg-standards.md`](pkg-standards.md).
+- JSON event wire contract: [`../integrations/events.md`](../integrations/events.md).
+- Postgres table contract: [`../integrations/postgres.md`](../integrations/postgres.md).
+- Runtime and adapter architecture: [`../policy/architecture.md`](../policy/architecture.md).

docs/consumers/pkg-model.md

@@ -0,0 +1,64 @@
+# Package `model`
+
+## Import Path
+
+```go
+import "gitea.maximumdirect.net/ejr/weatherfeeder/model"
+```
+
+## Purpose
+
+Package `model` defines `weatherfeeder`'s canonical weather payload structs.
+These structs are emitted as the `payload` of canonical `weather.*` events and
+are also the domain types consumed by downstream applications such as
+`weatherapi`.
+
+The JSON field tags on these structs are part of the wire contract. For the full
+field-by-field JSON contract, use the [event wire contract](../integrations/events.md).
+
+## Payload Types
+
+Current canonical schema families map to these public types:
+
+| Schema | Primary type |
+|---|---|
+| `weather.observation.v1` | `WeatherObservation` |
+| `weather.forecast.v1` | `WeatherForecastRun` |
+| `weather.forecast_discussion.v1` | `WeatherForecastDiscussion` |
+| `weather.weather_story.v1` | `WeatherStoryRun` |
+| `weather.alert.v1` | `WeatherAlertRun` |
+| `weather.outlook.v2` | `WeatherOutlookRun` |
+
+Related child types include:
+
+- `WeatherObservationPresentWeather`
+- `WeatherForecastPeriod`
+- `WeatherForecastDiscussionSection`
+- `WeatherStory`
+- `WeatherAlert`
+- `WeatherAlertReference`
+- `WeatherOutlook`
+- `WeatherOutlookDiscussion`
+- `WMOCode`
+
+## Wire And Compatibility Rules
+
+- JSON tags define canonical payload field names.
+- Pointer fields and fields tagged `omitempty` are optional on the wire.
+- Missing optional fields mean unknown or not applicable.
+- Canonical measurements use metric units.
+- Canonical timestamps are `time.Time` values encoded by Go's JSON encoder.
+- Normalized canonical timestamps are UTC unless a field-specific contract says
+  otherwise.
+- Additive fields are compatible within a schema version.
+- Removing, renaming, or changing the meaning of a field requires a new schema
+  identifier.
+
+## Boundaries
+
+`model` should not depend on source adapters, sinks, SQL column names, provider
+HTTP shapes, or runtime configuration.
+
+Consumers should not rely on packages under `internal/...`. Use `model` with
+schema constants from [`standards`](pkg-standards.md) and the JSON contract in
+[`docs/integrations/events.md`](../integrations/events.md).

docs/consumers/pkg-standards.md

@@ -0,0 +1,96 @@
+# Package `standards`
+
+## Import Path
+
+```go
+import "gitea.maximumdirect.net/ejr/weatherfeeder/standards"
+```
+
+## Purpose
+
+Package `standards` defines stable identifiers and shared weather constants used
+by `weatherfeeder` producers and Go consumers.
+
+Use this package when switching on event schemas, comparing event kinds, or
+working with canonical WMO condition codes.
+
+## Event Kind Constants
+
+Current event kind constants are:
+
+| Constant | Value |
+|---|---|
+| `KindObservation` | `observation` |
+| `KindForecast` | `forecast` |
+| `KindForecastDiscussion` | `forecast_discussion` |
+| `KindWeatherStory` | `weather_story` |
+| `KindAlert` | `alert` |
+| `KindOutlook` | `outlook` |
+
+These are plain string constants. Convert them at adapter boundaries when using
+feedkit's `event.Kind` type.
+
+## Canonical Schema Constants
+
+Canonical schemas emitted after normalization:
+
+| Constant | Value |
+|---|---|
+| `SchemaWeatherObservationV1` | `weather.observation.v1` |
+| `SchemaWeatherForecastV1` | `weather.forecast.v1` |
+| `SchemaWeatherForecastDiscussionV1` | `weather.forecast_discussion.v1` |
+| `SchemaWeatherStoryV1` | `weather.weather_story.v1` |
+| `SchemaWeatherAlertV1` | `weather.alert.v1` |
+| `SchemaWeatherOutlookV2` | `weather.outlook.v2` |
+
+Historical canonical schema constant:
+
+| Constant | Value |
+|---|---|
+| `SchemaWeatherOutlookV1` | `weather.outlook.v1` |
+
+## Raw Schema Constants
+
+Raw source schemas emitted by current registered sources:
+
+| Constant | Value |
+|---|---|
+| `SchemaRawNWSObservationV1` | `raw.nws.observation.v1` |
+| `SchemaRawOpenMeteoCurrentV1` | `raw.openmeteo.current.v1` |
+| `SchemaRawOpenWeatherCurrentV1` | `raw.openweather.current.v1` |
+| `SchemaRawNWSHourlyForecastV1` | `raw.nws.hourly.forecast.v1` |
+| `SchemaRawNWSNarrativeForecastV1` | `raw.nws.narrative.forecast.v1` |
+| `SchemaRawNWSForecastDiscussionV1` | `raw.nws.forecast_discussion.v1` |
+| `SchemaRawNWSWeatherStoriesV1` | `raw.nws.weatherstories.v1` |
+| `SchemaRawOpenMeteoHourlyForecastV1` | `raw.openmeteo.hourly.forecast.v1` |
+| `SchemaRawNWSAlertsV1` | `raw.nws.alerts.v1` |
+| `SchemaRawSPCConvectiveOutlookV1` | `raw.spc.convective_outlook.v1` |
+
+Additional raw schema constant:
+
+| Constant | Value |
+|---|---|
+| `SchemaRawOpenWeatherHourlyForecastV1` | `raw.openweather.hourly.forecast.v1` |
+
+`SchemaRawOpenWeatherHourlyForecastV1` exists in code, but no current registered
+source emits it. Consumers should not expect that raw schema unless a later
+registered source documents it as part of the current event contract.
+
+## WMO Constants And Text
+
+`standards` also defines the canonical `WMOCode` vocabulary and text helpers
+used by normalized observations and forecasts.
+
+Consumer guidance:
+
+- Treat `WMOUnknown` as unknown condition data.
+- Observation `conditionCode` is required in the current event contract.
+- Forecast period `conditionCode` is optional because some forecast products do
+  not provide a meaningful WMO condition.
+- Prefer WMO constants and helper functions from this package instead of
+  duplicating code tables in consumers.
+
+## Boundaries
+
+`standards` is provider-agnostic. Provider-specific parsing belongs in
+`weatherfeeder` internals, not in this package and not in consumers.

docs/integrations/events.md

@@ -37,7 +37,7 @@ Canonical schemas emitted after normalization:
 | `forecast_discussion` | `weather.forecast_discussion.v1` | `WeatherForecastDiscussion` |
 | `weather_story` | `weather.weather_story.v1` | `WeatherStoryRun` |
 | `alert` | `weather.alert.v1` | `WeatherAlertRun` |
-| `outlook` | `weather.outlook.v1` | `WeatherOutlookRun` |
+| `outlook` | `weather.outlook.v2` | `WeatherOutlookRun` |
 
 Raw upstream schemas emitted by current sources:
 
@@ -211,8 +211,9 @@ Payload type: `WeatherAlertRun`.
 | `instruction` | string | no | Alert instruction. |
 | `sent` | timestamp | no | Provider sent time. |
 | `effective` | timestamp | no | Effective time. |
-| `onset` | timestamp | no | Onset time. |
+| `onset` | timestamp | no | Alert period start. |
-| `expires` | timestamp | no | Expiration time. |
+| `ends` | timestamp | no | Alert period end. |
+| `expires` | timestamp | no | Provider expiration metadata; not necessarily the alert period end. |
 | `areaDescription` | string | no | Affected area description. |
 | `senderName` | string | no | Provider sender name. |
 | `references` | array | no | Related alerts. |
@@ -220,13 +221,15 @@ Payload type: `WeatherAlertRun`.
 `references[]` entries contain optional `id`, `identifier`, `sender`, and
 `sent` fields.
 
-## `weather.outlook.v1`
+## `weather.outlook.v2`
 
 Payload type: `WeatherOutlookRun`.
 
 The current producer is the SPC convective outlook normalizer. It emits Day 1-3
-convective outlook polygons for categorical, tornado, hail, and wind products.
+convective outlook snapshots for categorical, tornado, hail, and wind products
-All timestamps are UTC.
+that apply to the configured forecast point. Raw SPC bundles remain complete;
+canonical outlook payloads are filtered to local polygons. All timestamps are
+UTC.
 
 | Field | Type | Required | Notes |
 |---|---|:---:|---|
@@ -236,7 +239,8 @@ All timestamps are UTC.
 | `longitude` | number | no | Configured point longitude in decimal degrees. |
 | `asOf` | timestamp | yes | Snapshot time. For SPC, this is the latest outlook issue time when available. |
 | `issuedAt` | timestamp | no | Latest issue time across outlook features when any feature exists. |
-| `outlooks` | array | yes | Ordered outlook polygons. |
+| `outlooks` | array | yes | Ordered outlook polygons containing the configured point. |
+| `discussions` | array | yes | Run-level day discussions for retained outlook days. |
 
 `outlooks[]` entries:
 
@@ -255,19 +259,53 @@ All timestamps are UTC.
 | `issuedAt` | timestamp | yes | Feature issue time. |
 | `expiresAt` | timestamp | yes | Expiration time; currently equal to `validTo`. |
 | `forecaster` | string | no | SPC forecaster text, when present. |
-| `headline` | string | no | Matching Day 1-3 print-page product title. |
-| `summary` | string | no | Text from the print-page `...SUMMARY...` section. |
-| `discussion` | string | no | Cleaned full print-page product text. |
 | `sourceUrl` | string | no | GeoJSON product URL for this outlook feature. |
 | `imageUrl` | string | no | Reserved for provider image URLs; currently empty. |
-| `containsLocation` | boolean | yes | Whether the configured point is inside or on the boundary of the polygon. |
+| `containsLocation` | boolean | yes | Always `true` for emitted v2 outlooks. |
 | `geometry` | object | yes | Compact GeoJSON `Polygon` or `MultiPolygon` geometry. |
 
 `geometry` preserves the SPC feature geometry as compact GeoJSON using
 `[longitude, latitude]` coordinate order. `containsLocation` is computed with
 that geometry and the configured source `latitude`/`longitude`; boundary points
-count as contained. All outlook polygons are emitted, including polygons that do
+count as contained. Polygons that do not contain the configured point are not
-not contain the configured point.
+included in canonical v2 payloads.
+
+`discussions[]` entries:
+
+| Field | Type | Required | Notes |
+|---|---|:---:|---|
+| `day` | integer | yes | SPC outlook day, currently `1`, `2`, or `3`. |
+| `headline` | string | no | Matching Day 1-3 print-page product title. |
+| `summary` | string | no | Text from the print-page `...SUMMARY...` section. |
+| `discussion` | string | no | Cleaned full print-page product text. |
+| `updatedAt` | timestamp | no | Print-page update time, when present. |
+
+When no SPC polygons apply locally, the run is still emitted with `outlooks: []`
+and `discussions: []`. Discussions are included only for days represented by at
+least one retained outlook, and multiple retained outlook types for the same day
+share one discussion entry.
+
+### SPC Outlook Supersession
+
+Consumers should prefer latest-run semantics for current conditions: read the
+latest `WeatherOutlookRun` for the configured location and use its `outlooks`
+and `discussions` arrays together.
+
+Historical SQL consumers that collapse older rows should identify superseded
+outlooks by `provider`, `product`, `outlookType`, `validFrom`, and `validTo`,
+then keep rows with the greatest `issuedAt`. `day` and `label` are not identity
+fields. When multiple retained polygons share that latest `issuedAt`, preserve
+the full group.
+
+## Legacy `weather.outlook.v1`
+
+`weather.outlook.v1` is a historical canonical schema retained as a standards
+constant for older data and consumers. Current SPC normalization emits
+`weather.outlook.v2`.
+
+The v1 payload used `WeatherOutlookRun` and placed `headline`, `summary`, and
+`discussion` on each `outlooks[]` polygon. It also represented the pre-v2 SPC
+canonical behavior, where national polygons were preserved in canonical output.
 
 ## Compact Example
 

docs/integrations/feedkit.md

@@ -0,0 +1,106 @@
+# Feedkit Integration
+
+## Purpose
+
+This document describes the feedkit runtime behavior that `weatherfeeder`
+currently depends on. It is for maintainers and LLM coding agents changing
+runtime wiring, config behavior, source construction, processing, routing, or
+sink behavior.
+
+Weather-domain behavior belongs in `weatherfeeder`. Generic daemon mechanics
+belong to feedkit.
+
+## Current Dependency
+
+`weatherfeeder` imports feedkit as its daemon framework dependency. The exact
+module version is declared in `go.mod`.
+
+Feedkit provides:
+
+- YAML config loading and validation.
+- Source, processor, and sink registries.
+- HTTP source helper behavior.
+- Scheduler polling.
+- Normalize and dedupe processors.
+- Route compilation and sink dispatch.
+- Built-in stdout, NATS, and Postgres sink mechanics.
+
+## Config Contract
+
+`cmd/weatherfeeder` calls feedkit config loading for `config.yml` in the current
+working directory.
+
+Implemented behavior relied on by weatherfeeder docs and tests:
+
+- Top-level config contains `sources`, `sinks`, and optional `routes`.
+- Config struct fields are decoded strictly, so misspelled struct fields fail
+  startup.
+- Driver-specific `params` maps are decoded generically and validated by the
+  source or sink constructor that consumes them.
+- Source `kinds` can be validated against a source's advertised `Kinds()`.
+
+## Source And HTTP Contract
+
+Most weatherfeeder sources use feedkit's single-document HTTP source helper for:
+
+- request construction;
+- `User-Agent` and `Accept` headers;
+- optional conditional GET validators;
+- response body size limits;
+- context-aware HTTP work;
+- unchanged `304 Not Modified` responses that emit no events.
+
+The SPC convective outlook source fetches multiple documents itself, but it uses
+feedkit transport helpers for HTTP clients and response body limits.
+
+## Scheduler And Processing Contract
+
+Weatherfeeder builds feedkit scheduler jobs from source configs. Current source
+drivers are polling drivers and use the configured `every` interval.
+
+Events flow through a feedkit pipeline in this order:
+
+1. normalize processor;
+2. dedupe processor.
+
+The normalize processor is configured with `RequireMatch=false`, so unmatched
+schemas pass through unchanged. Weatherfeeder registers its built-in normalizers
+and owns the provider-to-canonical mapping.
+
+The dedupe processor stores a bounded in-memory set of recent event IDs. The
+bound is configured in `cmd/weatherfeeder`.
+
+## Dispatch And Sink Contract
+
+Feedkit compiles routes from config and dispatches processed events to matching
+sinks. If `routes` is omitted, every configured sink receives every event kind.
+
+Feedkit owns sink fanout mechanics, per-sink workers, queueing, context-aware
+shutdown, and sink error logging. Weatherfeeder owns the event kinds and schemas
+that make routes meaningful.
+
+Built-in feedkit sinks used by weatherfeeder:
+
+- `stdout`: validates and writes JSON events to stdout.
+- `nats`: publishes JSON events to a configured subject.
+- generic `postgres` sink factory: opens the database, ensures tables/indexes,
+  runs transactions, inserts mapped rows, and prunes when configured.
+
+Weatherfeeder supplies its Postgres table schema and event mapper to feedkit's
+Postgres sink factory. The table contract is documented in
+[`postgres.md`](postgres.md).
+
+## Boundaries
+
+Do not move weather-domain policy into feedkit. Weatherfeeder owns:
+
+- provider source drivers;
+- raw and canonical schema constants;
+- event kind meaning;
+- canonical payload structs;
+- normalizers;
+- Postgres table shape and row mapping.
+
+Do not duplicate generic feedkit mechanics in weatherfeeder unless there is a
+narrow weather-specific reason. Runtime composition details are documented in
+[`../internal/runtime.md`](../internal/runtime.md).

docs/integrations/nws.md

@@ -44,6 +44,9 @@ normalizer uses fields under `properties` such as `stationId`, `stationName`,
 `nws_alerts` expects an alerts FeatureCollection. The normalizer uses the
 collection `updated` timestamp, `title`, each feature ID, alert classification
 fields, narrative fields, timing fields, sender fields, and references.
+`properties.onset` and `properties.ends` map to the canonical alert period
+start and end. `properties.expires` maps only to canonical `expires` provider
+metadata and is not treated as the alert period end.
 
 `nws_forecast_hourly` and `nws_forecast_narrative` expect gridpoint forecast
 GeoJSON with `properties.generatedAt`, `properties.updateTime`, elevation,
@@ -98,8 +101,9 @@ unset. Forecast temperatures are converted to Celsius when NWS supplies
 Fahrenheit, and wind speed strings are converted to kilometers per hour.
 
 Alert timing fields are parsed best-effort. Invalid per-alert timestamps are
-left unset rather than failing the whole alert run. Missing alert IDs are
+left unset rather than failing the whole alert run. NWS `ends` is preserved
-synthesized from the run snapshot time and array position.
+separately from `expires`; `expires` does not fall back to `ends`. Missing alert
+IDs are synthesized from the run snapshot time and array position.
 
 Forecast discussion parsing requires an issue time. Weather story entries require
 start time, end time, and update time.

docs/integrations/postgres.md

@@ -23,7 +23,7 @@ Events are mapped only for canonical weather schemas:
 - `weather.forecast_discussion.v1`
 - `weather.weather_story.v1`
 - `weather.alert.v1`
-- `weather.outlook.v1`
+- `weather.outlook.v2`
 
 Unsupported schemas produce no writes for this sink. Mapped events are inserted
 transactionally. Inserts use ordinary `INSERT`; duplicate primary keys fail the
@@ -59,6 +59,7 @@ Parent tables store the feed event envelope:
 | `alert_references` | `run_event_id`, `alert_index`, `reference_index` | `as_of` |
 | `outlook_runs` | `event_id` | `as_of` |
 | `outlooks` | `run_event_id`, `outlook_index` | `as_of` |
+| `outlook_discussions` | `run_event_id`, `discussion_index` | `as_of` |
 
 ## Table Contract
 
@@ -352,6 +353,7 @@ Indexes:
 | `sent` | `TIMESTAMPTZ` | yes | `payload.alerts[].sent` |
 | `effective` | `TIMESTAMPTZ` | yes | `payload.alerts[].effective` |
 | `onset` | `TIMESTAMPTZ` | yes | `payload.alerts[].onset` |
+| `ends` | `TIMESTAMPTZ` | yes | `payload.alerts[].ends` |
 | `expires` | `TIMESTAMPTZ` | yes | `payload.alerts[].expires` |
 | `area_description` | `TEXT` | yes | `payload.alerts[].areaDescription` |
 | `sender_name` | `TEXT` | yes | `payload.alerts[].senderName` |
@@ -408,6 +410,7 @@ Indexes:
 | `as_of` | `TIMESTAMPTZ` | no | `payload.asOf` |
 | `issued_at` | `TIMESTAMPTZ` | yes | `payload.issuedAt` |
 | `outlook_count` | `INTEGER` | no | `len(payload.outlooks)` |
+| `discussion_count` | `INTEGER` | no | `len(payload.discussions)` |
 
 ### `outlooks`
 
@@ -442,14 +445,36 @@ Indexes:
 | `issued_at` | `TIMESTAMPTZ` | no | `payload.outlooks[].issuedAt` |
 | `expires_at` | `TIMESTAMPTZ` | no | `payload.outlooks[].expiresAt` |
 | `forecaster` | `TEXT` | yes | `payload.outlooks[].forecaster` |
-| `headline` | `TEXT` | yes | `payload.outlooks[].headline` |
-| `summary` | `TEXT` | yes | `payload.outlooks[].summary` |
-| `discussion` | `TEXT` | yes | `payload.outlooks[].discussion` |
 | `source_url` | `TEXT` | yes | `payload.outlooks[].sourceUrl` |
 | `image_url` | `TEXT` | yes | `payload.outlooks[].imageUrl` |
 | `contains_location` | `BOOLEAN` | no | `payload.outlooks[].containsLocation` |
 | `geometry_json` | `TEXT` | no | Compact JSON from `payload.outlooks[].geometry` |
 
+### `outlook_discussions`
+
+Primary key: `run_event_id`, `discussion_index`
+
+Prune column: `as_of`
+
+Foreign key: `run_event_id` references `outlook_runs(event_id)` with cascade
+delete.
+
+Indexes:
+
+- `idx_wf_outlook_discussions_day_as_of` on `day`, `as_of`
+- unique `idx_wf_outlook_discussions_run_day` on `run_event_id`, `day`
+
+| Column | Type | Null | Source |
+|---|---|:---:|---|
+| `run_event_id` | `TEXT REFERENCES outlook_runs(event_id) ON DELETE CASCADE` | no | Parent event ID. |
+| `discussion_index` | `INTEGER` | no | `payload.discussions[]` index. |
+| `as_of` | `TIMESTAMPTZ` | no | Parent `payload.asOf` |
+| `day` | `INTEGER` | no | `payload.discussions[].day` |
+| `headline` | `TEXT` | yes | `payload.discussions[].headline` |
+| `summary` | `TEXT` | yes | `payload.discussions[].summary` |
+| `discussion` | `TEXT` | yes | `payload.discussions[].discussion` |
+| `updated_at` | `TIMESTAMPTZ` | yes | `payload.discussions[].updatedAt` |
+
 ## Retention
 
 When sink param `prune` is set, every successful write transaction deletes rows
@@ -472,5 +497,6 @@ binary does not provide CLI commands for them.
 - `WeatherAlertRun`: read `alert_runs`, join `alerts` by `run_event_id` ordered
   by `alert_index`, then join `alert_references` by `run_event_id` and
   `alert_index` ordered by `reference_index`.
-- `WeatherOutlookRun`: read `outlook_runs`, then join `outlooks` by
+- `WeatherOutlookRun`: read `outlook_runs`, join `outlooks` by `run_event_id`
-  `run_event_id` ordered by `outlook_index`.
+  ordered by `outlook_index`, then join `outlook_discussions` by
+  `run_event_id` ordered by `discussion_index`.

docs/integrations/spc.md

@@ -13,7 +13,7 @@ events are documented in [event wire contract](events.md).
 
 | Driver | Kind | Raw schema | Canonical schema |
 | --- | --- | --- | --- |
-| `spc_convective_outlook` | `outlook` | `raw.spc.convective_outlook.v1` | `weather.outlook.v1` |
+| `spc_convective_outlook` | `outlook` | `raw.spc.convective_outlook.v1` | `weather.outlook.v2` |
 
 ## Config Requirements
 
@@ -39,11 +39,11 @@ current Day 1-3 SPC product URLs.
 
 ## Upstream Products Used
 
-The source fetches twelve required GeoJSON products every poll:
+The source fetches nine required GeoJSON products every poll:
 
 - Day 1 categorical, tornado, hail, and wind
 - Day 2 categorical, tornado, hail, and wind
-- Day 3 categorical, tornado, hail, and wind
+- Day 3 categorical
 
 It also fetches three required print pages:
 
@@ -52,8 +52,8 @@ It also fetches three required print pages:
 - Day 3 convective outlook print page
 
 GeoJSON products are authoritative for outlook polygons, valid windows, issue
-times, labels, and severity rank. Print pages are authoritative for headline,
+times, labels, and severity rank. Print pages are authoritative for run-level
-summary, and discussion text.
+day discussion headline, summary, and discussion text.
 
 ## Accept Headers
 
@@ -99,23 +99,33 @@ Raw source `effective_at` prefers:
 4. fetch time.
 
 The normalizer sets canonical `asOf` and normalized event `effective_at` from
-the latest valid outlook feature `issuedAt`, with fallback to print-page update
+the latest valid GeoJSON issue time across the complete raw bundle, including
-time and then the incoming event envelope.
+empty no-risk placeholders, with fallback to print-page update time and then the
+incoming event envelope.
 
 ## Mapping Notes
 
-Each GeoJSON feature becomes one canonical outlook. Products are ordered by day,
+The raw source fetches and envelopes the complete SPC bundle. The normalizer
-then categorical, tornado, hail, and wind. Feature order is preserved within
+decodes every configured GeoJSON product, skips empty no-risk
-each product.
+`GeometryCollection` placeholders, and emits canonical outlooks only when the
+configured point is inside or on the boundary of a real feature. Products are
+ordered by day, then categorical, tornado, hail, and wind. Retained feature order
+is preserved within each product.
 
 The normalizer computes `containsLocation` with the configured latitude and
 longitude against compact GeoJSON `Polygon` or `MultiPolygon` geometry.
 Coordinates use GeoJSON order, `[longitude, latitude]`, and boundary points
 count as contained.
 
-All outlook polygons are preserved, including polygons that do not contain the
+Canonical outlook runs are emitted even when no polygons apply locally. In that
-configured point. Matching print-page headline, summary, and discussion text is
+case the payload contains empty `outlooks` and `discussions` arrays.
-attached to every outlook for the same day.
+
+Print-page prose is represented as run-level day discussions. Discussions are
+included only for days represented by at least one retained outlook. Multiple
+retained outlook types for the same day share one discussion entry.
+
+For downstream current-state and historical supersession guidance, see the
+[event wire contract](events.md#spc-outlook-supersession).
 
 ## Failure Behavior
 

docs/internal/normalizers.md

@@ -27,7 +27,7 @@ Current mappings:
 | `raw.nws.forecast_discussion.v1` | `weather.forecast_discussion.v1` |
 | `raw.nws.weatherstories.v1` | `weather.weather_story.v1` |
 | `raw.nws.alerts.v1` | `weather.alert.v1` |
-| `raw.spc.convective_outlook.v1` | `weather.outlook.v1` |
+| `raw.spc.convective_outlook.v1` | `weather.outlook.v2` |
 
 ## Boundaries
 
@@ -59,13 +59,13 @@ Weatherfeeder registers normalizers in a stable order:
 
 The current normalizers avoid ambiguous matches by using schema equality.
 
-The SPC outlook normalizer decodes the raw multi-document bundle, maps each
+The SPC outlook normalizer decodes the raw multi-document bundle, maps
-GeoJSON feature to a canonical outlook, and enriches all outlooks for a day with
+location-containing GeoJSON features to canonical outlooks, and adds one
-the matching print-page headline, summary, and discussion. It preserves compact
+run-level print-page discussion per retained outlook day. It preserves compact
 GeoJSON feature geometry and computes `containsLocation` with
 `internal/geo.ContainsPoint` using the source-configured point. Boundary points
-count as contained, and all polygons are preserved whether or not they contain
+count as contained. Polygons that do not contain the point are omitted from the
-the point.
+canonical run.
 
 ## State
 

docs/internal/postgres-sink.md

@@ -19,11 +19,16 @@ Inputs are canonical feed events. The mapper currently handles these schemas:
 - `weather.forecast_discussion.v1`
 - `weather.weather_story.v1`
 - `weather.alert.v1`
-- `weather.outlook.v1`
+- `weather.outlook.v2`
 
 Outputs are feedkit `PostgresWrite` values for weatherfeeder-owned tables.
 Unsupported schemas produce no writes and no error.
 
+Outlook runs are written to `outlook_runs`, retained local polygons are written
+to `outlooks`, and run-level day discussions are written to
+`outlook_discussions`. The parent run row stores `outlook_count` and
+`discussion_count`.
+
 ## Boundaries
 
 - Weatherfeeder owns table definitions in `schema.go`.
@@ -82,6 +87,7 @@ Child rows use positional indexes to preserve canonical array order:
 - `alert_index`
 - `reference_index`
 - `outlook_index`
+- `discussion_index`
 
 Required canonical fields are validated before writes are returned:
 
@@ -94,7 +100,10 @@ Required canonical fields are validated before writes are returned:
 - alert runs require `asOf`, and each alert requires `id`;
 - outlook runs require `asOf`, and each outlook requires `id`, `provider`,
   `product`, `day`, `outlookType`, `label`, `validFrom`, `validTo`, `issuedAt`,
-  `expiresAt`, and `geometry`.
+  `expiresAt`, `containsLocation: true`, and `geometry`;
+- outlook discussions require day `1`, `2`, or `3`; at least one of
+  `headline`, `summary`, or `discussion`; and no duplicate discussion day in the
+  same run.
 
 Nullable canonical values are converted to SQL nulls by mapper helpers.
 Observation present-weather raw values and outlook geometry values are stored as

docs/internal/runtime.md

@@ -68,6 +68,21 @@ Runtime composition uses feedkit for:
 
 Weatherfeeder registers its own source drivers and its Postgres schema mapper.
 
+Responsibility split:
+
+| Runtime concern | Owner |
+| --- | --- |
+| Config loading and generic validation | feedkit |
+| Source, processor, and sink registries | feedkit mechanics; weatherfeeder registrations |
+| Source polling and stream supervision | feedkit scheduler |
+| Raw weather data fetching | weatherfeeder source adapters |
+| Normalizer execution order and pass-through behavior | feedkit normalize processor |
+| Weather raw-to-canonical mapping | weatherfeeder normalizers |
+| Dedupe mechanics | feedkit dedupe processor |
+| Route compilation and sink fanout | feedkit dispatch |
+| Weather Postgres table shape and row mapping | weatherfeeder Postgres adapter |
+| Postgres connection, DDL, inserts, transactions, and pruning | feedkit Postgres sink |
+
 ## State
 
 Weatherfeeder-owned runtime state is in process:

docs/operations.md

@@ -82,7 +82,7 @@ document bodies as the previous successful poll.
 
 Every event passes through normalization first and dedupe second.
 
-Normalizers match raw source schemas and produce canonical `weather.*.v1`
+Normalizers match raw source schemas and produce versioned canonical `weather.*`
 payloads. If an event has no matching normalizer, the normalize processor passes
 it through unchanged.
 

docs/policy/architecture.md

@@ -23,10 +23,32 @@ The implemented runtime flow is:
 
 Canonical payload structs live in `model`. Schema identifiers and cross-provider wire conventions live in `standards`. Source adapters live under `internal/sources`. Normalizers live under `internal/normalizers`. Provider-specific parsing helpers shared by sources and normalizers live under `internal/providers`. Sink-specific persistence mapping lives under `internal/sinks`.
 
+## Architecture Style
+
+`weatherfeeder` uses a pragmatic ports-and-adapters architecture rather than a
+formal framework. Provider APIs, config loading, scheduling, dispatch, and sinks
+sit outside the weather domain model and normalization rules.
+
+The implementation style is:
+
+- Pipeline-oriented: events flow from source polling through normalization,
+  dedupe, routing, and sink fanout.
+- Schema-routed: normalizers select raw payloads by explicit schema strings, not
+  source names or configured routes.
+- Provider-isolated: NWS, Open-Meteo, OpenWeather, and SPC quirks stay in
+  provider-specific source, provider-helper, and normalizer packages.
+- Registry-based: built-in source drivers, normalizers, processors, and sinks
+  are assembled explicitly through registries instead of dynamic plugin loading.
+- Adapter-clean: persistence and external-system details stay behind source and
+  sink adapters, not in `model` or normalizers.
+- Direct Go: prefer small package-level constructors and straightforward code
+  over broad abstractions.
+
 ## Core Design Principles
 
 - Hexagonal boundaries: provider APIs, config loading, scheduling, dispatch, and sinks are external mechanisms around the weather domain model and normalization logic.
 - Raw-to-canonical flow: sources should fetch and envelope raw provider payloads; normalizers should own provider-to-canonical mapping.
+- Location-focused canonical data: canonical weather events represent data relevant to the configured forecast location or configured provider object; `weatherfeeder` is not a national provider-data archive.
 - Schema-based routing: normalizers match on event schema, not source name or event kind.
 - Composable registries: source drivers, normalizers, processors, and sinks are assembled explicitly through registries.
 - Bounded concurrency: scheduling and sink fanout are concurrent, but the application should keep queues, goroutine ownership, logging, and cancellation behavior visible.
@@ -57,6 +79,23 @@ Tests and examples:
 - The sample `cmd/weatherfeeder/config.yml` is executable test input and is load-tested.
 - Tests should keep exercising package contracts directly rather than relying only on full-daemon execution.
 
+## Feedkit Boundary
+
+`feedkit` provides reusable daemon infrastructure. `weatherfeeder` provides the
+weather-domain adapters, models, schemas, and mapping policy.
+
+| Area | Feedkit owns | Weatherfeeder owns |
+| --- | --- | --- |
+| Config | Generic YAML shape: sources, sinks, routes, modes, cadence, and params. | Driver-specific config rules such as NWS `user_agent`, OpenWeather `units=metric`, and SPC coordinates. |
+| Events | Domain-agnostic event envelope: ID, kind, source, emitted/effective times, schema, and payload. | Event kind meaning, schema strings, and canonical weather payloads. |
+| Sources | Source interfaces, registry, expected-kind validation, HTTP helper, and default event ID helper. | NWS/Open-Meteo/OpenWeather/SPC source drivers and raw schema emission. |
+| Processing | Processor registry, normalize processor, dedupe processor, and pipeline execution. | Weather normalizers and schema-specific raw-to-canonical mapping. |
+| Dispatch | Route compilation and sink fanout mechanics. | Which weather event kinds are configured and meaningful. |
+| Sinks | Generic stdout, NATS, and Postgres sink mechanics. | Weather-specific Postgres schema and canonical event-to-row mapping. |
+
+Do not move weather-domain policy into `feedkit`, and do not duplicate generic
+daemon mechanics in `weatherfeeder` when feedkit already provides the boundary.
+
 ## Modules Or Processing Steps
 
 The implemented processing steps are source polling, normalization, dedupe, and sink dispatch.

docs/policy/development.md

@@ -24,7 +24,8 @@ docs, not here.
   normalizers.
 - `internal/sinks/postgres/`: weatherfeeder-owned Postgres schema and canonical
   event mapper.
-- `docs/`: current behavior, policies, integration contracts, and roadmap files.
+- `docs/`: current behavior, consumer guides, integration contracts, policies,
+  and roadmap files.
 - `examples/`: maintained, copyable configuration examples.
 
 ## Build And Test
@@ -70,6 +71,32 @@ Use fixtures, local test servers, and package-level tests.
 - Prefer explicit registries and small package-level constructors over hidden
   global behavior.
 
+## Architecture-Preserving Changes
+
+When changing `weatherfeeder`, preserve the split between feedkit
+infrastructure and weather-domain behavior.
+
+Do:
+
+- keep generic scheduling, dispatch, processor, config, and sink mechanics in
+  feedkit;
+- keep weather provider rules in source adapters, provider helpers, and
+  normalizers;
+- keep canonical weather payloads in `model` and schema/wire identifiers in
+  `standards`;
+- keep Postgres table and row mapping under `internal/sinks/postgres`;
+- use explicit registries for built-in sources and normalizers.
+
+Do not:
+
+- move provider parsing, WMO mapping, or canonical weather policy into
+  `cmd/weatherfeeder`;
+- move weather-specific constants, schemas, or validation rules into feedkit;
+- put database column metadata or sink-specific tags on canonical model structs;
+- replace explicit registries with dynamic plugin loading;
+- introduce broad abstractions when a small provider-specific helper preserves
+  clarity.
+
 ## Dependency Policy
 
 Prefer the Go standard library unless a dependency materially improves
@@ -183,6 +210,7 @@ When behavior changes, update the canonical docs in the same change:
 - CLI behavior: `docs/cli.md`;
 - operations and recovery: `docs/operations.md`;
 - troubleshooting: `docs/troubleshooting.md`;
+- public Go package consumption: `docs/consumers/`;
 - external contracts: `docs/integrations/`;
 - internal component behavior: `docs/internal/`;
 - copyable configs: `examples/`.

docs/policy/documentation.md

@@ -2,12 +2,13 @@
 
 ## Purpose
 
-Project documentation must help four audiences:
+Project documentation must help five audiences:
 
 1. users who need to run the application;
 2. administrators/operators who need to configure and operate it;
 3. developers who need to understand and change it safely;
-4. LLM coding agents that need clear scope, boundaries, and invariants.
+4. LLM coding agents that need clear scope, boundaries, and invariants;
+5. developers and LLM coding agents integrating this project from another codebase.
 
 Docs should be accurate, concise, task-oriented, and organized by audience. Prefer links to canonical docs over repetition.
 
@@ -42,11 +43,14 @@ Canonical homes:
 
 - project purpose and quickstart: `README.md`
 - development principles: `docs/policy/architecture.md`
+- public HTTP API reference: `docs/api.md`
 - configuration reference: `docs/config.md`
 - CLI reference: `docs/cli.md`
 - operations and recovery: `docs/operations.md`
 - troubleshooting: `docs/troubleshooting.md`
+- public API/package consumer guidance: `docs/consumers/`
 - implemented internals: `docs/internal/`
+- external protocol, service, and file-format contracts: `docs/integrations/`
 - future work: `docs/roadmap/`
 - contributor workflow: `docs/policy/development.md`
 - copyable examples: `examples/`
@@ -106,7 +110,7 @@ Recommended:
 - `examples/`
 - `docs/policy/development.md`
 
-### Modular, staged, service-oriented, or orchestration application
+### Modular, service-oriented, or orchestration application
 
 Required:
 - `docs/cli.md`, if CLI-based
@@ -119,6 +123,31 @@ Recommended:
 - `docs/troubleshooting.md`
 - validated examples under `examples/`
 
+### Public HTTP API service
+
+Required:
+- `docs/api.md`
+- `docs/cli.md`, if CLI-based
+- `docs/config.md`, if config-driven
+- `docs/operations.md`
+- `docs/internal/`
+- `docs/policy/development.md`
+
+Recommended:
+- `docs/troubleshooting.md`
+- `docs/consumers/`, for task-oriented client integration guides
+- `docs/integrations/`, for upstream/downstream service contracts
+- validated examples under `examples/`
+
+### Project with public packages or consumer APIs
+
+Required:
+- `docs/consumers/api.md`
+- one `docs/consumers/pkg-<name>.md` file per public package, if public packages exist
+
+Recommended:
+- copyable consumer examples under `examples/`, if practical
+
 ## Required Documents
 
 ### README.md
@@ -161,6 +190,32 @@ It should include:
 
 For small projects, this file may be brief. It may simply state that the project is intentionally narrow, monolithic, and dependency-light.
 
+### docs/api.md
+
+**Audience:** external HTTP API consumers, developers, LLM coding agents integrating by HTTP
+
+Required for projects whose primary public interface is HTTP.
+
+`docs/api.md` is the canonical public HTTP API contract. It should be normative for external consumers and should not be duplicated by README, operations docs, consumer guides, or integration docs.
+
+It should include:
+
+1. base URL conventions;
+2. authentication and authorization behavior, if implemented;
+3. response envelope;
+4. supported media types and content negotiation behavior;
+5. shared query parameters;
+6. endpoint reference grouped by route family;
+7. request parameters and validation rules;
+8. response fields, units, nullability, and optionality;
+9. error response shape and status codes;
+10. pagination, caching, rate-limit, idempotency, and retry behavior, if implemented;
+11. compact request and response examples.
+
+It must document only implemented endpoints and behavior. Planned endpoints, proposed fields, future filters, and experimental response shapes belong only under `docs/roadmap/`.
+
+For HTTP API projects, `docs/consumers/` may provide task-oriented client integration guides, but those guides should link to `docs/api.md` for the authoritative endpoint contract.
+
 ### docs/policy/development.md
 
 **Audience:** developers, LLM coding agents
@@ -175,7 +230,7 @@ It should include:
 - dependency policy;
 - how to add config fields;
 - how to add CLI flags;
-- how to add stages/modules/adapters, if applicable;
+- how to add modules or adapters, if applicable;
 - how to update examples;
 - documentation update expectations.
 
@@ -216,7 +271,7 @@ Explain when commands are useful, not just their syntax.
 
 **Audience:** administrators, operators
 
-Required for applications that maintain state, support resume behavior, run multiple stages, write durable artifacts, use remote storage, or require recovery procedures.
+Required for applications that maintain state, support resume behavior, run multi-step workflows, write durable artifacts, use remote storage, or require recovery procedures.
 
 It should cover:
 
@@ -244,11 +299,40 @@ Each entry should include:
 - safe fix;
 - relevant links.
 
+### docs/consumers/
+
+**Audience:** developers and LLM coding agents integrating this project from another codebase
+
+Required for projects with public packages, SDKs, client APIs, plugin APIs, or other application-facing integration surfaces.
+
+This directory describes how an external codebase should consume the project's public API. It should be task-oriented and copyable where useful. It is not the place for internal implementation details or operator procedures.
+
+For projects whose public API is HTTP, `docs/consumers/` is not required, and it should not duplicate the endpoint reference in `docs/api.md`. If present, it may provide practical integration workflows, client-specific examples, or migration notes that link back to `docs/api.md`.
+
+`docs/consumers/api.md` should provide the consumer-facing overview and primary implementation workflow. It should include:
+
+1. intended consumer audience and use cases;
+2. required inputs supplied by operators or deployment configuration;
+3. recommended public package or API workflow;
+4. minimal copyable example;
+5. consumer responsibilities and boundaries;
+6. retry, idempotency, or status behavior, if applicable;
+7. links to package-specific docs and canonical integration contracts.
+
+Package-specific docs should be named `pkg-<name>.md` and should include:
+
+1. import path;
+2. intended use cases;
+3. primary types and functions needed by consumers;
+4. minimal examples;
+5. validation, error, retry, and boundary behavior;
+6. links to canonical file-format or wire-protocol contracts.
+
 ### docs/internal/
 
 **Audience:** developers, LLM coding agents
 
-Required for modular, staged, service-oriented, or orchestration projects.
+Required for modular, service-oriented, or orchestration projects.
 
 This directory describes implemented internal components. It is not the roadmap.
 
@@ -289,7 +373,9 @@ Roadmap docs should not be confused with current behavior.
 
 Required for projects that depend on external CLIs, APIs, services, protocols, or file formats where the integration contract is important to maintain.
 
-This directory contains concise, versioned reference notes for external integration contracts. It should document only the parts of the external system that this project actually uses.
+This directory contains concise, versioned reference notes for external integration contracts. It should document only the parts of the external system that this project actually uses or exposes.
+
+For public HTTP API services, `docs/integrations/` should document upstream, downstream, storage, protocol, or runtime contracts that the service depends on or bridges. It should not become a second copy of the public HTTP endpoint reference; that belongs in `docs/api.md`.
 
 Use one file per integration where useful.
 
@@ -346,8 +432,10 @@ Before merging documentation changes, verify:
 
 - README is concise and orientation-focused.
 - `docs/policy/architecture.md` describes development principles.
+- `docs/api.md` is the canonical HTTP contract for HTTP API services.
 - Future work appears only under `docs/roadmap/`.
 - User-facing docs avoid unnecessary internals.
+- Consumer-facing docs explain public APIs without duplicating HTTP endpoint or integration contracts.
 - Developer-facing docs preserve boundaries and invariants.
 - Config examples match the schema.
 - CLI examples match real commands and flags.

docs/roadmap/audit.md

@@ -1,558 +0,0 @@
-# Code Quality And Deduplication Audit
-
-## Executive Summary
-
-`weatherfeeder` is in good shape for a limited cleanup pass before the next major release. The current architecture is coherent: runtime composition is thin, provider fetching lives in source adapters, provider-specific parsing lives under `internal/providers`, canonical mapping lives in normalizers, and Postgres persistence is isolated under `internal/sinks/postgres`.
-
-The codebase does not show a major architectural risk that would require broad redesign. Most duplication is the predictable result of recent feature growth across sources, canonical payloads, and persistence tables. The highest-value cleanup should be narrow and behavior-preserving.
-
-Top refactoring targets:
-
-1. Source adapter HTTP/config scaffolding: single-document sources and the SPC multi-document source share config, request, effective-time, and event-envelope policy in similar but not identical forms.
-2. Postgres mapper boilerplate: parent envelope columns, UTC/null conversion, required-field checks, and child-row construction are repeated across every canonical product mapper.
-3. Event kind and driver-name strings: event kinds and source driver names are repeated across registries, source implementations, tests, examples, and docs without code constants comparable to the centralized schema constants.
-
-Recommended posture: perform a limited cleanup pass in small commits. Avoid broad framework changes, generic workflow engines, plugin systems, or ORM-like abstractions.
-
-## Repository Map Reviewed
-
-Inspected directories and packages:
-
-- `cmd/weatherfeeder`: runtime composition, sample config, config-load and pipeline tests.
-- `internal/sources`: source registry and provider source adapters for NWS, Open-Meteo, OpenWeather, and SPC.
-- `internal/providers`: provider-specific parsing helpers for NWS, Open-Meteo, OpenWeather, and SPC.
-- `internal/normalizers`: built-in normalizer registration, common helpers, and provider normalizers.
-- `internal/sinks/postgres`: weatherfeeder-owned table schema and canonical-event mapper.
-- `internal/geo`: point-in-geometry helper used by SPC outlook normalization.
-- `model`: canonical payload structs.
-- `standards`: schema and WMO constants.
-- `examples`: maintained config examples.
-- `docs`: policy, config, CLI, operations, troubleshooting, internal docs, integration docs, and `docs/roadmap/future.md`.
-
-Major execution paths reviewed:
-
-- daemon startup from `cmd/weatherfeeder/main.go`;
-- source driver registration and source construction;
-- source polling for single-document HTTP products and SPC multi-document bundles;
-- normalizer registration and raw-schema dispatch;
-- raw-to-canonical mapping for observations, forecasts, discussions, weather stories, alerts, and outlooks;
-- Postgres schema and write mapping;
-- maintained config loading tests.
-
-Important areas not deeply inspected:
-
-- Feedkit internals were not audited because they are a dependency and outside this repository's ownership boundary.
-- Live upstream service behavior was not tested; this audit used local source inspection, fixtures, and existing docs.
-- Full test execution was not run because this is a report-only task and no code behavior changed.
-
-## High-Confidence Deduplication Opportunities
-
-### 1. Centralize Repeated Source HTTP And Config Scaffolding
-
-Affected files/packages:
-
-- `internal/sources/nws/observation.go`
-- `internal/sources/nws/alerts.go`
-- `internal/sources/nws/forecast_common.go`
-- `internal/sources/nws/forecast_discussion.go`
-- `internal/sources/nws/weatherstories.go`
-- `internal/sources/openmeteo/observation.go`
-- `internal/sources/openmeteo/forecast.go`
-- `internal/sources/openweather/observation.go`
-- `internal/sources/spc/convective_outlook.go`
-- `docs/internal/sources.md`
-- `docs/config.md`
-
-Duplicated or near-duplicated behavior:
-
-- Most sources wrap `fksources.NewHTTPSource`, implement `Name`, advertise one `Kinds` value, fetch raw content if changed, compute `effectiveAt`, call `DefaultEventID`, and emit a single event.
-- The SPC source cannot use `HTTPSource` directly because it fetches an atomic multi-document bundle, but it repeats the same user-agent, HTTP timeout, body limit, request accept header, and unchanged-content policy at a lower level through `transport.FetchBodyWithLimit`.
-- HTTP config params are documented as shared, but source construction has no weatherfeeder-owned helper for the common param names and error shape when a source cannot use `HTTPSource`.
-
-Why it matters:
-
-- Adding future providers or multi-document products increases the chance of drift in `user_agent`, `http_timeout`, `http_response_body_limit_bytes`, body-limit, and error-message behavior.
-- The single-document and SPC paths both implement operator-facing HTTP policy, but the shared policy is visible only in docs and feedkit conventions.
-- Bug fixes to source envelope construction or shared HTTP params would likely need multiple package edits.
-
-Recommended refactor:
-
-- Add a small source-internal helper package or file, for example `internal/sources/sourceconfig` or `internal/sources/internal/httpconfig`, that owns weatherfeeder-specific HTTP param extraction for sources that cannot directly use `fksources.NewHTTPSource`.
-- Keep `fksources.NewHTTPSource` as the implementation for simple sources. Do not replace it with a custom framework.
-- Add a helper for common single-event envelope construction only if it remains explicit about `kind`, `source`, `schema`, `eventID`, `emittedAt`, `effectiveAt`, and payload. Avoid hiding provider-specific effective-time selection.
-- For SPC, replace local parsing of `user_agent`, `http_timeout`, and `http_response_body_limit_bytes` with the shared helper while preserving its atomic multi-fetch and hash semantics.
-
-Suggested tests:
-
-- Add helper-level tests for param aliases, positive timeout/body-limit validation, missing `user_agent`, and error messages.
-- Keep existing source tests for emitted kind/schema/effective time unchanged.
-- Add one SPC constructor test that proves shared timeout/body-limit validation still applies.
-
-Risk level: Low to Medium. The behavior is straightforward, but source constructor errors are user-facing and should be protected by tests.
-
-### 2. Reduce Postgres Mapper Boilerplate Without Creating An ORM
-
-Affected files/packages:
-
-- `internal/sinks/postgres/map.go`
-- `internal/sinks/postgres/schema.go`
-- `internal/sinks/postgres/map_test.go`
-- `internal/sinks/postgres/schema_test.go`
-- `docs/internal/postgres-sink.md`
-- `docs/integrations/postgres.md`
-
-Duplicated or near-duplicated behavior:
-
-- Every parent table mapper repeats the same event envelope columns: `event_id`, `event_kind`, `event_source`, `event_schema`, `event_emitted_at`, and `event_effective_at`.
-- Every run mapper follows the same pattern: decode payload, validate required run time/product fields, normalize to UTC, write one parent row, then write child rows with positional indexes.
-- Nullable conversion helpers already exist, but each mapper repeats the same map literal shape and required-field error phrasing.
-- Schema definitions repeat the same envelope column declarations across parent tables.
-
-Why it matters:
-
-- The mapper is now the largest concentration of cross-product persistence policy. As more canonical products are added, missing an envelope column, count field, UTC conversion, or required-field check becomes easier.
-- Recent SPC work showed that canonical fields can be accidentally omitted from persistence even when the model and docs are correct.
-- Refactoring this area would reduce maintenance risk and make mapper tests easier to read.
-
-Recommended refactor:
-
-- Add a small `eventEnvelopeValues(e)` helper returning the parent envelope value map, then merge product-specific columns into it.
-- Add a small `eventEnvelopeColumns()` helper for schema definitions if feedkit schema construction remains readable.
-- Add required-field helper functions for common checks such as `requireTime`, `requireString`, and `requireJSON`, but keep product-specific validation functions where policy differs.
-- Keep explicit per-product mapper functions. Do not introduce reflection-based table mapping, struct tags, or a generic ORM layer.
-
-Suggested tests:
-
-- Add focused helper tests for envelope value UTC/null behavior.
-- Keep product mapper tests asserting important columns per product.
-- Add a regression test that each parent table with event envelope columns receives all envelope values from mapper output.
-- Keep schema tests for nullable/required columns, especially recent outlook and forecast condition semantics.
-
-Risk level: Medium. The target is low-level persistence code; refactor only with existing mapper tests passing and add tests before moving column/value construction.
-
-### 3. Centralize Event Kind And Driver Name Constants
-
-Affected files/packages:
-
-- `internal/sources/builtins.go`
-- `internal/sources/builtins_test.go`
-- `internal/sources/*/*.go`
-- `internal/normalizers/*/*_test.go`
-- `cmd/weatherfeeder/main_test.go`
-- `cmd/weatherfeeder/config.yml`
-- `examples/*.yml`
-- `docs/config.md`
-- `docs/internal/sources.md`
-- `docs/integrations/events.md`
-- `standards/schema.go`
-
-Duplicated or near-duplicated behavior:
-
-- Schemas are centralized in `standards/schema.go`, but event kinds are repeatedly typed as string literals such as `event.Kind("forecast")`, `event.Kind("weather_story")`, and `event.Kind("outlook")`.
-- Driver names are repeated in source constructors, registry entries, tests, config examples, docs, and troubleshooting text.
-- The all-current-drivers test duplicates the registry table manually.
-
-Why it matters:
-
-- Kinds and driver names are public operator-facing strings. A typo or stale test value can produce startup failures or documentation drift.
-- The mismatch between centralized schemas and non-centralized kinds/drivers makes future feature additions more error-prone.
-- The source registry already has a structured `pollDriverRegistrations` slice that can become the canonical source for driver tests.
-
-Recommended refactor:
-
-- Add event kind constants in `standards`, for example `KindObservation`, `KindForecast`, `KindForecastDiscussion`, `KindWeatherStory`, `KindAlert`, and `KindOutlook`, typed as `event.Kind` if dependency direction is acceptable. If `standards` should not import feedkit, use string constants and convert at adapter boundaries.
-- Add source driver constants near source registration, for example in `internal/sources/drivers.go`, and have constructors/tests use those constants.
-- Update source registry tests to derive the all-current-drivers list from `pollDriverRegistrations`, while keeping explicit negative tests for removed legacy names.
-- Keep docs and YAML examples literal; they are user-facing examples and should not be generated for this cleanup pass.
-
-Suggested tests:
-
-- Update source registry tests to assert every registered driver builds as a `PollSource` using the registry slice.
-- Add a small test that configured source `Kinds()` match the central kind constants.
-- Keep example config load tests as the docs/example guardrail.
-
-Risk level: Low. This is mostly mechanical, but care is needed to avoid import cycles if kind constants are typed with feedkit's `event.Kind`.
-
-### 4. Centralize Config Example Coverage Around All Maintained YAML Files
-
-Affected files/packages:
-
-- `cmd/weatherfeeder/main_test.go`
-- `cmd/weatherfeeder/config.yml`
-- `examples/config.minimal.yml`
-- `examples/config.nats.yml`
-- `examples/config.postgres.yml`
-- `docs/config.md`
-
-Duplicated or near-duplicated behavior:
-
-- The sample and copyable configs repeat driver names, event kinds, route kind lists, NWS user-agent conventions, source cadences, and sink shapes.
-- `main_test.go` already verifies that `cmd/weatherfeeder/config.yml` and `examples/*.yml` load and that sources build scheduler jobs.
-- There is no single test that compares example route kind lists against current source-advertised kinds or documented current kinds.
-
-Why it matters:
-
-- Config examples are part of the operator contract. They tend to drift when a new canonical kind is added or renamed.
-- Routes are easy to leave stale because a config can load successfully while omitting newly supported kinds from a production-oriented route example.
-
-Recommended refactor:
-
-- Keep examples explicit and copyable.
-- Add tests that collect advertised source kinds from configured examples and verify route examples either intentionally match all kinds or document why they are selective.
-- Add a small helper in tests for building the weatherfeeder source registry and validating all maintained configs, so config coverage stays obvious.
-
-Suggested tests:
-
-- Extend `TestMaintainedConfigExamplesLoad` to assert source expected kinds and scheduler jobs, which it already does, and add route-kind sanity checks if feedkit exposes compiled routes clearly enough.
-- Add a docs/config example guard only if it can be kept simple; avoid parsing Markdown tables unless this repo already uses doc extraction tests.
-
-Risk level: Low. This is test-only cleanup unless route semantics in examples are intentionally selective.
-
-## Medium-Confidence Opportunities
-
-### 1. Normalize Required-Time Helper Patterns Where Semantics Match
-
-Affected files/packages:
-
-- `internal/providers/nws/time.go`
-- `internal/providers/openmeteo/time.go`
-- `internal/providers/spc/time.go`
-- `internal/normalizers/nws/forecast.go`
-- `internal/normalizers/nws/weatherstories.go`
-- `internal/normalizers/spc/convective_outlook.go`
-- `internal/sources/nws/*`
-- `internal/sources/spc/convective_outlook.go`
-
-Duplicated or near-duplicated behavior:
-
-- Multiple normalizers implement required timestamp parsing with field-specific error messages.
-- Multiple sources parse provider timestamps best-effort for effective-time selection.
-- Providers correctly differ in timestamp formats, but callers often repeat trim/empty/UTC/error-context patterns.
-
-Why it matters:
-
-- Time parsing is a domain policy hotspot. Small drift in required vs optional parsing, UTC normalization, or error wording can create subtle behavior differences.
-- Required field names in errors are useful and should be preserved.
-
-Recommended refactor:
-
-- Do not force all providers through one cross-provider parser; NWS, Open-Meteo, and SPC formats differ for good reasons.
-- Consider small provider-local helpers such as `ParseRequiredTime(value, field)` and `ParseOptionalTime(value)` where a provider already has a canonical parser.
-- Use common helper signatures only when the failure behavior is truly identical.
-
-Suggested tests:
-
-- Provider helper tests for empty, malformed, and UTC-normalized timestamps.
-- Normalizer tests that assert required timestamp errors include the field path.
-
-Risk level: Medium. The duplication is real, but over-centralization could obscure provider-specific formats.
-
-### 2. Table-Drive Source Registry Tests More Aggressively
-
-Affected files/packages:
-
-- `internal/sources/builtins_test.go`
-
-Duplicated or near-duplicated behavior:
-
-- Several tests independently instantiate a registry and build one named driver.
-- `TestRegisterBuiltinsRegistersAllCurrentDrivers` duplicates the same driver list that exists in `pollDriverRegistrations`.
-
-Why it matters:
-
-- Adding new drivers currently requires touching both the registration table and a manually duplicated test list.
-- The test suite already has the structure needed to derive cases from the registration table.
-
-Recommended refactor:
-
-- Replace individual positive registration tests with a table derived from `pollDriverRegistrations`.
-- Keep one or two named tests only when they assert special policy, such as legacy driver removal.
-- Keep `sourceConfigForDriver` but make it keyed off driver constants.
-
-Suggested tests:
-
-- One table-driven positive registration test for every driver.
-- One explicit negative test for `nws_forecast` legacy driver.
-
-Risk level: Low. This is test cleanup with minimal behavior risk.
-
-### 3. Package-Local Fixture Helpers Are Duplicated
-
-Affected files/packages:
-
-- `internal/providers/nws/forecast_discussion_test.go`
-- `internal/providers/spc/geojson_test.go`
-- `internal/sources/nws/forecast_discussion_test.go`
-- `internal/sources/spc/convective_outlook_test.go`
-- `internal/normalizers/nws/forecast_discussion_test.go`
-- `internal/normalizers/spc/convective_outlook_test.go`
-
-Duplicated or near-duplicated behavior:
-
-- Several tests define local helpers that read from `testdata` using `os.ReadFile` and `filepath.Join`.
-- Helper names differ by package, but behavior is mostly identical.
-
-Why it matters:
-
-- This is low-risk duplication, but fixture read failures and paths could be made more consistent.
-- Cleaner fixture helpers would reduce noise in parser/source/normalizer tests.
-
-Recommended refactor:
-
-- Prefer package-local test helpers, not a cross-package test utility. Go package tests are easier to understand when fixtures remain near the package under test.
-- Within each package with multiple test files, consolidate repeated `readTestFile` helpers into one `_test.go` helper file.
-
-Suggested tests:
-
-- No new behavior tests required; this cleanup is test-only.
-- Run affected package tests.
-
-Risk level: Low.
-
-### 4. Schema, Model, And Postgres Documentation Lists Require Manual Synchronization
-
-Affected files/packages:
-
-- `standards/schema.go`
-- `model/*.go`
-- `docs/integrations/events.md`
-- `docs/integrations/postgres.md`
-- `docs/internal/normalizers.md`
-- `docs/internal/sources.md`
-- `docs/config.md`
-
-Duplicated or near-duplicated behavior:
-
-- Current schemas, raw mappings, canonical mappings, event kinds, and Postgres table contracts are documented in multiple current-behavior docs.
-- This is partly intentional because docs serve different audiences, but all lists must be manually updated when a feature is added.
-
-Why it matters:
-
-- Recent feature additions touched many docs. Manual sync is workable now but will remain a recurring release risk.
-- Documentation policy requires current-behavior docs to avoid speculative or stale content.
-
-Recommended refactor:
-
-- Do not generate docs wholesale.
-- Add targeted doc consistency tests only for compact, machine-checkable facts, such as ensuring every schema constant appears in `docs/integrations/events.md` and every source driver appears in `docs/config.md`.
-- Keep prose manual.
-
-Suggested tests:
-
-- A small standards/docs test that reads selected docs and checks for schema constants and driver constants.
-- Keep examples load-tested.
-
-Risk level: Medium. Doc tests can become brittle if they parse prose too deeply; keep them shallow.
-
-## Boundary And Responsibility Concerns
-
-### Source Adapter HTTP Policy Is Split Between Feedkit And Weatherfeeder
-
-Most single-document sources rely on feedkit `HTTPSource`, while SPC implements a custom multi-document fetch loop. This boundary is acceptable because SPC's atomic bundle semantics differ from single-document polling. The concern is not the custom source itself; the concern is that shared weatherfeeder HTTP config policy is partly reimplemented in the SPC adapter.
-
-Recommended home: keep generic HTTP mechanics in feedkit, but add a small weatherfeeder source helper for weatherfeeder-owned parameter names and validation when a source cannot use `HTTPSource` directly.
-
-### Postgres Mapping Is Correctly Isolated But Becoming Too Dense
-
-The Postgres mapper is in the right package and does not leak into domain or normalizer code. The package responsibility is clear. The concern is density and repeated policy, not boundary drift.
-
-Recommended home: keep mapper helpers under `internal/sinks/postgres`. Do not move persistence concerns into `model` or normalizers.
-
-### Event Kind Strings Lack A Canonical Home
-
-Schemas have a clear home in `standards`; event kinds do not. Because kinds are part of routing and operator config, they deserve a comparable canonical code location.
-
-Recommended home: `standards` is the best conceptual location if dependency direction remains clean. If importing feedkit's `event` package into `standards` is undesirable, use string constants in `standards` and convert in source adapters.
-
-### Runtime Composition Is Appropriately Thin
-
-`cmd/weatherfeeder/main.go` is mostly process wiring. It does not contain provider parsing or sink mapping. No refactor is recommended here beyond possibly extracting tiny helper functions if future CLI flags make startup more complex.
-
-## Path, Key, And Naming Construction Review
-
-Centralized enough:
-
-- Schema strings are centralized in `standards/schema.go`.
-- SPC product keys, day numbers, outlook types, and default URLs are centralized in `internal/providers/spc/product.go`.
-- Postgres table names are centralized as constants in `internal/sinks/postgres/schema.go`.
-- Test fixture paths are local and simple.
-
-Needs cleanup:
-
-- Event kind strings are repeated across source adapters, tests, YAML examples, and docs.
-- Source driver names are repeated across constructors, registration, tests, docs, and examples.
-- Postgres envelope column names are repeated in schema and mapper literals.
-- Config route kind lists in examples are manually synchronized with supported canonical kinds.
-
-Recommended approach:
-
-- Add code constants for kinds and drivers first.
-- Add narrow Postgres helpers for envelope column/value names second.
-- Leave user-facing YAML and Markdown examples explicit, but test them against the code constants where practical.
-
-## Resolution And Catalog Review
-
-Current resolution model:
-
-- Source drivers resolve through `internal/sources.RegisterBuiltins` and feedkit's source registry.
-- Normalizers resolve by schema matching through `internal/normalizers.RegisterBuiltins` and feedkit's normalize processor.
-- Sinks resolve through feedkit's sink registry, with weatherfeeder registering a Postgres schema mapper.
-- Schemas resolve through `standards` constants.
-- SPC product catalogs resolve through `internal/providers/spc` product metadata helpers.
-
-Consistency assessment:
-
-- Normalizer resolution is strong: schema equality is explicit and follows policy.
-- Source driver resolution is explicit and readable, but test coverage duplicates driver lists rather than deriving from the registry table.
-- SPC product resolution is strong and should remain provider-local.
-- There is no artifact, prompt, module, profile, manifest, or object-key catalog in this repository.
-
-Recommended centralization:
-
-- Treat source driver constants and event kind constants as small catalogs.
-- Avoid building a generic catalog framework; explicit registry tables are appropriate for this codebase.
-
-## Config And Command-Loading Review
-
-Current behavior:
-
-- The executable reads exactly `config.yml` from the current working directory.
-- There are no CLI flags, subcommands, profiles, environment-variable config overlays, or config path precedence rules.
-- Feedkit owns top-level config loading and validation.
-- Weatherfeeder source/sink constructors own driver-specific param validation.
-- Maintained examples are load-tested and source-build-tested.
-
-Consistency assessment:
-
-- There is no duplicated command-loading behavior because there is only one command path.
-- Driver-specific config validation is mostly consistent, but SPC has to duplicate some HTTP param parsing because it cannot use feedkit's single-document `HTTPSource`.
-- OpenWeather's `units=metric` invariant is correctly located in `internal/providers/openweather` and enforced by the source constructor.
-
-Intentional differences:
-
-- SPC does not require `params.url` because it owns a fixed product catalog plus optional override maps.
-- OpenWeather has stricter URL validation because unit semantics affect canonical mapping correctness.
-- Single-document sources use conditional HTTP validators; SPC uses a bundle hash because it fetches multiple documents atomically.
-
-Likely accidental drift risk:
-
-- HTTP timeout and body-limit validation wording can differ between feedkit-backed HTTP sources and SPC.
-- Future multi-document sources may copy SPC's config parsing rather than sharing a narrow helper.
-
-## State, Manifest, Or Progress Handling Review
-
-Current state handling:
-
-- The daemon has no durable internal run state, manifest, checkpoint, or resume marker.
-- Feedkit scheduler, dispatcher, sink fanout queues, and dedupe operate in memory.
-- Single-document HTTP conditional validators are source-instance memory only.
-- SPC unchanged-response behavior uses a source-local hash of the last complete bundle.
-- Postgres persistence is external sink state.
-
-Consistency assessment:
-
-- The state model is documented and consistent with the architecture policy.
-- There is no hidden filesystem state substituting for declared state.
-- There is no resume/force/dry-run behavior to drift across commands.
-
-Cleanup recommendation:
-
-- No state/manifest refactor is needed now.
-- If future durable checkpoints are added, design them explicitly rather than expanding the current in-memory dedupe or source-local hash semantics.
-
-## Refactors To Avoid
-
-Avoid these refactors in the next cleanup pass:
-
-- A generic workflow engine or stage abstraction. The current runtime has source polling, normalization, dedupe, and dispatch; adding a stage framework would be speculative.
-- A plugin runtime. The policy explicitly favors built-in registries over a general plugin system.
-- Replacing feedkit HTTP, scheduler, dispatch, or sink infrastructure with weatherfeeder-owned equivalents.
-- A generic Postgres ORM or reflection-driven mapper. The table contract is explicit and should remain readable.
-- Cross-provider timestamp parsing that ignores provider-specific timestamp formats.
-- Consolidating WMO mapping too aggressively. Provider-specific condition signals differ; only shared text fallback belongs in common helpers.
-- Generating all docs from code. Shallow consistency tests are useful; generated manuals would fight the documentation policy's audience-specific structure.
-- Collapsing all source adapters into one generic source type. The effective-time and payload policies are similar but still product-specific.
-- Moving persistence tags or database column names into `model`. Canonical payloads should not depend on the Postgres sink.
-
-## Recommended Implementation Sequence
-
-1. Add event kind and source driver constants.
-
-   Scope: constants plus mechanical usage in source adapters, registry tests, and normalizer tests where appropriate. Keep docs/YAML literal. Run `go test ./internal/sources ./internal/normalizers/... ./cmd/weatherfeeder`.
-
-2. Table-drive source registry tests.
-
-   Scope: derive positive source driver cases from `pollDriverRegistrations`; keep legacy-driver negative tests. Run `go test ./internal/sources ./cmd/weatherfeeder`.
-
-3. Add source HTTP config helper for non-`HTTPSource` adapters.
-
-   Scope: centralize `user_agent`, `http_timeout`, and `http_response_body_limit_bytes` parsing for SPC and future multi-document sources. Do not alter simple `HTTPSource` adapters. Run `go test ./internal/sources/spc ./internal/sources ./cmd/weatherfeeder`.
-
-4. Add Postgres envelope helper tests, then helper functions.
-
-   Scope: add `eventEnvelopeValues`, optionally envelope column helpers, and product-specific required-field helpers. Keep explicit mapper functions. Run `go test ./internal/sinks/postgres`.
-
-5. Consolidate package-local fixture helpers.
-
-   Scope: per package only; no cross-package testing utility. Run affected provider/source/normalizer package tests.
-
-6. Add shallow docs consistency tests.
-
-   Scope: verify schema constants and source driver constants appear in canonical docs. Avoid parsing Markdown tables deeply. Run `go test ./standards ./cmd/weatherfeeder` or place tests in a suitable package that can read repo docs.
-
-7. Dead-code and legacy sweep.
-
-   Scope: after constants/tests are in place, search for obsolete schema/driver/kind literals such as removed legacy driver names. Keep explicit negative tests where they document supported removals.
-
-## Test Strategy
-
-Tests to add before refactoring:
-
-- Source HTTP config helper tests for aliases, missing params, positive duration/body-limit validation, and error context.
-- Postgres mapper tests that assert parent envelope columns are consistently present for every mapped canonical parent row.
-- Source driver/kind constant tests if constants are introduced.
-
-Tests to update during refactoring:
-
-- `internal/sources/builtins_test.go` for table-driven registry coverage.
-- `internal/sources/spc/convective_outlook_test.go` for shared HTTP config validation.
-- `internal/sinks/postgres/map_test.go` and `schema_test.go` for envelope helper preservation.
-- Existing provider/source/normalizer fixture tests if fixture helpers move.
-
-Focused verification commands:
-
-```sh
-go test ./cmd/weatherfeeder ./internal/sources ./internal/sources/... ./internal/providers/... ./internal/normalizers/... ./internal/sinks/postgres ./model ./standards
-```
-
-Full verification command before merging cleanup:
-
-```sh
-go test ./...
-```
-
-## Appendix: Findings Not Worth Acting On
-
-### Provider-Specific Source Files Share A Similar Shape
-
-NWS, Open-Meteo, and OpenWeather source files all implement `Name`, `Kinds`, `Poll`, metadata decode, and event emission. This is acceptable because each product has distinct effective-time and metadata policy. Extract only the clearly shared HTTP/config pieces.
-
-### Normalizer Match Methods Are Repetitive By Design
-
-Most normalizers implement a one-line `Match` against a schema constant. This repetition is good: it keeps routing explicit and cheap. A generic schema-to-builder registry would add indirection without meaningful risk reduction.
-
-### Provider Time Parsers Should Remain Provider-Specific
-
-NWS, Open-Meteo, and SPC timestamp formats differ. The current provider-local parsers are easier to reason about than a broad cross-provider parser. Only required/optional wrapper patterns should be considered for cleanup.
-
-### Documentation Repeats Some Lists Intentionally
-
-`README.md`, `docs/config.md`, `docs/internal/sources.md`, and `docs/integrations/events.md` repeat selected feature lists for different audiences. Do not eliminate that repetition wholesale. Prefer shallow consistency tests for high-risk identifiers.
-
-### SPC Bundle Hash State Should Stay Local
-
-The SPC source's last-bundle hash is source-local unchanged-content state, not a general manifest/checkpoint system. Generalizing it now would be premature.
-
-### Runtime Wiring Could Be Split Into Helpers, But Need Not Be
-
-`cmd/weatherfeeder/main.go` is readable and policy-aligned. Extracting helper functions now would mostly move code around. Revisit only if CLI flags, config path options, metrics, or health checks are added.

docs/roadmap/cleanup.md

@@ -1,281 +0,0 @@
-# Cleanup Roadmap
-
-## Summary
-
-This roadmap turns the findings in `docs/roadmap/audit.md` into staged, behavior-preserving cleanup work for `weatherfeeder`.
-
-The goal is to reduce duplication and drift risk before the next major release without changing public contracts. Implement these stages in order. Each stage should be small enough for one focused implementation prompt or commit unless the implementing agent discovers unexpected coupling.
-
-Preserve the current architecture:
-
-- `feedkit` remains generic daemon infrastructure.
-- `weatherfeeder` keeps weather-domain policy in sources, providers, normalizers, `model`, `standards`, and Postgres mapping.
-- Current-behavior docs should change only when implementation changes require them.
-- Roadmap-only cleanup instructions belong here until implemented.
-
-## Global Guardrails
-
-- Do not change public schema strings, event kind strings, source driver names, config keys, table names, column names, column nullability, or canonical model JSON field names.
-- Do not include database migrations; this is cleanup-only work.
-- Do not change `feedkit` in this cleanup pass.
-- Do not introduce broad framework abstractions, plugin systems, workflow engines, generic source frameworks, ORM-style mapping, reflection mapping, or persistence annotations in `model`.
-- Keep `cmd/weatherfeeder` focused on runtime composition.
-- Keep source fetching separate from normalizer mapping.
-- Keep provider-specific timestamp parsing and WMO mapping provider-specific unless an existing common helper already has exactly matching semantics.
-- Keep user-facing YAML examples and Markdown examples literal; do not generate docs.
-- Run focused tests after each stage and `go test ./...` after all stages.
-
-## Stage 1: Centralize Event Kind And Driver Constants
-
-Add code constants for repeated weatherfeeder identifiers while preserving the literal string values.
-
-Implementation requirements:
-
-- Add event kind string constants in `standards`, for example:
-  - `KindObservation = "observation"`
-  - `KindForecast = "forecast"`
-  - `KindForecastDiscussion = "forecast_discussion"`
-  - `KindWeatherStory = "weather_story"`
-  - `KindAlert = "alert"`
-  - `KindOutlook = "outlook"`
-- Keep kind constants typed as plain strings, not `event.Kind`, so `standards` does not import `feedkit`.
-- Add source driver string constants in the provider source packages to avoid import cycles:
-  - NWS driver constants under `internal/sources/nws`.
-  - Open-Meteo driver constants under `internal/sources/openmeteo`.
-  - OpenWeather driver constants under `internal/sources/openweather`.
-  - SPC driver constant under `internal/sources/spc`.
-- Update source constructors to use driver constants instead of local string literals.
-- Update `Kinds()` methods and `SingleEvent` calls to use `event.Kind(standards.Kind...)`.
-- Update source registration to use provider driver constants.
-- Update internal tests to use constants where doing so reduces drift.
-- Keep docs and YAML examples literal because they are user-facing examples.
-- Do not add weather-specific kind constants to `feedkit`.
-
-Acceptance criteria:
-
-- All driver and event kind string values remain unchanged.
-- No import cycle is introduced.
-- `standards` does not import `feedkit`.
-- Source constructors, emitted events, and advertised kinds behave identically.
-
-Focused tests:
-
-```sh
-go test ./internal/sources ./cmd/weatherfeeder
-go test ./internal/normalizers/...
-```
-
-## Stage 2: Table-Drive Source Registry Tests
-
-Reduce source registry test duplication while preserving registry coverage.
-
-Implementation requirements:
-
-- Replace repeated positive tests in `internal/sources/builtins_test.go` with one table-driven test derived from `pollDriverRegistrations`.
-- Keep the explicit negative test proving legacy `nws_forecast` is not registered.
-- Keep `sourceConfigForDriver`, but update it to use driver constants or registry-derived driver names.
-- Preserve coverage that every current registered driver builds as a `PollSource`.
-- Do not weaken `ValidateExpectedKinds` or scheduler job build coverage in `cmd/weatherfeeder` tests.
-
-Acceptance criteria:
-
-- Adding a new driver to `pollDriverRegistrations` automatically includes it in the positive registry test.
-- Legacy-driver rejection remains explicitly tested.
-- Test behavior remains deterministic and independent of live upstream services.
-
-Focused tests:
-
-```sh
-go test ./internal/sources ./cmd/weatherfeeder
-```
-
-## Stage 3: Add Shared HTTP Config Helper For Multi-Document Sources
-
-Centralize common HTTP config parsing for sources that cannot use feedkit's single-document `HTTPSource`.
-
-Implementation requirements:
-
-- Add a narrow helper under `internal/sources/internal/httpconfig`.
-- The helper should parse only the common source HTTP client params needed by non-`HTTPSource` sources:
-  - trimmed source name;
-  - required `params.user_agent` / `params.userAgent`;
-  - optional `params.http_timeout` using feedkit config duration semantics;
-  - optional `params.http_response_body_limit_bytes` as a positive integer.
-- The helper should return values sufficient for callers to build a `transport.NewHTTPClient(timeout)` and pass a body limit to `transport.FetchBodyWithLimit`.
-- Refactor only the SPC source to use this helper.
-- Preserve SPC-specific config parsing in the SPC source:
-  - `latitude`;
-  - `longitude`;
-  - `location_id` / `locationID`;
-  - `location_name` / `locationName`;
-  - `geojson_urls`;
-  - `discussion_urls`;
-  - `rss_url` / `rssURL`.
-- Do not replace `fksources.NewHTTPSource` for normal single-URL sources.
-- Preserve SPC atomic bundle fetch behavior, bundle hash behavior, effective-time policy, raw payload shape, and error context.
-
-Acceptance criteria:
-
-- SPC constructor accepts and rejects the same configs as before.
-- SPC still fetches required documents atomically and emits no partial bundle.
-- Existing SPC source tests pass unchanged except for expected helper-related error wording if the wording becomes more consistent.
-- No single-document source is refactored away from `fksources.NewHTTPSource`.
-
-Focused tests:
-
-```sh
-go test ./internal/sources/spc ./internal/sources
-```
-
-## Stage 4: Reduce Postgres Mapper Envelope Duplication
-
-Centralize repeated Postgres parent envelope mapping without changing the table contract.
-
-Implementation requirements:
-
-- Add small helper functions inside `internal/sinks/postgres`.
-- Centralize parent event envelope values:
-  - `event_id`;
-  - `event_kind`;
-  - `event_source`;
-  - `event_schema`;
-  - `event_emitted_at`;
-  - `event_effective_at`.
-- Use the helper in every parent table mapper that stores event envelope columns.
-- Optionally centralize event envelope column declarations if it keeps `schema.go` readable. If it makes the schema definition harder to scan, leave column declarations explicit.
-- Keep explicit per-product mapper functions.
-- Keep product-specific validation in product-specific functions where policy differs.
-- Do not introduce reflection mapping, struct tags, ORM-style abstractions, generated table mapping, or persistence annotations in `model`.
-- Preserve every existing table, column, nullability rule, required-field check, compact JSON behavior, UTC normalization, child positional index, and write count.
-
-Acceptance criteria:
-
-- Mapper output for existing valid payloads is equivalent before and after the refactor.
-- Unsupported schemas still map to zero writes and no error.
-- Required-field failures still include useful product/path context.
-- Feedkit Postgres schema validation still receives complete rows for every declared column.
-
-Focused tests:
-
-```sh
-go test ./internal/sinks/postgres
-```
-
-## Stage 5: Tighten Config Example And Documentation Consistency Tests
-
-Add shallow tests that detect identifier drift without generating or over-parsing documentation.
-
-Implementation requirements:
-
-- Extend maintained config tests so `cmd/weatherfeeder/config.yml` and every `examples/*.yml` remain loadable and source-buildable.
-- Add shallow docs consistency tests for stable identifiers only:
-  - every schema constant in `standards` appears in `docs/integrations/events.md` when it is part of the current event contract;
-  - every registered source driver name appears in `docs/config.md`;
-  - every registered source driver name appears in `docs/internal/sources.md`.
-- Avoid parsing Markdown tables deeply; simple file-content checks are sufficient.
-- Do not generate docs.
-- Do not modify current-behavior docs unless the implementation uncovers an actual stale documented identifier.
-- Keep documentation policy intact: implemented behavior outside `docs/roadmap/`, future plans under `docs/roadmap/`.
-
-Acceptance criteria:
-
-- Identifier consistency tests fail when a new source driver or current schema is added without updating canonical docs.
-- Tests are shallow and low maintenance.
-- Tests do not assert prose formatting or table layout.
-
-Focused tests:
-
-```sh
-go test ./cmd/weatherfeeder ./standards ./internal/sources
-```
-
-## Stage 6: Consolidate Package-Local Test Fixture Helpers
-
-Remove low-value duplicated fixture-reading code only where it is local and obvious.
-
-Implementation requirements:
-
-- Consolidate duplicated fixture readers only within the same Go package.
-- Do not create a cross-package test utility package.
-- Keep fixtures under each package's `testdata` directory.
-- If a package has only one fixture helper, leave it alone.
-- Do not change fixture contents unless a test already requires it.
-- Do not mix this stage with parser behavior changes.
-
-Acceptance criteria:
-
-- Test helper duplication is reduced where multiple files in one package share the same fixture-reading behavior.
-- Tests remain easy to read locally.
-- No package imports a helper solely for tests from another package.
-
-Focused tests:
-
-```sh
-go test ./internal/providers/nws ./internal/providers/spc
-go test ./internal/sources/nws ./internal/sources/spc
-go test ./internal/normalizers/nws ./internal/normalizers/spc
-```
-
-## Stage 7: Dead-Code And Literal Sweep
-
-Perform a final cleanup sweep after constants and helper stages are complete.
-
-Implementation requirements:
-
-- Search for stale driver, kind, and schema literals after earlier stages.
-- Replace internal code/test literals with constants where it reduces typo or drift risk.
-- Keep user-facing docs and YAML examples literal.
-- Keep intentional legacy-driver negative tests.
-- Do not remove compatibility tests unless they are clearly obsolete and no longer document supported behavior.
-- Do not broaden the cleanup into unrelated refactors.
-
-Suggested searches:
-
-```sh
-rg 'event\.Kind\("|nws_forecast|nws_weatherstories|openmeteo_|openweather_|spc_convective_outlook|weather_story|forecast_discussion|raw\.|weather\.' .
-rg 'TODO|legacy|deprecated|unknown source driver' internal cmd docs examples
-```
-
-Acceptance criteria:
-
-- Internal literals are reduced where constants now exist.
-- Intentional literals in docs, YAML examples, raw schema docs, and negative tests remain readable.
-- No behavior changes are introduced.
-
-Focused tests:
-
-```sh
-go test ./internal/sources ./internal/normalizers/... ./internal/sinks/postgres ./cmd/weatherfeeder
-```
-
-## Final Verification
-
-After all stages are complete, run:
-
-```sh
-go test ./...
-git status --short
-```
-
-Before committing the implemented cleanup, verify:
-
-- No public contracts changed unintentionally.
-- Current-behavior docs still describe implemented behavior only.
-- `docs/roadmap/cleanup.md` is either updated to remove completed work or moved to future/remediation tracking according to the repository's roadmap practice.
-- No unrelated changes are included.
-
-## Refactors To Avoid
-
-Do not perform these changes as part of this cleanup roadmap:
-
-- Generic workflow or stage engine.
-- Runtime plugin system.
-- Weather-specific constants in `feedkit`.
-- Replacing feedkit scheduler, dispatch, HTTP helpers, or sink mechanics.
-- Generic source abstraction covering every source type.
-- Reflection-based or generated Postgres mapper.
-- ORM-style persistence layer.
-- Database column metadata on canonical model structs.
-- Cross-provider timestamp parser that hides provider-specific formats.
-- Broad WMO mapper consolidation beyond existing common text fallback.
-- Generated documentation system.

docs/roadmap/future.md

@@ -4,6 +4,45 @@
 
 This document is the catch-all roadmap for planned, deferred, aspirational, experimental, or unimplemented weatherfeeder work. Current behavior belongs in the canonical docs outside `docs/roadmap/`.
 
+## NWS AFD Parsing Resilience
+
+The current parser handles the concrete RAH, LWX, and MFR variants that
+motivated these ideas. Future work should keep those extension points
+maintainable as additional evidence appears.
+
+### Generalize Wrapper-Scoped Embedded Sections
+
+The scanner currently permits undotted nested headings only inside `PREV
+DISCUSSION`. If other wrapper identities are observed, replace the single
+wrapper check with a small explicit provider-local registry and add a fixture
+for each wrapper family. Do not make the leading dot globally optional: wrapper
+scope is the safeguard against classifying uppercase prose as a section.
+
+### Extend Conservative Preamble Classification
+
+Leading key-message metadata currently supports validated `Issued at`, `Updated
+at`, and `As of <clock> <weekday>...` forms. Add future wording variants as
+small, ordered classifiers with strict label boundaries and value grammars.
+Every addition should include collision tests proving that similar message prose
+and malformed metadata remain canonical content.
+
+### Keep List-Marker Recognition Extensible
+
+The marker parser currently supports hyphens, asterisks, `N)`, `N.`, `(N)`, and
+composite forms such as `- (N)`. If new decorators appear, evolve the helper
+toward an explicit marker grammar or typed classification result rather than a
+broad punctuation heuristic. Preserve positive-number and whitespace-boundary
+checks so ordinary prose is not stripped.
+
+### Maintain a Cross-Office Fixture Corpus
+
+The compact RAH, LWX, and current MFR fixtures seed regression coverage for the
+observed layouts. Future parser changes should add concise, deterministic HTML
+fixtures for materially distinct office formats and exercise them through both
+the provider parser and normalizer. Fixture comments should identify the format
+family and state that edited prose is not an archived product; tests must remain
+offline and assert both intended extraction and adjacent-section isolation.
+
 ## SPC Convective Outlook Follow-Ups
 
 ### Weatherapi Outlook Endpoints
@@ -31,7 +70,7 @@ Notes:
 
 - Day 4-8 products have different semantics from Day 1-3 categorical/tornado/hail/wind products.
 - Avoid forcing Day 4-8 assumptions into the current Day 1-3 model until the source shapes and consumer needs are reviewed.
-- Prefer reusing `weather.outlook.v1` if the fields remain accurate; otherwise write a separate roadmap before changing the canonical contract.
+- Prefer reusing `weather.outlook.v2` if the fields remain accurate; otherwise write a separate roadmap before changing the canonical contract.
 
 ### Degraded SPC Bundle Mode
 

docs/roadmap/outlook-schema-transition.md

@@ -0,0 +1,87 @@
+# SPC Outlook Postgres Schema Transition
+
+## Purpose
+
+This document describes how to reset existing Postgres outlook tables from the
+`weather.outlook.v1` storage shape to the `weather.outlook.v2` compatible
+storage shape.
+
+Updated `weatherfeeder` versions create outlook tables with run-level
+discussion storage. Existing databases that already contain the old outlook
+table family need a manual reset because the Postgres sink creates tables with
+`CREATE TABLE IF NOT EXISTS`.
+
+## Scope
+
+This reset drops only the outlook table family and lets updated `weatherfeeder`
+recreate it:
+
+- `outlook_discussions`
+- `outlooks`
+- `outlook_runs`
+
+Other weather tables are not affected.
+
+## Warning
+
+These commands delete stored SPC outlook history. Existing `weather.outlook.v1`
+outlook rows are intentionally removed. Downstream readers should be updated
+intentionally for the new outlook shape.
+
+## Deployment Order
+
+1. Stop `weatherfeeder`.
+2. Drop the existing outlook tables.
+3. Deploy updated `weatherfeeder`.
+4. Start `weatherfeeder` so the Postgres sink recreates the new outlook tables.
+5. Deploy updated downstream consumers such as `weatherapi`.
+
+## Reset SQL
+
+```sql
+DROP TABLE IF EXISTS outlook_discussions;
+DROP TABLE IF EXISTS outlooks;
+DROP TABLE IF EXISTS outlook_runs;
+```
+
+## Verification SQL
+
+Before or after the updated daemon starts, this query shows which outlook tables
+exist:
+
+```sql
+SELECT table_name
+FROM information_schema.tables
+WHERE table_name IN ('outlook_runs', 'outlooks', 'outlook_discussions')
+ORDER BY table_name;
+```
+
+After the updated daemon has started and recreated the tables, verify the new
+run column:
+
+```sql
+SELECT column_name, is_nullable, data_type
+FROM information_schema.columns
+WHERE table_name = 'outlook_runs'
+  AND column_name = 'discussion_count';
+```
+
+Verify the discussion table indexes:
+
+```sql
+SELECT indexname
+FROM pg_indexes
+WHERE tablename = 'outlook_discussions'
+ORDER BY indexname;
+```
+
+Verify that legacy polygon-level prose columns are gone from `outlooks`:
+
+```sql
+SELECT column_name
+FROM information_schema.columns
+WHERE table_name = 'outlooks'
+  AND column_name IN ('headline', 'summary', 'discussion');
+```
+
+The final query should return zero rows.

internal/normalizers/common/json.go

@@ -18,6 +18,18 @@ import (
 // Errors include a small amount of operation context ("extract payload", "decode raw payload").
 // Callers typically wrap these with a provider/kind label.
 func DecodeJSONPayload[T any](in event.Event) (T, error) {
+	var zero T
+
+	if typed, ok := in.Payload.(T); ok {
+		return typed, nil
+	}
+	if ptr, ok := in.Payload.(*T); ok {
+		if ptr == nil {
+			return zero, fmt.Errorf("extract payload: payload pointer is nil")
+		}
+		return *ptr, nil
+	}
+
 	return fknormalize.DecodeJSONPayload[T](in)
 }
 

internal/normalizers/common/json_test.go

@@ -0,0 +1,39 @@
+package common
+
+import (
+	"testing"
+
+	"gitea.maximumdirect.net/ejr/feedkit/event"
+)
+
+func TestDecodeJSONPayloadAcceptsTypedPayload(t *testing.T) {
+	type rawPayload struct {
+		Value string `json:"value"`
+	}
+
+	got, err := DecodeJSONPayload[rawPayload](event.Event{
+		Payload: rawPayload{Value: "ok"},
+	})
+	if err != nil {
+		t.Fatalf("DecodeJSONPayload() error = %v", err)
+	}
+	if got.Value != "ok" {
+		t.Fatalf("Value = %q, want ok", got.Value)
+	}
+}
+
+func TestDecodeJSONPayloadAcceptsTypedPointerPayload(t *testing.T) {
+	type rawPayload struct {
+		Value string `json:"value"`
+	}
+
+	got, err := DecodeJSONPayload[rawPayload](event.Event{
+		Payload: &rawPayload{Value: "ok"},
+	})
+	if err != nil {
+		t.Fatalf("DecodeJSONPayload() error = %v", err)
+	}
+	if got.Value != "ok" {
+		t.Fatalf("Value = %q, want ok", got.Value)
+	}
+}

internal/normalizers/nws/alerts.go

@@ -93,12 +93,8 @@ func buildAlerts(parsed nwsAlertsResponse, fallbackAsOf time.Time) (model.Weathe
 		sent := nwscommon.ParseTimePtr(p.Sent)
 		effective := nwscommon.ParseTimePtr(p.Effective)
 		onset := nwscommon.ParseTimePtr(p.Onset)
-
+		ends := nwscommon.ParseTimePtr(p.Ends)
-		// Expires: prefer "expires"; fall back to "ends" if present.
 		expires := nwscommon.ParseTimePtr(p.Expires)
-		if expires == nil {
-			expires = nwscommon.ParseTimePtr(p.Ends)
-		}
 
 		refs := parseNWSAlertReferences(p.References)
 
@@ -123,6 +119,7 @@ func buildAlerts(parsed nwsAlertsResponse, fallbackAsOf time.Time) (model.Weathe
 			Sent:      sent,
 			Effective: effective,
 			Onset:     onset,
+			Ends:      ends,
 			Expires:   expires,
 
 			AreaDescription: strings.TrimSpace(p.AreaDesc),

internal/normalizers/nws/alerts_test.go

@@ -0,0 +1,136 @@
+package nws
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+	"time"
+
+	"gitea.maximumdirect.net/ejr/feedkit/event"
+	"gitea.maximumdirect.net/ejr/weatherfeeder/model"
+	"gitea.maximumdirect.net/ejr/weatherfeeder/standards"
+)
+
+func TestAlertsNormalizerMapsEndsSeparatelyFromExpires(t *testing.T) {
+	raw := []byte(`{
+		"updated":"2026-06-16T10:00:00+00:00",
+		"title":"Current watches, warnings, and advisories for St. Louis",
+		"features":[{
+			"id":"https://api.weather.gov/alerts/alert-1",
+			"properties":{
+				"event":"Flood Warning",
+				"headline":"Flood Warning issued",
+				"sent":"2026-06-16T09:55:00+00:00",
+				"effective":"2026-06-16T10:00:00+00:00",
+				"onset":"2026-06-16T10:15:00+00:00",
+				"ends":"2026-06-16T14:00:00+00:00",
+				"expires":"2026-06-16T11:00:00+00:00"
+			}
+		}]
+	}`)
+
+	out, err := AlertsNormalizer{}.Normalize(context.Background(), alertRawEvent(raw))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+
+	run := decodeAlertRun(t, out)
+	if len(run.Alerts) != 1 {
+		t.Fatalf("expected 1 alert, got %d", len(run.Alerts))
+	}
+	alert := run.Alerts[0]
+	wantEnds := time.Date(2026, 6, 16, 14, 0, 0, 0, time.UTC)
+	wantExpires := time.Date(2026, 6, 16, 11, 0, 0, 0, time.UTC)
+	if alert.Ends == nil || !alert.Ends.Equal(wantEnds) {
+		t.Fatalf("ends = %v, want %s", alert.Ends, wantEnds)
+	}
+	if alert.Expires == nil || !alert.Expires.Equal(wantExpires) {
+		t.Fatalf("expires = %v, want %s", alert.Expires, wantExpires)
+	}
+}
+
+func TestAlertsNormalizerDoesNotFallbackExpiresToEnds(t *testing.T) {
+	raw := []byte(`{
+		"updated":"2026-06-16T10:00:00+00:00",
+		"features":[{
+			"id":"alert-ends-only",
+			"properties":{
+				"event":"Heat Advisory",
+				"ends":"2026-06-16T22:00:00+00:00"
+			}
+		}]
+	}`)
+
+	out, err := AlertsNormalizer{}.Normalize(context.Background(), alertRawEvent(raw))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+
+	run := decodeAlertRun(t, out)
+	alert := run.Alerts[0]
+	if alert.Ends == nil {
+		t.Fatal("expected ends to be populated")
+	}
+	if alert.Expires != nil {
+		t.Fatalf("expected expires nil when upstream expires is absent, got %v", alert.Expires)
+	}
+}
+
+func TestAlertsNormalizerIgnoresInvalidEnds(t *testing.T) {
+	raw := []byte(`{
+		"updated":"2026-06-16T10:00:00+00:00",
+		"features":[{
+			"id":"alert-invalid-ends",
+			"properties":{
+				"event":"Special Weather Statement",
+				"ends":"not-a-time",
+				"expires":"2026-06-16T11:00:00+00:00"
+			}
+		}]
+	}`)
+
+	out, err := AlertsNormalizer{}.Normalize(context.Background(), alertRawEvent(raw))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+
+	run := decodeAlertRun(t, out)
+	alert := run.Alerts[0]
+	if alert.Ends != nil {
+		t.Fatalf("expected invalid ends to map nil, got %v", alert.Ends)
+	}
+	if alert.Expires == nil {
+		t.Fatal("expected expires to remain populated")
+	}
+}
+
+func alertRawEvent(raw []byte) event.Event {
+	emittedAt := time.Date(2026, 6, 16, 10, 5, 0, 0, time.UTC)
+	return event.Event{
+		ID:        "raw-alerts",
+		Kind:      event.Kind(standards.KindAlert),
+		Source:    "NWSAlerts",
+		Schema:    standards.SchemaRawNWSAlertsV1,
+		EmittedAt: emittedAt,
+		Payload:   json.RawMessage(raw),
+	}
+}
+
+func decodeAlertRun(t *testing.T, e *event.Event) model.WeatherAlertRun {
+	t.Helper()
+	if e == nil {
+		t.Fatal("expected normalized event")
+	}
+	if e.Schema != standards.SchemaWeatherAlertV1 {
+		t.Fatalf("schema = %q, want %q", e.Schema, standards.SchemaWeatherAlertV1)
+	}
+	var run model.WeatherAlertRun
+	raw, err := json.Marshal(e.Payload)
+	if err != nil {
+		t.Fatalf("marshal alert payload: %v", err)
+	}
+	if err := json.Unmarshal(raw, &run); err != nil {
+		t.Fatalf("decode alert payload: %v", err)
+	}
+	return run
+}

internal/normalizers/nws/forecast_discussion_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -71,6 +72,277 @@ func TestForecastDiscussionNormalizerProducesCanonicalSchema(t *testing.T) {
 	}
 }
 
+func TestForecastDiscussionNormalizerSupportsMixedHeadingFormats(t *testing.T) {
+	out, err := (ForecastDiscussionNormalizer{}).Normalize(nil, event.Event{
+		ID:        "evt-discussion-mixed-format",
+		Kind:      event.Kind(standards.KindForecastDiscussion),
+		Source:    "nws-discussion-test",
+		EmittedAt: time.Date(2026, 3, 28, 19, 25, 0, 0, time.UTC),
+		Schema:    standards.SchemaRawNWSForecastDiscussionV1,
+		Payload:   loadMixedFormatForecastDiscussionSampleHTML(t),
+	})
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	if out == nil {
+		t.Fatalf("Normalize() returned nil output")
+	}
+	if out.Kind != event.Kind(standards.KindForecastDiscussion) {
+		t.Fatalf("Kind = %q, want forecast_discussion", out.Kind)
+	}
+	if out.Schema != standards.SchemaWeatherForecastDiscussionV1 {
+		t.Fatalf("Schema = %q, want %q", out.Schema, standards.SchemaWeatherForecastDiscussionV1)
+	}
+	wantEffectiveAt := time.Date(2026, 3, 28, 19, 24, 0, 0, time.UTC)
+	if out.EffectiveAt == nil || !out.EffectiveAt.Equal(wantEffectiveAt) {
+		t.Fatalf("EffectiveAt = %v, want %s", out.EffectiveAt, wantEffectiveAt.Format(time.RFC3339))
+	}
+
+	payload, ok := out.Payload.(model.WeatherForecastDiscussion)
+	if !ok {
+		t.Fatalf("Payload type = %T, want model.WeatherForecastDiscussion", out.Payload)
+	}
+	if payload.ShortTerm == nil || payload.LongTerm == nil {
+		t.Fatalf("ShortTerm=%v LongTerm=%v, want both populated", payload.ShortTerm, payload.LongTerm)
+	}
+	if payload.ShortTerm.Qualifier != "Through Late Sunday Night" {
+		t.Fatalf("ShortTerm.Qualifier = %q", payload.ShortTerm.Qualifier)
+	}
+	if !strings.Contains(payload.ShortTerm.Text, "After a chilly morning") {
+		t.Fatalf("ShortTerm.Text missing expected prose: %q", payload.ShortTerm.Text)
+	}
+	if payload.LongTerm.Qualifier != "Monday through Next Saturday" {
+		t.Fatalf("LongTerm.Qualifier = %q", payload.LongTerm.Qualifier)
+	}
+	if !strings.Contains(payload.LongTerm.Text, "The peak of the warmth arrives Monday and Tuesday") {
+		t.Fatalf("LongTerm.Text missing expected prose: %q", payload.LongTerm.Text)
+	}
+	if strings.Contains(payload.LongTerm.Text, "AVIATION") || strings.Contains(payload.LongTerm.Text, "VFR conditions are expected") {
+		t.Fatalf("LongTerm.Text includes aviation content: %q", payload.LongTerm.Text)
+	}
+
+	b, err := json.Marshal(out.Payload)
+	if err != nil {
+		t.Fatalf("json.Marshal(payload) error = %v", err)
+	}
+	var fields map[string]any
+	if err := json.Unmarshal(b, &fields); err != nil {
+		t.Fatalf("json.Unmarshal(payload) error = %v", err)
+	}
+	for _, key := range []string{"aviation", "sections"} {
+		if _, ok := fields[key]; ok {
+			t.Fatalf("unexpected key %q in canonical payload", key)
+		}
+	}
+}
+
+func TestForecastDiscussionNormalizerSupportsCrossOfficeLayout(t *testing.T) {
+	in := event.Event{
+		ID:        "evt-discussion-bou",
+		Kind:      event.Kind(standards.KindForecastDiscussion),
+		Source:    "nws-discussion-bou-test",
+		EmittedAt: time.Date(2026, 4, 7, 19, 1, 0, 0, time.UTC),
+		Schema:    standards.SchemaRawNWSForecastDiscussionV1,
+		Payload:   loadForecastDiscussionBOUSampleHTML(t),
+	}
+
+	out, err := (ForecastDiscussionNormalizer{}).Normalize(nil, in)
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	if out == nil {
+		t.Fatalf("Normalize() returned nil output")
+	}
+	if out.ID != in.ID || out.Source != in.Source || !out.EmittedAt.Equal(in.EmittedAt) {
+		t.Fatalf("envelope = %#v, want ID/source/emittedAt from input", out)
+	}
+	if out.Kind != event.Kind(standards.KindForecastDiscussion) {
+		t.Fatalf("Kind = %q, want forecast_discussion", out.Kind)
+	}
+	if out.Schema != standards.SchemaWeatherForecastDiscussionV1 {
+		t.Fatalf("Schema = %q, want %q", out.Schema, standards.SchemaWeatherForecastDiscussionV1)
+	}
+	wantEffectiveAt := time.Date(2026, 4, 7, 19, 0, 0, 0, time.UTC)
+	if out.EffectiveAt == nil || !out.EffectiveAt.Equal(wantEffectiveAt) {
+		t.Fatalf("EffectiveAt = %v, want %s", out.EffectiveAt, wantEffectiveAt.Format(time.RFC3339))
+	}
+
+	payload, ok := out.Payload.(model.WeatherForecastDiscussion)
+	if !ok {
+		t.Fatalf("Payload type = %T, want model.WeatherForecastDiscussion", out.Payload)
+	}
+	if payload.OfficeID != "BOU" || payload.OfficeName != "National Weather Service Denver CO" {
+		t.Fatalf("OfficeID=%q OfficeName=%q", payload.OfficeID, payload.OfficeName)
+	}
+	wantMessages := []string{
+		"Strong winds are expected along the Front Range this evening.",
+		"Cooler temperatures arrive on Wednesday.",
+	}
+	if len(payload.KeyMessages) != len(wantMessages) {
+		t.Fatalf("KeyMessages = %#v, want %#v", payload.KeyMessages, wantMessages)
+	}
+	for i := range wantMessages {
+		if payload.KeyMessages[i] != wantMessages[i] {
+			t.Fatalf("KeyMessages[%d] = %q, want %q", i, payload.KeyMessages[i], wantMessages[i])
+		}
+	}
+	if payload.ShortTerm == nil || payload.LongTerm == nil {
+		t.Fatalf("ShortTerm=%v LongTerm=%v, want both populated", payload.ShortTerm, payload.LongTerm)
+	}
+	if payload.ShortTerm.Qualifier != "(Tonight through Wednesday)" || payload.ShortTerm.Text != "Gusty west winds will continue through the evening before decreasing overnight." {
+		t.Fatalf("ShortTerm = %#v", payload.ShortTerm)
+	}
+	if payload.LongTerm.Qualifier != "(Thursday through Saturday)" || payload.LongTerm.Text != "Warmer and drier conditions return Thursday, followed by a chance of showers Friday." {
+		t.Fatalf("LongTerm = %#v", payload.LongTerm)
+	}
+	if payload.ShortTerm.IssuedAt == nil || payload.LongTerm.IssuedAt == nil ||
+		!payload.ShortTerm.IssuedAt.Equal(wantEffectiveAt) || !payload.LongTerm.IssuedAt.Equal(wantEffectiveAt) {
+		t.Fatalf("section issue times = short %v long %v, want %s", payload.ShortTerm.IssuedAt, payload.LongTerm.IssuedAt, wantEffectiveAt.Format(time.RFC3339))
+	}
+
+	b, err := json.Marshal(out.Payload)
+	if err != nil {
+		t.Fatalf("json.Marshal(payload) error = %v", err)
+	}
+	var fields map[string]any
+	if err := json.Unmarshal(b, &fields); err != nil {
+		t.Fatalf("json.Unmarshal(payload) error = %v", err)
+	}
+	for _, key := range []string{"aviation", "discussion", "sections"} {
+		if _, ok := fields[key]; ok {
+			t.Fatalf("unexpected key %q in canonical payload", key)
+		}
+	}
+}
+
+func TestForecastDiscussionNormalizerSupportsCrossOfficeKeyMessageFixtures(t *testing.T) {
+	tests := []struct {
+		name        string
+		filename    string
+		id          string
+		source      string
+		emittedAt   time.Time
+		effectiveAt time.Time
+		messages    []string
+	}{
+		{
+			name:        "numbered key messages",
+			filename:    "forecast_discussion_bgm_numbered_sample.html",
+			id:          "evt-discussion-bgm",
+			source:      "nws-discussion-bgm-test",
+			emittedAt:   time.Date(2026, 4, 10, 17, 31, 0, 0, time.UTC),
+			effectiveAt: time.Date(2026, 4, 10, 17, 30, 0, 0, time.UTC),
+			messages: []string{
+				"Periods of rain are expected through Saturday, with locally heavier amounts possible.",
+				"Cooler temperatures return late this weekend.",
+			},
+		},
+		{
+			name:        "key points alias",
+			filename:    "forecast_discussion_mfr_key_points_sample.html",
+			id:          "evt-discussion-mfr",
+			source:      "nws-discussion-mfr-test",
+			emittedAt:   time.Date(2026, 4, 10, 19, 46, 0, 0, time.UTC),
+			effectiveAt: time.Date(2026, 4, 10, 19, 45, 0, 0, time.UTC),
+			messages: []string{
+				"Gusty winds will develop over exposed ridges, especially during the afternoon.",
+				"Inland valleys remain dry through Saturday.",
+			},
+		},
+		{
+			name:        "as of preamble",
+			filename:    "forecast_discussion_rah_as_of_sample.html",
+			id:          "evt-discussion-rah",
+			source:      "nws-discussion-rah-test",
+			emittedAt:   time.Date(2026, 8, 2, 16, 36, 0, 0, time.UTC),
+			effectiveAt: time.Date(2026, 8, 2, 16, 35, 0, 0, time.UTC),
+			messages: []string{
+				"Scattered storms may produce locally heavy rain this afternoon.",
+				"Drier weather arrives Monday.",
+			},
+		},
+		{
+			name:        "parenthesized numeric markers",
+			filename:    "forecast_discussion_lwx_parenthesized_number_sample.html",
+			id:          "evt-discussion-lwx",
+			source:      "nws-discussion-lwx-test",
+			emittedAt:   time.Date(2026, 8, 2, 18, 1, 0, 0, time.UTC),
+			effectiveAt: time.Date(2026, 8, 2, 18, 0, 0, 0, time.UTC),
+			messages: []string{
+				"Thunderstorms remain possible near the Blue Ridge this evening.",
+				"Seasonably warm conditions continue Monday.",
+			},
+		},
+		{
+			name:        "embedded key messages in previous discussion",
+			filename:    "forecast_discussion_mfr_prev_discussion_sample.html",
+			id:          "evt-discussion-mfr-previous",
+			source:      "nws-discussion-mfr-previous-test",
+			emittedAt:   time.Date(2026, 8, 2, 22, 20, 0, 0, time.UTC),
+			effectiveAt: time.Date(2026, 8, 2, 22, 19, 0, 0, time.UTC),
+			messages: []string{
+				"Heat returns to inland valleys Monday.",
+				"Gusty afternoon winds develop east of the Cascades.",
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			in := event.Event{
+				ID:        tt.id,
+				Kind:      event.Kind(standards.KindForecastDiscussion),
+				Source:    tt.source,
+				EmittedAt: tt.emittedAt,
+				Schema:    standards.SchemaRawNWSForecastDiscussionV1,
+				Payload:   loadForecastDiscussionFixtureHTML(t, tt.filename),
+			}
+
+			out, err := (ForecastDiscussionNormalizer{}).Normalize(nil, in)
+			if err != nil {
+				t.Fatalf("Normalize() error = %v", err)
+			}
+			if out == nil {
+				t.Fatalf("Normalize() returned nil output")
+			}
+			if out.ID != in.ID || out.Source != in.Source || !out.EmittedAt.Equal(in.EmittedAt) {
+				t.Fatalf("envelope = %#v, want ID/source/emittedAt from input", out)
+			}
+			if out.Kind != event.Kind(standards.KindForecastDiscussion) {
+				t.Fatalf("Kind = %q, want forecast_discussion", out.Kind)
+			}
+			if out.Schema != standards.SchemaWeatherForecastDiscussionV1 {
+				t.Fatalf("Schema = %q, want %q", out.Schema, standards.SchemaWeatherForecastDiscussionV1)
+			}
+			if out.EffectiveAt == nil || !out.EffectiveAt.Equal(tt.effectiveAt) {
+				t.Fatalf("EffectiveAt = %v, want %s", out.EffectiveAt, tt.effectiveAt.Format(time.RFC3339))
+			}
+
+			payload, ok := out.Payload.(model.WeatherForecastDiscussion)
+			if !ok {
+				t.Fatalf("Payload type = %T, want model.WeatherForecastDiscussion", out.Payload)
+			}
+			if !reflect.DeepEqual(payload.KeyMessages, tt.messages) {
+				t.Fatalf("KeyMessages = %#v, want %#v", payload.KeyMessages, tt.messages)
+			}
+
+			b, err := json.Marshal(payload)
+			if err != nil {
+				t.Fatalf("json.Marshal(payload) error = %v", err)
+			}
+			var fields map[string]any
+			if err := json.Unmarshal(b, &fields); err != nil {
+				t.Fatalf("json.Unmarshal(payload) error = %v", err)
+			}
+			for _, key := range []string{"nearTerm", "discussion", "aviation", "sections"} {
+				if _, ok := fields[key]; ok {
+					t.Fatalf("unexpected key %q in canonical payload", key)
+				}
+			}
+		})
+	}
+}
+
 func TestForecastDiscussionNormalizerRejectsMissingIssueTime(t *testing.T) {
 	_, err := (ForecastDiscussionNormalizer{}).Normalize(nil, event.Event{
 		ID:        "evt-discussion-bad",
@@ -128,3 +400,56 @@ func loadForecastDiscussionSampleHTML(t *testing.T) string {
 	}
 	return string(b)
 }
+
+func loadForecastDiscussionBOUSampleHTML(t *testing.T) string {
+	t.Helper()
+
+	path := filepath.Join("..", "..", "providers", "nws", "testdata", "forecast_discussion_bou_sample.html")
+	b, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("os.ReadFile(%q) error = %v", path, err)
+	}
+	return string(b)
+}
+
+func loadForecastDiscussionFixtureHTML(t *testing.T, filename string) string {
+	t.Helper()
+
+	path := filepath.Join("..", "..", "providers", "nws", "testdata", filename)
+	b, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("os.ReadFile(%q) error = %v", path, err)
+	}
+	return string(b)
+}
+
+func loadMixedFormatForecastDiscussionSampleHTML(t *testing.T) string {
+	t.Helper()
+
+	raw := loadForecastDiscussionSampleHTML(t)
+	replacements := []struct {
+		original    string
+		replacement string
+	}{
+		{
+			original:    ".SHORT TERM...  (Through Late Sunday Night)",
+			replacement: ".SHORT TERM /Through Late Sunday Night/...",
+		},
+		{
+			original:    ".LONG TERM...  (Monday through Next Saturday)",
+			replacement: ".LONG TERM /Monday through Next Saturday/...",
+		},
+		{
+			original:    ".AVIATION...  (For the 18z TAFs through 18z Sunday Afternoon)",
+			replacement: ".AVIATION /For the 18z TAFs through 18z Sunday Afternoon/...",
+		},
+	}
+	for _, replacement := range replacements {
+		if !strings.Contains(raw, replacement.original) {
+			t.Fatalf("fixture missing heading %q", replacement.original)
+		}
+		raw = strings.Replace(raw, replacement.original, replacement.replacement, 1)
+	}
+
+	return raw
+}

internal/normalizers/spc/convective_outlook.go

@@ -29,10 +29,10 @@ var idTokenRE = regexp.MustCompile(`[^a-z0-9]+`)
 
 // ConvectiveOutlookNormalizer converts:
 //
-//	standards.SchemaRawSPCConvectiveOutlookV1 -> standards.SchemaWeatherOutlookV1
+//	standards.SchemaRawSPCConvectiveOutlookV1 -> standards.SchemaWeatherOutlookV2
 //
-// It maps SPC GeoJSON outlook features into canonical outlook polygons and
+// It maps SPC GeoJSON outlook features containing the configured location into
-// enriches each day with the matching required print-page discussion.
+// canonical outlook polygons and adds matching day-level print-page discussions.
 type ConvectiveOutlookNormalizer struct{}
 
 func (ConvectiveOutlookNormalizer) Match(e event.Event) bool {
@@ -50,7 +50,7 @@ func (ConvectiveOutlookNormalizer) Normalize(ctx context.Context, in event.Event
 	return normcommon.NormalizeJSON(
 		in,
 		outlookNormalizer,
-		standards.SchemaWeatherOutlookV1,
+		standards.SchemaWeatherOutlookV2,
 		func(parsed spcprovider.RawConvectiveOutlookBundle) (model.WeatherOutlookRun, time.Time, error) {
 			return buildConvectiveOutlook(parsed, fallbackAsOf)
 		},
@@ -76,8 +76,7 @@ func buildConvectiveOutlook(bundle spcprovider.RawConvectiveOutlookBundle, fallb
 		if err := validateProductMetadata(product); err != nil {
 			return model.WeatherOutlookRun{}, time.Time{}, err
 		}
-		discussion, ok := discussions[product.Day]
+		if _, ok := discussions[product.Day]; !ok {
-		if !ok {
 			return model.WeatherOutlookRun{}, time.Time{}, fmt.Errorf("product %s: discussion for day %d is required", product.Key, product.Day)
 		}
 
@@ -87,17 +86,36 @@ func buildConvectiveOutlook(bundle spcprovider.RawConvectiveOutlookBundle, fallb
 		}
 
 		for i, feature := range collection.Features {
-			outlook, err := mapFeature(product, feature, i, point, discussion)
+			if spcprovider.IsEmptyGeometryCollection(feature.Geometry) {
+				issuedAt, err := parseRequiredSPCTime(feature.Properties.IssueISO, fmt.Sprintf("product %s feature %d.ISSUE_ISO", product.Key, i))
+				if err != nil {
+					return model.WeatherOutlookRun{}, time.Time{}, err
+				}
+				if latestIssue.IsZero() || issuedAt.After(latestIssue) {
+					latestIssue = issuedAt
+				}
+				continue
+			}
+
+			outlook, err := mapFeature(product, feature, i, point)
 			if err != nil {
 				return model.WeatherOutlookRun{}, time.Time{}, err
 			}
 			if latestIssue.IsZero() || outlook.IssuedAt.After(latestIssue) {
 				latestIssue = outlook.IssuedAt
 			}
+			if !outlook.ContainsLocation {
+				continue
+			}
 			outlooks = append(outlooks, outlook)
 		}
 	}
 
+	runDiscussions, err := buildOutlookDiscussions(outlooks, discussions)
+	if err != nil {
+		return model.WeatherOutlookRun{}, time.Time{}, err
+	}
+
 	asOf := latestIssue
 	if asOf.IsZero() {
 		asOf = latestDiscussionUpdated
@@ -122,6 +140,7 @@ func buildConvectiveOutlook(bundle spcprovider.RawConvectiveOutlookBundle, fallb
 		AsOf:         asOf.UTC(),
 		IssuedAt:     issuedAt,
 		Outlooks:     outlooks,
+		Discussions:  runDiscussions,
 	}
 	return run, run.AsOf, nil
 }
@@ -164,6 +183,43 @@ func parseDiscussions(pages []spcprovider.RawDiscussionPage) (map[int]parsedDisc
 	return out, latestUpdated, nil
 }
 
+func buildOutlookDiscussions(outlooks []model.WeatherOutlook, discussions map[int]parsedDiscussion) ([]model.WeatherOutlookDiscussion, error) {
+	daysWithOutlooks := map[int]bool{}
+	for _, outlook := range outlooks {
+		daysWithOutlooks[outlook.Day] = true
+	}
+
+	days := make([]int, 0, len(daysWithOutlooks))
+	for day := range daysWithOutlooks {
+		days = append(days, day)
+	}
+	sort.Ints(days)
+
+	out := make([]model.WeatherOutlookDiscussion, 0, len(days))
+	for _, day := range days {
+		disc, ok := discussions[day]
+		if !ok {
+			return nil, fmt.Errorf("discussion for retained day %d is required", day)
+		}
+		out = append(out, model.WeatherOutlookDiscussion{
+			Day:        day,
+			Headline:   disc.Headline,
+			Summary:    disc.Summary,
+			Discussion: disc.Discussion,
+			UpdatedAt:  utcTimePtr(disc.UpdatedAt),
+		})
+	}
+	return out, nil
+}
+
+func utcTimePtr(t *time.Time) *time.Time {
+	if t == nil {
+		return nil
+	}
+	tt := t.UTC()
+	return &tt
+}
+
 func orderedProducts(products []spcprovider.RawOutlookProduct) []spcprovider.RawOutlookProduct {
 	out := make([]spcprovider.RawOutlookProduct, len(products))
 	copy(out, products)
@@ -208,7 +264,7 @@ func validateProductMetadata(product spcprovider.RawOutlookProduct) error {
 	}
 }
 
-func mapFeature(product spcprovider.RawOutlookProduct, feature spcprovider.GeoJSONFeature, index int, point geo.Point, discussion parsedDiscussion) (model.WeatherOutlook, error) {
+func mapFeature(product spcprovider.RawOutlookProduct, feature spcprovider.GeoJSONFeature, index int, point geo.Point) (model.WeatherOutlook, error) {
 	fieldPrefix := fmt.Sprintf("product %s feature %d", product.Key, index)
 	props := feature.Properties
 
@@ -253,9 +309,6 @@ func mapFeature(product spcprovider.RawOutlookProduct, feature spcprovider.GeoJS
 		IssuedAt:         issuedAt,
 		ExpiresAt:        validTo,
 		Forecaster:       strings.TrimSpace(props.Forecaster),
-		Headline:         discussion.Headline,
-		Summary:          discussion.Summary,
-		Discussion:       discussion.Discussion,
 		SourceURL:        strings.TrimSpace(product.URL),
 		ImageURL:         "",
 		ContainsLocation: containsLocation,

internal/normalizers/spc/convective_outlook_test.go

@@ -2,8 +2,6 @@ package spc
 
 import (
 	"encoding/json"
-	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -29,8 +27,8 @@ func TestConvectiveOutlookNormalizerProducesCanonicalSchemaAndMapsSample(t *test
 	if err != nil {
 		t.Fatalf("Normalize() error = %v", err)
 	}
-	if out.Schema != standards.SchemaWeatherOutlookV1 {
+	if out.Schema != standards.SchemaWeatherOutlookV2 {
-		t.Fatalf("Schema = %q, want %q", out.Schema, standards.SchemaWeatherOutlookV1)
+		t.Fatalf("Schema = %q, want %q", out.Schema, standards.SchemaWeatherOutlookV2)
 	}
 	if out.Kind != event.Kind(standards.KindOutlook) {
 		t.Fatalf("Kind = %q, want outlook", out.Kind)
@@ -56,8 +54,23 @@ func TestConvectiveOutlookNormalizerProducesCanonicalSchemaAndMapsSample(t *test
 	if run.Latitude == nil || *run.Latitude != 38.5 || run.Longitude == nil || *run.Longitude != -90.5 {
 		t.Fatalf("coordinates = %v,%v", run.Latitude, run.Longitude)
 	}
-	if len(run.Outlooks) != 12 {
+	if len(run.Outlooks) != 4 {
-		t.Fatalf("Outlooks length = %d, want 12", len(run.Outlooks))
+		t.Fatalf("Outlooks length = %d, want 4", len(run.Outlooks))
+	}
+	assertAllOutlooksContainLocation(t, run.Outlooks)
+	assertDiscussionDays(t, run.Discussions, 1)
+	day1Discussion := run.Discussions[0]
+	if day1Discussion.Headline != "Day 1 Convective Outlook" {
+		t.Fatalf("day 1 Headline = %q", day1Discussion.Headline)
+	}
+	if !strings.Contains(day1Discussion.Summary, "central Plains") {
+		t.Fatalf("day 1 Summary = %q", day1Discussion.Summary)
+	}
+	if !strings.Contains(day1Discussion.Discussion, "...DISCUSSION...") {
+		t.Fatalf("day 1 Discussion missing product text: %q", day1Discussion.Discussion)
+	}
+	if !strings.HasPrefix(day1Discussion.Discussion, "SPC AC 111234") {
+		t.Fatalf("day 1 Discussion = %q, want SPC product code prefix", day1Discussion.Discussion)
 	}
 
 	got := run.Outlooks[0]
@@ -90,25 +103,54 @@ func TestConvectiveOutlookNormalizerProducesCanonicalSchemaAndMapsSample(t *test
 	if !got.ContainsLocation {
 		t.Fatalf("ContainsLocation = false, want true")
 	}
-	if got.Headline != "Day 1 Convective Outlook" {
-		t.Fatalf("Headline = %q", got.Headline)
-	}
-	if !strings.Contains(got.Summary, "central Plains") {
-		t.Fatalf("Summary = %q", got.Summary)
-	}
-	if !strings.Contains(got.Discussion, "...DISCUSSION...") {
-		t.Fatalf("Discussion missing product text: %q", got.Discussion)
-	}
-	if !strings.HasPrefix(got.Discussion, "SPC AC 111234") {
-		t.Fatalf("Discussion = %q, want SPC product code prefix", got.Discussion)
-	}
 	if got.ID != "spc-convective-day1-categorical-slgt-2026-06-11T12:34:56Z-2026-06-11T13:00:00Z-0" {
 		t.Fatalf("ID = %q", got.ID)
 	}
 }
 
+func TestConvectiveOutlookNormalizerAcceptsTypedSourcePayload(t *testing.T) {
+	bundle := spcBundle(t, 38.5, -90.5)
+	in := spcRawEvent(t, bundle)
+	in.Payload = bundle
+
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, in)
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	run := out.Payload.(model.WeatherOutlookRun)
+	if len(run.Outlooks) != 4 {
+		t.Fatalf("Outlooks length = %d, want 4", len(run.Outlooks))
+	}
+	assertAllOutlooksContainLocation(t, run.Outlooks)
+	assertDiscussionDays(t, run.Discussions, 1)
+}
+
+func TestConvectiveOutlookNormalizerEmitsEmptyLocalRunOutsidePolygons(t *testing.T) {
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 0, 0)))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	run := out.Payload.(model.WeatherOutlookRun)
+	if len(run.Outlooks) != 0 {
+		t.Fatalf("Outlooks length = %d, want 0", len(run.Outlooks))
+	}
+	if len(run.Discussions) != 0 {
+		t.Fatalf("Discussions length = %d, want 0", len(run.Discussions))
+	}
+	wantAsOf := time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC)
+	if !run.AsOf.Equal(wantAsOf) {
+		t.Fatalf("AsOf = %s, want latest product issue time %s", run.AsOf, wantAsOf)
+	}
+	if run.IssuedAt == nil || !run.IssuedAt.Equal(wantAsOf) {
+		t.Fatalf("IssuedAt = %v, want latest product issue time %s", run.IssuedAt, wantAsOf)
+	}
+	if out.EffectiveAt == nil || !out.EffectiveAt.Equal(run.AsOf) {
+		t.Fatalf("EffectiveAt = %v, want run AsOf %s", out.EffectiveAt, run.AsOf)
+	}
+}
+
 func TestConvectiveOutlookNormalizerOrdersProductsByDayAndType(t *testing.T) {
-	bundle := spcBundle(t, 0, 0)
+	bundle := spcBundle(t, 38.5, -90.5)
 	for i, j := 0, len(bundle.Products)-1; i < j; i, j = i+1, j-1 {
 		bundle.Products[i], bundle.Products[j] = bundle.Products[j], bundle.Products[i]
 	}
@@ -138,11 +180,12 @@ func TestConvectiveOutlookNormalizerOrdersProductsByDayAndType(t *testing.T) {
 }
 
 func TestConvectiveOutlookNormalizerMapsProbabilisticOutlookTypes(t *testing.T) {
-	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 0, 0)))
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 38.5, -90.5)))
 	if err != nil {
 		t.Fatalf("Normalize() error = %v", err)
 	}
 	run := out.Payload.(model.WeatherOutlookRun)
+	assertAllOutlooksContainLocation(t, run.Outlooks)
 	for _, outlookType := range []string{
 		spcprovider.OutlookTypeTornado,
 		spcprovider.OutlookTypeHail,
@@ -154,19 +197,75 @@ func TestConvectiveOutlookNormalizerMapsProbabilisticOutlookTypes(t *testing.T)
 	}
 }
 
-func TestConvectiveOutlookNormalizerContainsLocationFalseOutsidePolygon(t *testing.T) {
+func TestConvectiveOutlookNormalizerSkipsEmptyGeometryCollectionPlaceholder(t *testing.T) {
-	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 0, 0)))
+	bundle := spcBundle(t, 36, -99)
+	replaced := false
+	for i := range bundle.Products {
+		if bundle.Products[i].Day == 2 && bundle.Products[i].OutlookType == spcprovider.OutlookTypeTornado {
+			bundle.Products[i].Body = json.RawMessage(emptyGeometryCollectionGeoJSON())
+			replaced = true
+		}
+	}
+	if !replaced {
+		t.Fatalf("test setup did not find day 2 tornado product")
+	}
+
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, bundle))
 	if err != nil {
 		t.Fatalf("Normalize() error = %v", err)
 	}
 	run := out.Payload.(model.WeatherOutlookRun)
-	if run.Outlooks[0].ContainsLocation {
+	if len(run.Outlooks) != 3 {
-		t.Fatalf("ContainsLocation = true, want false")
+		t.Fatalf("Outlooks length = %d, want 3", len(run.Outlooks))
+	}
+	assertAllOutlooksContainLocation(t, run.Outlooks)
+	assertDiscussionDays(t, run.Discussions, 2)
+	if got := findOutlook(run.Outlooks, 2, spcprovider.OutlookTypeTornado); got != nil {
+		t.Fatalf("day 2 tornado outlook = %+v, want nil placeholder skipped", *got)
+	}
+	wantAsOf := time.Date(2026, 6, 12, 10, 0, 0, 0, time.UTC)
+	if !run.AsOf.Equal(wantAsOf) {
+		t.Fatalf("AsOf = %s, want placeholder ISSUE_ISO %s", run.AsOf, wantAsOf)
+	}
+	if out.EffectiveAt == nil || !out.EffectiveAt.Equal(wantAsOf) {
+		t.Fatalf("EffectiveAt = %v, want placeholder ISSUE_ISO %s", out.EffectiveAt, wantAsOf)
 	}
 }
 
+func TestConvectiveOutlookNormalizerIncludesOnlyDayWithContainingPolygons(t *testing.T) {
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 36, -99)))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	run := out.Payload.(model.WeatherOutlookRun)
+	if len(run.Outlooks) == 0 {
+		t.Fatalf("Outlooks length = 0, want retained day 2 outlooks")
+	}
+	assertAllOutlooksContainLocation(t, run.Outlooks)
+	for i, outlook := range run.Outlooks {
+		if outlook.Day != 2 {
+			t.Fatalf("outlook[%d].Day = %d, want 2", i, outlook.Day)
+		}
+	}
+	assertDiscussionDays(t, run.Discussions, 2)
+}
+
+func TestConvectiveOutlookNormalizerUsesOneDiscussionForMultipleSameDayOutlooks(t *testing.T) {
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 38.5, -90.5)))
+	if err != nil {
+		t.Fatalf("Normalize() error = %v", err)
+	}
+	run := out.Payload.(model.WeatherOutlookRun)
+	if got := countOutlooksByDay(run.Outlooks, 1); got < 2 {
+		t.Fatalf("day 1 outlook count = %d, want multiple", got)
+	}
+	assertAllOutlooksContainLocation(t, run.Outlooks)
+	assertDiscussionDays(t, run.Discussions, 1)
+}
+
 func TestConvectiveOutlookNormalizerPreservesCorrectionMarker(t *testing.T) {
-	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 0, 0)))
+	bundle := spcBundle(t, 36, -99)
+	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, bundle))
 	if err != nil {
 		t.Fatalf("Normalize() error = %v", err)
 	}
@@ -175,11 +274,12 @@ func TestConvectiveOutlookNormalizerPreservesCorrectionMarker(t *testing.T) {
 	if got == nil {
 		t.Fatalf("missing day 2 tornado outlook")
 	}
-	if !strings.Contains(got.Headline, "CORR 1") {
+	assertDiscussionDays(t, run.Discussions, 2)
-		t.Fatalf("Headline = %q, want correction marker", got.Headline)
+	if !strings.Contains(run.Discussions[0].Headline, "CORR 1") {
+		t.Fatalf("day 2 headline = %q, want correction marker", run.Discussions[0].Headline)
 	}
-	if !strings.Contains(got.Discussion, "CORR 1") {
+	if !strings.Contains(run.Discussions[0].Discussion, "CORR 1") {
-		t.Fatalf("Discussion = %q, want correction marker", got.Discussion)
+		t.Fatalf("day 2 discussion = %q, want correction marker", run.Discussions[0].Discussion)
 	}
 }
 
@@ -245,6 +345,19 @@ func TestConvectiveOutlookNormalizerRejectsMissingLabel(t *testing.T) {
 	}
 }
 
+func TestConvectiveOutlookNormalizerRejectsMissingDiscussion(t *testing.T) {
+	bundle := spcBundle(t, 38.5, -90.5)
+	bundle.Discussions = bundle.Discussions[1:]
+
+	_, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, bundle))
+	if err == nil {
+		t.Fatalf("Normalize() error = nil, want error")
+	}
+	if !strings.Contains(err.Error(), "product day1_categorical: discussion for day 1 is required") {
+		t.Fatalf("error = %q, want missing discussion context", err)
+	}
+}
+
 func TestConvectiveOutlookNormalizerOutputJSONShape(t *testing.T) {
 	out, err := (ConvectiveOutlookNormalizer{}).Normalize(nil, spcRawEvent(t, spcBundle(t, 38.5, -90.5)))
 	if err != nil {
@@ -255,18 +368,53 @@ func TestConvectiveOutlookNormalizerOutputJSONShape(t *testing.T) {
 		t.Fatalf("Marshal(payload) error = %v", err)
 	}
 	got := string(raw)
-	for _, want := range []string{`"asOf"`, `"outlooks"`, `"containsLocation"`, `"geometry"`} {
+	for _, want := range []string{`"asOf"`, `"outlooks"`, `"discussions"`, `"containsLocation"`, `"geometry"`} {
 		if !strings.Contains(got, want) {
 			t.Fatalf("payload JSON missing %s: %s", want, got)
 		}
 	}
-	for _, unwanted := range []string{`"products"`, `"discussions"`, `"fetchedAt"`, `"body"`} {
+	outlookStart := strings.Index(got, `"outlooks"`)
+	discussionStart := strings.Index(got, `"discussions"`)
+	if outlookStart == -1 || discussionStart == -1 || discussionStart <= outlookStart {
+		t.Fatalf("payload JSON has unexpected outlook/discussion order: %s", got)
+	}
+	outlookJSON := got[outlookStart:discussionStart]
+	for _, unwanted := range []string{`"headline"`, `"summary"`, `"discussion"`} {
+		if strings.Contains(outlookJSON, unwanted) {
+			t.Fatalf("outlook JSON exposed polygon-level prose key %s: %s", unwanted, got)
+		}
+	}
+	for _, unwanted := range []string{`"products"`, `"fetchedAt"`, `"body"`} {
 		if strings.Contains(got, unwanted) {
 			t.Fatalf("payload JSON exposed raw key %s: %s", unwanted, got)
 		}
 	}
 }
 
+func emptyGeometryCollectionGeoJSON() []byte {
+	return []byte(`{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "VALID_ISO": "2026-06-12T12:00:00Z",
+        "EXPIRE_ISO": "2026-06-13T12:00:00Z",
+        "ISSUE_ISO": "2026-06-12T10:00:00Z",
+        "FORECASTER": "DOE",
+        "LABEL": "Less Than 2% All Areas",
+        "LABEL2": "",
+        "DN": 0
+      },
+      "geometry": {
+        "type": "GeometryCollection",
+        "geometries": []
+      }
+    }
+  ]
+}`)
+}
+
 func spcRawEvent(t *testing.T, bundle spcprovider.RawConvectiveOutlookBundle) event.Event {
 	t.Helper()
 	raw, err := json.Marshal(bundle)
@@ -322,23 +470,13 @@ func geoJSONFixtureForProduct(t *testing.T, key string) []byte {
 	case strings.HasPrefix(key, "day2_"):
 		return readSPCTestFixture(t, "day2_torn.geojson")
 	case strings.HasPrefix(key, "day3_"):
-		return readSPCTestFixture(t, "day3_wind.geojson")
+		return readSPCTestFixture(t, "day3_cat.geojson")
 	default:
 		t.Fatalf("unknown product key %q", key)
 		return nil
 	}
 }
 
-func readSPCTestFixture(t *testing.T, name string) []byte {
-	t.Helper()
-	path := filepath.Join("..", "..", "providers", "spc", "testdata", name)
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		t.Fatalf("read fixture %s: %v", path, err)
-	}
-	return raw
-}
-
 func findOutlook(outlooks []model.WeatherOutlook, day int, outlookType string) *model.WeatherOutlook {
 	for i := range outlooks {
 		if outlooks[i].Day == day && outlooks[i].OutlookType == outlookType {
@@ -348,6 +486,37 @@ func findOutlook(outlooks []model.WeatherOutlook, day int, outlookType string) *
 	return nil
 }
 
+func countOutlooksByDay(outlooks []model.WeatherOutlook, day int) int {
+	count := 0
+	for _, outlook := range outlooks {
+		if outlook.Day == day {
+			count++
+		}
+	}
+	return count
+}
+
+func assertAllOutlooksContainLocation(t *testing.T, outlooks []model.WeatherOutlook) {
+	t.Helper()
+	for i, outlook := range outlooks {
+		if !outlook.ContainsLocation {
+			t.Fatalf("outlook[%d].ContainsLocation = false, want true", i)
+		}
+	}
+}
+
+func assertDiscussionDays(t *testing.T, discussions []model.WeatherOutlookDiscussion, want ...int) {
+	t.Helper()
+	if len(discussions) != len(want) {
+		t.Fatalf("Discussions length = %d, want %d", len(discussions), len(want))
+	}
+	for i, day := range want {
+		if discussions[i].Day != day {
+			t.Fatalf("Discussions[%d].Day = %d, want %d", i, discussions[i].Day, day)
+		}
+	}
+}
+
 func assertTime(t *testing.T, name string, got time.Time, year int, month time.Month, day int, hour int, minute int, second int) {
 	t.Helper()
 	want := time.Date(year, month, day, hour, minute, second, 0, time.UTC)

internal/normalizers/spc/fixture_test.go

@@ -0,0 +1,17 @@
+package spc
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func readSPCTestFixture(t *testing.T, name string) []byte {
+	t.Helper()
+	path := filepath.Join("..", "..", "providers", "spc", "testdata", name)
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("read fixture %s: %v", path, err)
+	}
+	return raw
+}

internal/providers/nws/forecast_discussion.go

@@ -27,8 +27,31 @@ type ForecastDiscussionSection struct {
 	Text      string
 }
 
+type forecastDiscussionSectionRole uint8
+
+const (
+	forecastDiscussionSectionRoleKeyMessages forecastDiscussionSectionRole = iota
+	forecastDiscussionSectionRoleShortTerm
+	forecastDiscussionSectionRoleLongTerm
+)
+
+type forecastDiscussionSectionHeading struct {
+	section   string
+	qualifier string
+}
+
+type forecastDiscussionSectionBlock struct {
+	heading forecastDiscussionSectionHeading
+	body    []string
+}
+
 var (
-	forecastDiscussionHeaderRE = regexp.MustCompile(`^\.(KEY MESSAGES|SHORT TERM|LONG TERM|AVIATION)\.\.\.(.*)$`)
+	forecastDiscussionSectionRoles = map[string]forecastDiscussionSectionRole{
+		"KEY MESSAGES": forecastDiscussionSectionRoleKeyMessages,
+		"KEY POINTS":   forecastDiscussionSectionRoleKeyMessages,
+		"SHORT TERM":   forecastDiscussionSectionRoleShortTerm,
+		"LONG TERM":    forecastDiscussionSectionRoleLongTerm,
+	}
 	forecastDiscussionAFDRE = regexp.MustCompile(`^AFD([A-Z]{3})$`)
 	forecastDiscussionWMORE = regexp.MustCompile(`\bK([A-Z]{3})\b`)
 	forecastDiscussionSigRE = regexp.MustCompile(`^[A-Z]{2,6}$`)
@@ -99,23 +122,31 @@ func ParseForecastDiscussionText(text string) (ForecastDiscussion, error) {
 		IssuedAt:   issuedAt.UTC(),
 	}
 
-	if block, ok := extractForecastDiscussionSection(lines, "KEY MESSAGES"); ok {
+	seenRoles := make(map[forecastDiscussionSectionRole]bool, len(forecastDiscussionSectionRoles))
-		out.KeyMessages = parseForecastDiscussionKeyMessages(block)
+	for _, block := range parseForecastDiscussionSectionBlocks(lines) {
+		role, ok := forecastDiscussionSectionRoles[block.heading.section]
+		if !ok || seenRoles[role] {
+			continue
 		}
-	if block, ok := extractForecastDiscussionSection(lines, "SHORT TERM"); ok {
+		seenRoles[role] = true
+
+		switch role {
+		case forecastDiscussionSectionRoleKeyMessages:
+			out.KeyMessages = parseForecastDiscussionKeyMessages(block.body)
+		case forecastDiscussionSectionRoleShortTerm:
 			section, err := parseForecastDiscussionTextSection(block)
 			if err != nil {
-			return ForecastDiscussion{}, fmt.Errorf("parse SHORT TERM: %w", err)
+				return ForecastDiscussion{}, fmt.Errorf("parse %s: %w", block.heading.section, err)
 			}
 			out.ShortTerm = &section
-	}
+		case forecastDiscussionSectionRoleLongTerm:
-	if block, ok := extractForecastDiscussionSection(lines, "LONG TERM"); ok {
 			section, err := parseForecastDiscussionTextSection(block)
 			if err != nil {
-			return ForecastDiscussion{}, fmt.Errorf("parse LONG TERM: %w", err)
+				return ForecastDiscussion{}, fmt.Errorf("parse %s: %w", block.heading.section, err)
 			}
 			out.LongTerm = &section
 		}
+	}
 
 	return out, nil
 }
@@ -285,8 +316,9 @@ func parseForecastDiscussionHeader(lines []string) (string, time.Time, error) {
 
 func parseForecastDiscussionIssueTime(line string) (time.Time, error) {
 	line = strings.TrimSpace(line)
-	line = strings.TrimPrefix(line, "Issued at ")
+	if isForecastDiscussionIssuedAtLine(line) {
-	line = strings.TrimSpace(line)
+		line = strings.TrimSpace(line[len("Issued at"):])
+	}
 
 	parts := strings.Fields(line)
 	if len(parts) != 7 {
@@ -386,40 +418,217 @@ func forecastDiscussionLocation(abbrev string) (*time.Location, error) {
 	return time.FixedZone(abbr, offset), nil
 }
 
-func extractForecastDiscussionSection(lines []string, section string) ([]string, bool) {
+func parseForecastDiscussionSectionHeading(line string) (forecastDiscussionSectionHeading, bool) {
-	target := "." + section + "..."
+	line = strings.TrimSpace(line)
-	for i, raw := range lines {
+	if len(line) < 2 || line[0] != '.' {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	if strings.HasSuffix(line, "/...") {
+		return parseForecastDiscussionSlashQualifiedHeading(line)
+	}
+	if strings.HasSuffix(line, "...") {
+		if heading, ok := parseForecastDiscussionParenthesizedTerminalHeading(line); ok {
+			return heading, true
+		}
+	}
+	return parseForecastDiscussionEllipsisHeading(line)
+}
+
+func parseForecastDiscussionSlashQualifiedHeading(line string) (forecastDiscussionSectionHeading, bool) {
+	content := strings.TrimSuffix(line[1:], "/...")
+	separator := -1
+	for i := 1; i < len(content); i++ {
+		if content[i] == '/' && isForecastDiscussionHorizontalWhitespace(content[i-1]) {
+			separator = i
+			break
+		}
+	}
+	if separator < 0 {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	section, ok := normalizeForecastDiscussionSectionIdentity(content[:separator])
+	if !ok {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	qualifier := strings.TrimSpace(content[separator+1:])
+	if qualifier == "" {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	return forecastDiscussionSectionHeading{section: section, qualifier: qualifier}, true
+}
+
+func parseForecastDiscussionParenthesizedTerminalHeading(line string) (forecastDiscussionSectionHeading, bool) {
+	if len(line) < 4 || line[0] != '.' || !strings.HasSuffix(line, "...") {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	content := strings.TrimRight(line[1:len(line)-3], " \t")
+	if !strings.HasSuffix(content, ")") {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	separator := -1
+	for i := 1; i < len(content); i++ {
+		if content[i] == '(' && isForecastDiscussionHorizontalWhitespace(content[i-1]) {
+			separator = i
+			break
+		}
+	}
+	if separator < 0 {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	section, ok := normalizeForecastDiscussionSectionIdentity(content[:separator])
+	if !ok {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	qualifier := content[separator:]
+	if len(qualifier) <= 2 || strings.TrimSpace(qualifier[1:len(qualifier)-1]) == "" {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	return forecastDiscussionSectionHeading{section: section, qualifier: qualifier}, true
+}
+
+func parseForecastDiscussionEllipsisHeading(line string) (forecastDiscussionSectionHeading, bool) {
+	content := line[1:]
+	delimiter := strings.Index(content, "...")
+	if delimiter < 0 {
+		return forecastDiscussionSectionHeading{}, false
+	}
+
+	section, ok := normalizeForecastDiscussionSectionIdentity(content[:delimiter])
+	if !ok {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	return forecastDiscussionSectionHeading{
+		section:   section,
+		qualifier: strings.TrimSpace(content[delimiter+3:]),
+	}, true
+}
+
+func normalizeForecastDiscussionSectionIdentity(raw string) (string, bool) {
+	var normalized strings.Builder
+	pendingSpace := false
+	hasLetterOrDigit := false
+
+	for i := 0; i < len(raw); i++ {
+		b := raw[i]
+		switch {
+		case isForecastDiscussionIdentityLetterOrDigit(b):
+			hasLetterOrDigit = true
+		case b == ' ' || b == '\t':
+			pendingSpace = normalized.Len() > 0
+			continue
+		case b == '/' && i > 0 && isForecastDiscussionHorizontalWhitespace(raw[i-1]):
+			return "", false
+		case b != '/' && b != '&' && b != '\'' && b != '-':
+			return "", false
+		}
+
+		if pendingSpace {
+			normalized.WriteByte(' ')
+			pendingSpace = false
+		}
+		normalized.WriteByte(b)
+	}
+	if !hasLetterOrDigit {
+		return "", false
+	}
+	return normalized.String(), true
+}
+
+func isForecastDiscussionIdentityLetterOrDigit(b byte) bool {
+	return b >= 'A' && b <= 'Z' || b >= '0' && b <= '9'
+}
+
+func isForecastDiscussionHorizontalWhitespace(b byte) bool {
+	return b == ' ' || b == '\t'
+}
+
+func parseForecastDiscussionSectionBlocks(lines []string) []forecastDiscussionSectionBlock {
+	var blocks []forecastDiscussionSectionBlock
+	var active *forecastDiscussionSectionBlock
+	embeddedHeadings := false
+
+	finish := func() {
+		if active == nil {
+			return
+		}
+		blocks = append(blocks, *active)
+		active = nil
+	}
+
+	for _, raw := range lines {
 		line := strings.TrimSpace(raw)
-		if !strings.HasPrefix(line, target) {
+		if line == "$$" {
+			finish()
+			break
+		}
+		if line == "&&" || strings.Contains(line, "WATCHES/WARNINGS/ADVISORIES") {
+			finish()
+			embeddedHeadings = false
 			continue
 		}
 
-		out := []string{line}
+		heading, ok := parseForecastDiscussionSectionHeading(raw)
-		for j := i + 1; j < len(lines); j++ {
+		if ok {
-			next := strings.TrimSpace(lines[j])
+			finish()
-			if next == "&&" || next == "$$" || strings.Contains(next, "WATCHES/WARNINGS/ADVISORIES") {
+			active = &forecastDiscussionSectionBlock{heading: heading}
-				break
+			embeddedHeadings = isForecastDiscussionEmbeddedSectionWrapper(heading.section)
+			continue
 		}
-			if j > i+1 && isForecastDiscussionSectionHeader(next) {
+		if embeddedHeadings {
-				break
+			heading, ok = parseForecastDiscussionEmbeddedSectionHeading(raw)
+			if ok {
+				finish()
+				active = &forecastDiscussionSectionBlock{heading: heading}
+				continue
 			}
-			out = append(out, lines[j])
 		}
-		return out, true
+		if active != nil {
+			active.body = append(active.body, raw)
 		}
-	return nil, false
+	}
+	finish()
+
+	return blocks
 }
 
-func isForecastDiscussionSectionHeader(line string) bool {
+func isForecastDiscussionEmbeddedSectionWrapper(section string) bool {
-	return forecastDiscussionHeaderRE.MatchString(strings.TrimSpace(line))
+	return section == "PREV DISCUSSION"
 }
 
-func parseForecastDiscussionKeyMessages(block []string) []string {
+func parseForecastDiscussionEmbeddedSectionHeading(line string) (forecastDiscussionSectionHeading, bool) {
-	if len(block) <= 1 {
+	line = strings.TrimSpace(line)
+	if line == "" || line[0] == '.' {
+		return forecastDiscussionSectionHeading{}, false
+	}
+	return parseForecastDiscussionSectionHeading("." + line)
+}
+
+func parseForecastDiscussionKeyMessages(body []string) []string {
+	body = removeForecastDiscussionPresentationMarkers(body)
+	body = trimBlankLines(body)
+	if len(body) > 0 && isForecastDiscussionKeyMessageMetadataLine(body[0]) {
+		body = trimBlankLines(body[1:])
+	}
+	if len(body) == 0 {
 		return nil
 	}
+	hasMarkers := false
+	for _, raw := range body {
+		line := strings.TrimSpace(raw)
+		if line == "" {
+			continue
+		}
+		if _, ok := stripForecastDiscussionKeyMessageMarker(line); ok {
+			hasMarkers = true
+			break
+		}
+	}
 
-	body := trimBlankLines(block[1:])
 	var messages []string
 	var current strings.Builder
 
@@ -431,15 +640,21 @@ func parseForecastDiscussionKeyMessages(block []string) []string {
 		current.Reset()
 	}
 
+	seenMarker := false
 	for _, raw := range body {
 		line := strings.TrimSpace(raw)
 		if line == "" {
+			if !hasMarkers || !seenMarker {
+				flush()
+			}
 			continue
 		}
-		if strings.HasPrefix(line, "-") {
+		if stripped, ok := stripForecastDiscussionKeyMessageMarker(line); ok {
 			flush()
-			line = strings.TrimSpace(strings.TrimPrefix(line, "-"))
+			seenMarker = true
-			current.WriteString(line)
+			line = stripped
+		}
+		if line == "" {
 			continue
 		}
 		if current.Len() > 0 {
@@ -452,25 +667,24 @@ func parseForecastDiscussionKeyMessages(block []string) []string {
 	return messages
 }
 
-func parseForecastDiscussionTextSection(block []string) (ForecastDiscussionSection, error) {
+func parseForecastDiscussionTextSection(block forecastDiscussionSectionBlock) (ForecastDiscussionSection, error) {
-	if len(block) == 0 {
-		return ForecastDiscussionSection{}, fmt.Errorf("empty section")
-	}
-
 	section := ForecastDiscussionSection{
-		Qualifier: parseForecastDiscussionQualifier(strings.TrimSpace(block[0])),
+		Qualifier: block.heading.qualifier,
 	}
 
-	body := trimBlankLines(block[1:])
+	body := trimBlankLines(removeForecastDiscussionPresentationMarkers(block.body))
+	if section.Qualifier == "" && len(body) > 0 && isForecastDiscussionStandaloneParenthetical(body[0]) {
+		section.Qualifier = strings.TrimSpace(body[0])
+		body = trimBlankLines(body[1:])
+	}
 	if len(body) == 0 {
 		return section, nil
 	}
 
-	first := strings.TrimSpace(body[0])
+	if isForecastDiscussionIssuedAtLine(body[0]) {
-	if strings.HasPrefix(first, "Issued at ") {
+		issuedAt, err := parseForecastDiscussionIssueTime(body[0])
-		issuedAt, err := parseForecastDiscussionIssueTime(first)
 		if err != nil {
-			return ForecastDiscussionSection{}, fmt.Errorf("parse section issuedAt %q: %w", first, err)
+			return ForecastDiscussionSection{}, fmt.Errorf("parse section issuedAt %q: %w", strings.TrimSpace(body[0]), err)
 		}
 		tt := issuedAt.UTC()
 		section.IssuedAt = &tt
@@ -482,12 +696,147 @@ func parseForecastDiscussionTextSection(block []string) (ForecastDiscussionSecti
 	return section, nil
 }
 
-func parseForecastDiscussionQualifier(header string) string {
+func isForecastDiscussionPresentationMarker(line string) bool {
-	m := forecastDiscussionHeaderRE.FindStringSubmatch(header)
+	switch {
-	if len(m) != 3 {
+	case strings.EqualFold(strings.TrimSpace(line), "-- Changed Discussion --"):
-		return ""
+		return true
+	case strings.EqualFold(strings.TrimSpace(line), "-- End Changed Discussion --"):
+		return true
+	default:
+		return false
 	}
-	return strings.TrimSpace(m[2])
+}
+
+func removeForecastDiscussionPresentationMarkers(lines []string) []string {
+	body := make([]string, 0, len(lines))
+	for _, line := range lines {
+		if !isForecastDiscussionPresentationMarker(line) {
+			body = append(body, line)
+		}
+	}
+	return body
+}
+
+func isForecastDiscussionStandaloneParenthetical(line string) bool {
+	line = strings.TrimSpace(line)
+	return len(line) > 2 && line[0] == '(' && line[len(line)-1] == ')' && strings.TrimSpace(line[1:len(line)-1]) != ""
+}
+
+func isForecastDiscussionIssuedAtLine(line string) bool {
+	line = strings.TrimSpace(line)
+	return len(line) > len("Issued at") &&
+		strings.EqualFold(line[:len("Issued at")], "Issued at") &&
+		isForecastDiscussionHorizontalWhitespace(line[len("Issued at")])
+}
+
+func isForecastDiscussionKeyMessageMetadataLine(line string) bool {
+	line = strings.TrimSpace(line)
+	for _, label := range []string{"Issued at", "Updated at"} {
+		if !hasForecastDiscussionASCIIPrefix(line, label) || len(line) == len(label) || !isForecastDiscussionHorizontalWhitespace(line[len(label)]) {
+			continue
+		}
+		if _, err := parseForecastDiscussionIssueTime(strings.TrimSpace(line[len(label):])); err == nil {
+			return true
+		}
+	}
+	return isForecastDiscussionKeyMessageAsOfLine(line)
+}
+
+func isForecastDiscussionKeyMessageAsOfLine(line string) bool {
+	const label = "As of"
+
+	if !hasForecastDiscussionASCIIPrefix(line, label) || len(line) == len(label) || !isForecastDiscussionHorizontalWhitespace(line[len(label)]) {
+		return false
+	}
+	remainder := strings.TrimSpace(line[len(label):])
+	if !strings.HasSuffix(remainder, "...") {
+		return false
+	}
+	fields := strings.Fields(strings.TrimSpace(strings.TrimSuffix(remainder, "...")))
+	if len(fields) != 3 {
+		return false
+	}
+	if _, _, err := parseForecastDiscussionClock(fields[0], fields[1]); err != nil {
+		return false
+	}
+	switch strings.ToLower(fields[2]) {
+	case "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday":
+		return true
+	default:
+		return false
+	}
+}
+
+func stripForecastDiscussionKeyMessageMarker(line string) (string, bool) {
+	if line == "" {
+		return "", false
+	}
+
+	if line[0] == '-' || line[0] == '*' {
+		content := line[1:]
+		hadWhitespace := len(content) > 0 && isForecastDiscussionHorizontalWhitespace(content[0])
+		content = strings.TrimLeft(content, " \t")
+		if hadWhitespace {
+			if stripped, ok := stripForecastDiscussionKeyMessageNumericMarker(content); ok {
+				content = stripped
+			}
+		}
+		return content, true
+	}
+
+	return stripForecastDiscussionKeyMessageNumericMarker(line)
+}
+
+func stripForecastDiscussionKeyMessageNumericMarker(line string) (string, bool) {
+	digitStart := 0
+	digitEnd := 0
+	parenthesized := len(line) > 0 && line[0] == '('
+	if parenthesized {
+		digitStart = 1
+		digitEnd = 1
+	}
+	for digitEnd < len(line) && line[digitEnd] >= '0' && line[digitEnd] <= '9' {
+		digitEnd++
+	}
+	if digitEnd == digitStart || digitEnd == len(line) {
+		return "", false
+	}
+	if parenthesized && line[digitEnd] != ')' {
+		return "", false
+	}
+	if !parenthesized && line[digitEnd] != ')' && line[digitEnd] != '.' {
+		return "", false
+	}
+
+	markerEnd := digitEnd + 1
+	if markerEnd < len(line) && !isForecastDiscussionHorizontalWhitespace(line[markerEnd]) {
+		return "", false
+	}
+	value, err := strconv.ParseUint(line[digitStart:digitEnd], 10, 0)
+	if err != nil || value == 0 {
+		return "", false
+	}
+	return strings.TrimLeft(line[markerEnd:], " \t"), true
+}
+
+func hasForecastDiscussionASCIIPrefix(line, prefix string) bool {
+	if len(line) < len(prefix) {
+		return false
+	}
+	for i := range prefix {
+		actual := line[i]
+		if actual >= 'A' && actual <= 'Z' {
+			actual += 'a' - 'A'
+		}
+		expected := prefix[i]
+		if expected >= 'A' && expected <= 'Z' {
+			expected += 'a' - 'A'
+		}
+		if actual != expected {
+			return false
+		}
+	}
+	return true
 }
 
 func trimBlankLines(lines []string) []string {

internal/providers/nws/testdata/forecast_discussion_bgm_numbered_sample.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- Representative BGM/CTP-style layout; prose is concise edited test data, not an archived product. -->
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS61 KBGM 101730
+AFDBGM
+
+Area Forecast Discussion
+National Weather Service Binghamton NY
+130 PM EDT Fri Apr 10 2026
+
+.KEY MESSAGES...
+1) Periods of rain are expected through Saturday,
+with locally heavier amounts possible.
+2. Cooler temperatures return late this weekend.
+
+.DISCUSSION...
+Discussion details remain boundary-only content.
+
+$$
+
+WFO BGM
+    </pre>
+  </body>
+</html>

internal/providers/nws/testdata/forecast_discussion_bou_sample.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS65 KBOU 071900
+AFDBOU
+
+Area Forecast Discussion
+National Weather Service Denver CO
+100 PM MDT Tue Apr 7 2026
+
+.KEY MESSAGES...
+-- Changed Discussion --
+Updated at 100 PM MDT Tue Apr 7 2026
+- Strong winds are expected along the Front Range this evening.
+- Cooler temperatures arrive on Wednesday.
+-- End Changed Discussion --
+
+&&
+
+.SHORT TERM...
+(Tonight through Wednesday)
+Issued at 100 PM MDT Tue Apr 7 2026
+
+Gusty west winds will continue through the evening before decreasing overnight.
+
+&&
+
+.LONG TERM...
+(Thursday through Saturday)
+ISSUED AT 100 PM MDT Tue Apr 7 2026
+
+Warmer and drier conditions return Thursday, followed by a chance of showers Friday.
+
+&&
+
+.AVIATION...
+
+VFR conditions are expected at Denver-area terminals through Wednesday morning.
+
+&&
+
+$$
+
+WFO BOU
+    </pre>
+  </body>
+</html>

internal/providers/nws/testdata/forecast_discussion_lwx_parenthesized_number_sample.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<!-- Representative LWX-style layout; prose is concise edited test data, not an archived product. -->
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS61 KLWX 021800
+AFDLWX
+
+Area Forecast Discussion
+National Weather Service Baltimore MD/Washington DC
+200 PM EDT Sun Aug 2 2026
+
+.KEY MESSAGES...
+- (1) Thunderstorms remain possible near the Blue Ridge this evening.
+- (2) Seasonably warm conditions continue Monday.
+
+&&
+
+.AVIATION...
+Aviation details remain boundary-only content.
+
+$$
+
+WFO LWX
+    </pre>
+  </body>
+</html>

internal/providers/nws/testdata/forecast_discussion_mfr_key_points_sample.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<!-- Representative MFR-style layout; prose is concise edited test data, not an archived product. -->
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS66 KMFR 101945
+AFDMFR
+
+Area Forecast Discussion
+National Weather Service Medford OR
+1245 PM PDT Fri Apr 10 2026
+
+.KEY POINTS...
+* Gusty winds will develop over exposed ridges,
+especially during the afternoon.
+* Inland valleys remain dry through Saturday.
+.DISCUSSION (Today through Thursday)...
+Discussion details must not be included with key points.
+
+$$
+
+WFO MFR
+    </pre>
+  </body>
+</html>

internal/providers/nws/testdata/forecast_discussion_mfr_prev_discussion_sample.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- Representative current MFR previous-discussion wrapper layout; prose is concise edited test data, not an archived product. -->
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS66 KMFR 022219
+AFDMFR
+
+Area Forecast Discussion
+National Weather Service Medford OR
+319 PM PDT Sun Aug 2 2026
+
+.PREV DISCUSSION... /Issued 319 PM PDT Sun Aug 2 2026/
+
+KEY MESSAGES...
+
+* Heat returns to inland valleys Monday.
+* Gusty afternoon winds develop east of the Cascades.
+
+DISCUSSION...
+Discussion details must not be included with key messages.
+
+&&
+
+.MFR WATCHES/WARNINGS/ADVISORIES...
+None.
+
+$$
+
+WFO MFR
+    </pre>
+  </body>
+</html>

internal/providers/nws/testdata/forecast_discussion_rah_as_of_sample.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- Representative RAH-style layout; prose is concise edited test data, not an archived product. -->
+<html>
+  <body>
+    <pre class="glossaryProduct">
+FXUS62 KRAH 021635
+AFDRAH
+
+Area Forecast Discussion
+National Weather Service Raleigh NC
+1235 PM EDT Sun Aug 2 2026
+
+.KEY MESSAGES...
+As of 1235 PM Sunday...
+
+1) Scattered storms may produce locally heavy rain this afternoon.
+2) Drier weather arrives Monday.
+
+&&
+
+.DISCUSSION...
+Discussion details remain boundary-only content.
+
+$$
+
+WFO RAH
+    </pre>
+  </body>
+</html>

internal/providers/spc/geojson.go

@@ -33,6 +33,11 @@ type GeoJSONProperties struct {
 	DN         *int   `json:"DN"`
 }
 
+type geometryMetadata struct {
+	Type       string            `json:"type"`
+	Geometries []json.RawMessage `json:"geometries"`
+}
+
 // DecodeGeoJSON decodes an SPC GeoJSON outlook product and compacts feature
 // geometry JSON for stable downstream storage.
 func DecodeGeoJSON(raw []byte) (GeoJSONFeatureCollection, error) {
@@ -50,6 +55,16 @@ func DecodeGeoJSON(raw []byte) (GeoJSONFeatureCollection, error) {
 	return collection, nil
 }
 
+// IsEmptyGeometryCollection reports whether raw is SPC's no-polygon placeholder
+// geometry shape: a GeometryCollection with no child geometries.
+func IsEmptyGeometryCollection(raw json.RawMessage) bool {
+	var meta geometryMetadata
+	if err := json.Unmarshal(raw, &meta); err != nil {
+		return false
+	}
+	return meta.Type == "GeometryCollection" && len(meta.Geometries) == 0
+}
+
 func (p *GeoJSONProperties) UnmarshalJSON(raw []byte) error {
 	type alias GeoJSONProperties
 	var aux struct {

internal/providers/spc/geojson_test.go

@@ -66,6 +66,43 @@ func TestDecodeGeoJSONParsesSeverityRankString(t *testing.T) {
 	}
 }
 
+func TestIsEmptyGeometryCollection(t *testing.T) {
+	tests := []struct {
+		name string
+		raw  string
+		want bool
+	}{
+		{
+			name: "empty geometry collection",
+			raw:  `{"type":"GeometryCollection","geometries":[]}`,
+			want: true,
+		},
+		{
+			name: "non-empty geometry collection",
+			raw:  `{"type":"GeometryCollection","geometries":[{"type":"Polygon","coordinates":[]} ]}`,
+			want: false,
+		},
+		{
+			name: "polygon",
+			raw:  `{"type":"Polygon","coordinates":[]}`,
+			want: false,
+		},
+		{
+			name: "invalid json",
+			raw:  `{`,
+			want: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := IsEmptyGeometryCollection([]byte(tt.raw)); got != tt.want {
+				t.Fatalf("IsEmptyGeometryCollection() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestParseISOTimestampTrimsAndReturnsUTC(t *testing.T) {
 	got, err := ParseISOTimestamp(" 2026-06-11T12:34:56Z ")
 	if err != nil {

internal/providers/spc/product.go

@@ -34,9 +34,6 @@ var geoJSONProducts = []GeoJSONProduct{
 	{Key: "day2_hail", Day: 2, OutlookType: OutlookTypeHail, URL: "https://www.spc.noaa.gov/products/outlook/day2otlk_hail.nolyr.geojson"},
 	{Key: "day2_wind", Day: 2, OutlookType: OutlookTypeWind, URL: "https://www.spc.noaa.gov/products/outlook/day2otlk_wind.nolyr.geojson"},
 	{Key: "day3_categorical", Day: 3, OutlookType: OutlookTypeCategorical, URL: "https://www.spc.noaa.gov/products/outlook/day3otlk_cat.nolyr.geojson"},
-	{Key: "day3_tornado", Day: 3, OutlookType: OutlookTypeTornado, URL: "https://www.spc.noaa.gov/products/outlook/day3otlk_torn.nolyr.geojson"},
-	{Key: "day3_hail", Day: 3, OutlookType: OutlookTypeHail, URL: "https://www.spc.noaa.gov/products/outlook/day3otlk_hail.nolyr.geojson"},
-	{Key: "day3_wind", Day: 3, OutlookType: OutlookTypeWind, URL: "https://www.spc.noaa.gov/products/outlook/day3otlk_wind.nolyr.geojson"},
 }
 
 var discussionProducts = []DiscussionProduct{

internal/providers/spc/product_test.go

@@ -4,8 +4,8 @@ import "testing"
 
 func TestGeoJSONProductsStableOrder(t *testing.T) {
 	got := GeoJSONProducts()
-	if len(got) != 12 {
+	if len(got) != 9 {
-		t.Fatalf("GeoJSONProducts() length = %d, want 12", len(got))
+		t.Fatalf("GeoJSONProducts() length = %d, want 9", len(got))
 	}
 
 	wantKeys := []string{
@@ -18,9 +18,6 @@ func TestGeoJSONProductsStableOrder(t *testing.T) {
 		"day2_hail",
 		"day2_wind",
 		"day3_categorical",
-		"day3_tornado",
-		"day3_hail",
-		"day3_wind",
 	}
 	for i, want := range wantKeys {
 		if got[i].Key != want {

internal/providers/spc/testdata/day3_cat.geojson

@@ -8,9 +8,9 @@
         "EXPIRE_ISO": "2026-06-14T12:00:00Z",
         "ISSUE_ISO": "2026-06-11T19:45:00Z",
         "FORECASTER": "LEE",
-        "LABEL": "15",
+        "LABEL": "MRGL",
-        "LABEL2": "15% Wind",
+        "LABEL2": "Marginal Risk",
-        "DN": 15
+        "DN": 2
       },
       "geometry": {
         "type": "MultiPolygon",

internal/sinks/postgres/doc.go

@@ -11,7 +11,7 @@
 //   - weather.forecast_discussion.v1 -> model.WeatherForecastDiscussion
 //   - weather.weather_story.v1 -> model.WeatherStoryRun
 //   - weather.alert.v1       -> model.WeatherAlertRun
-//   - weather.outlook.v1     -> model.WeatherOutlookRun
+//   - weather.outlook.v2     -> model.WeatherOutlookRun
 //
 // Parent/child relationships:
 //   - observations.event_id -> observation_present_weather.event_id
@@ -21,6 +21,7 @@
 //   - alert_runs.event_id   -> alerts.run_event_id
 //   - alerts.(run_event_id, alert_index) -> alert_references.(run_event_id, alert_index)
 //   - outlook_runs.event_id -> outlooks.run_event_id
+//   - outlook_runs.event_id -> outlook_discussions.run_event_id
 //
 // Dedupe and retention behavior:
 //   - Parent primary keys (event_id): observations, forecasts, alert_runs, outlook_runs.
@@ -39,6 +40,7 @@
 //   - alert_references.as_of
 //   - outlook_runs.as_of
 //   - outlooks.as_of
+//   - outlook_discussions.as_of
 //
 // Envelope field mapping (shared parent columns)
 //
@@ -196,6 +198,7 @@
 //     - sent TIMESTAMPTZ NULL -> payload.alerts[i].sent
 //     - effective TIMESTAMPTZ NULL -> payload.alerts[i].effective
 //     - onset TIMESTAMPTZ NULL -> payload.alerts[i].onset
+//     - ends TIMESTAMPTZ NULL -> payload.alerts[i].ends
 //     - expires TIMESTAMPTZ NULL -> payload.alerts[i].expires
 //     - area_description TEXT NULL -> payload.alerts[i].areaDescription
 //     - sender_name TEXT NULL -> payload.alerts[i].senderName
@@ -227,6 +230,7 @@
 //     - as_of TIMESTAMPTZ -> payload.asOf
 //     - issued_at TIMESTAMPTZ NULL -> payload.issuedAt
 //     - outlook_count INTEGER -> len(payload.outlooks)
+//     - discussion_count INTEGER -> len(payload.discussions)
 //
 //  11. outlooks (PK: run_event_id, outlook_index)
 //
@@ -246,14 +250,22 @@
 //     - issued_at TIMESTAMPTZ -> payload.outlooks[i].issuedAt
 //     - expires_at TIMESTAMPTZ -> payload.outlooks[i].expiresAt
 //     - forecaster TEXT NULL -> payload.outlooks[i].forecaster
-//     - headline TEXT NULL -> payload.outlooks[i].headline
-//     - summary TEXT NULL -> payload.outlooks[i].summary
-//     - discussion TEXT NULL -> payload.outlooks[i].discussion
 //     - source_url TEXT NULL -> payload.outlooks[i].sourceUrl
 //     - image_url TEXT NULL -> payload.outlooks[i].imageUrl
 //     - contains_location BOOLEAN -> payload.outlooks[i].containsLocation
 //     - geometry_json TEXT -> compact JSON payload.outlooks[i].geometry
 //
+//  12. outlook_discussions (PK: run_event_id, discussion_index)
+//
+//     - run_event_id TEXT -> outlook_runs.event_id / payload.discussions[i]
+//     - discussion_index INTEGER -> i (array position in payload.discussions)
+//     - as_of TIMESTAMPTZ -> payload.asOf (copied from parent)
+//     - day INTEGER -> payload.discussions[i].day
+//     - headline TEXT NULL -> payload.discussions[i].headline
+//     - summary TEXT NULL -> payload.discussions[i].summary
+//     - discussion TEXT NULL -> payload.discussions[i].discussion
+//     - updated_at TIMESTAMPTZ NULL -> payload.discussions[i].updatedAt
+//
 // Reconstructing canonical JSON payloads
 //
 //   - WeatherObservation:
@@ -274,6 +286,7 @@
 //     ordered by reference_index to rebuild references per alert.
 //
 //   - WeatherOutlookRun:
-//     read one row from outlook_runs, then join outlooks by run_event_id ordered
+//     read one row from outlook_runs, join outlooks by run_event_id ordered by
-//     by outlook_index to rebuild outlooks.
+//     outlook_index to rebuild outlooks, then join outlook_discussions by
+//     run_event_id ordered by discussion_index to rebuild discussions.
 package postgres

internal/sinks/postgres/docs_test.go

@@ -0,0 +1,33 @@
+package postgres
+
+import (
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestDocumentedOutlookDiscussionStorage(t *testing.T) {
+	for _, path := range []string{
+		"../../../docs/integrations/postgres.md",
+		"../../../docs/internal/postgres-sink.md",
+	} {
+		t.Run(path, func(t *testing.T) {
+			raw, err := os.ReadFile(path)
+			if err != nil {
+				t.Fatalf("ReadFile(%s) error = %v", path, err)
+			}
+			doc := string(raw)
+
+			for _, want := range []string{
+				tableOutlookDiscussions,
+				"discussion_count",
+				"discussion_index",
+				"weather.outlook.v2",
+			} {
+				if !strings.Contains(doc, want) {
+					t.Fatalf("%s missing %q", path, want)
+				}
+			}
+		})
+	}
+}

internal/sinks/postgres/map.go

@@ -27,7 +27,7 @@ func mapPostgresEvent(_ context.Context, e fkevent.Event) ([]fksinks.PostgresWri
 		return mapWeatherStoryEvent(e)
 	case standards.SchemaWeatherAlertV1:
 		return mapAlertEvent(e)
-	case standards.SchemaWeatherOutlookV1:
+	case standards.SchemaWeatherOutlookV2:
 		return mapOutlookEvent(e)
 	default:
 		return nil, nil
@@ -302,6 +302,7 @@ func mapAlertEvent(e fkevent.Event) ([]fksinks.PostgresWrite, error) {
 				"sent":             nullableTime(a.Sent),
 				"effective":        nullableTime(a.Effective),
 				"onset":            nullableTime(a.Onset),
+				"ends":             nullableTime(a.Ends),
 				"expires":          nullableTime(a.Expires),
 				"area_description": nullableString(a.AreaDescription),
 				"sender_name":      nullableString(a.SenderName),
@@ -339,7 +340,11 @@ func mapOutlookEvent(e fkevent.Event) ([]fksinks.PostgresWrite, error) {
 	}
 
 	asOf := run.AsOf.UTC()
-	writes := make([]fksinks.PostgresWrite, 0, 1+len(run.Outlooks))
+	if err := validateOutlookDiscussions(run.Discussions); err != nil {
+		return nil, err
+	}
+
+	writes := make([]fksinks.PostgresWrite, 0, 1+len(run.Outlooks)+len(run.Discussions))
 	writes = append(writes, fksinks.PostgresWrite{
 		Table: tableOutlookRuns,
 		Values: parentEventValues(e, map[string]any{
@@ -350,6 +355,7 @@ func mapOutlookEvent(e fkevent.Event) ([]fksinks.PostgresWrite, error) {
 			"as_of":            asOf,
 			"issued_at":        nullableTime(run.IssuedAt),
 			"outlook_count":    len(run.Outlooks),
+			"discussion_count": len(run.Discussions),
 		}),
 	})
 
@@ -381,9 +387,6 @@ func mapOutlookEvent(e fkevent.Event) ([]fksinks.PostgresWrite, error) {
 				"issued_at":         outlook.IssuedAt.UTC(),
 				"expires_at":        outlook.ExpiresAt.UTC(),
 				"forecaster":        nullableString(outlook.Forecaster),
-				"headline":          nullableString(outlook.Headline),
-				"summary":           nullableString(outlook.Summary),
-				"discussion":        nullableString(outlook.Discussion),
 				"source_url":        nullableString(outlook.SourceURL),
 				"image_url":         nullableString(outlook.ImageURL),
 				"contains_location": outlook.ContainsLocation,
@@ -392,6 +395,22 @@ func mapOutlookEvent(e fkevent.Event) ([]fksinks.PostgresWrite, error) {
 		})
 	}
 
+	for i, discussion := range run.Discussions {
+		writes = append(writes, fksinks.PostgresWrite{
+			Table: tableOutlookDiscussions,
+			Values: map[string]any{
+				"run_event_id":     e.ID,
+				"discussion_index": i,
+				"as_of":            asOf,
+				"day":              discussion.Day,
+				"headline":         nullableString(discussion.Headline),
+				"summary":          nullableString(discussion.Summary),
+				"discussion":       nullableString(discussion.Discussion),
+				"updated_at":       nullableTime(discussion.UpdatedAt),
+			},
+		})
+	}
+
 	return writes, nil
 }
 
@@ -423,6 +442,28 @@ func validateOutlook(outlook model.WeatherOutlook, index int) error {
 	if len(outlook.Geometry) == 0 {
 		return fmt.Errorf("decode outlook payload: outlooks[%d].geometry is required", index)
 	}
+	if !outlook.ContainsLocation {
+		return fmt.Errorf("decode outlook payload: outlooks[%d].containsLocation must be true", index)
+	}
+	return nil
+}
+
+func validateOutlookDiscussions(discussions []model.WeatherOutlookDiscussion) error {
+	seenDays := map[int]int{}
+	for i, discussion := range discussions {
+		if discussion.Day < 1 || discussion.Day > 3 {
+			return fmt.Errorf("decode outlook payload: discussions[%d].day must be 1, 2, or 3", i)
+		}
+		if strings.TrimSpace(discussion.Headline) == "" &&
+			strings.TrimSpace(discussion.Summary) == "" &&
+			strings.TrimSpace(discussion.Discussion) == "" {
+			return fmt.Errorf("decode outlook payload: discussions[%d] headline, summary, or discussion is required", i)
+		}
+		if first, ok := seenDays[discussion.Day]; ok {
+			return fmt.Errorf("decode outlook payload: discussions[%d].day duplicates discussions[%d].day %d", i, first, discussion.Day)
+		}
+		seenDays[discussion.Day] = i
+	}
 	return nil
 }
 

internal/sinks/postgres/map_test.go

@@ -103,6 +103,8 @@ func TestMapPostgresEventForecastStructPayload(t *testing.T) {
 
 func TestMapPostgresEventAlertStructPayload(t *testing.T) {
 	sent := time.Date(2026, 3, 16, 17, 0, 0, 0, time.UTC)
+	ends := time.Date(2026, 3, 16, 20, 0, 0, 0, time.UTC)
+	expires := time.Date(2026, 3, 16, 18, 30, 0, 0, time.UTC)
 	run := model.WeatherAlertRun{
 		AsOf: time.Date(2026, 3, 16, 18, 0, 0, 0, time.UTC),
 		Alerts: []model.WeatherAlert{
@@ -110,6 +112,8 @@ func TestMapPostgresEventAlertStructPayload(t *testing.T) {
 				ID:       "urn:alert:1",
 				Headline: "Winter Weather Advisory",
 				Severity: "Moderate",
+				Ends:     &ends,
+				Expires:  &expires,
 				References: []model.AlertReference{
 					{ID: "urn:ref:1", Sent: &sent},
 					{Identifier: "ref-two"},
@@ -145,6 +149,20 @@ func TestMapPostgresEventAlertStructPayload(t *testing.T) {
 	if got := firstAlert.Values["reference_count"]; got != 2 {
 		t.Fatalf("alerts reference_count = %#v, want 2", got)
 	}
+	if got := firstAlert.Values["ends"]; got != ends {
+		t.Fatalf("alerts ends = %#v, want %#v", got, ends)
+	}
+	if got := firstAlert.Values["expires"]; got != expires {
+		t.Fatalf("alerts expires = %#v, want %#v", got, expires)
+	}
+
+	alertWrites := writesForTable(writes, tableAlerts)
+	if len(alertWrites) != 2 {
+		t.Fatalf("alert writes len = %d, want 2", len(alertWrites))
+	}
+	if got := alertWrites[1].Values["ends"]; got != nil {
+		t.Fatalf("second alert ends = %#v, want nil", got)
+	}
 
 	assertAllWritesIncludeAllColumns(t, writes)
 }
@@ -243,6 +261,7 @@ func TestMapPostgresEventOutlookStructPayload(t *testing.T) {
 	lat := 38.6239
 	lon := -90.3571
 	issuedAt := time.Date(2026, 6, 11, 19, 45, 0, 0, time.FixedZone("UTC-5", -5*60*60))
+	updatedAt := time.Date(2026, 6, 11, 21, 15, 0, 0, time.FixedZone("UTC-5", -5*60*60))
 	severity := 3
 	run := model.WeatherOutlookRun{
 		LocationID:   "stl",
@@ -266,9 +285,6 @@ func TestMapPostgresEventOutlookStructPayload(t *testing.T) {
 				IssuedAt:         issuedAt,
 				ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
 				Forecaster:       "SMITH",
-				Headline:         "Day 1 Convective Outlook",
-				Summary:          "Severe thunderstorms are possible.",
-				Discussion:       "Full discussion text.",
 				SourceURL:        "https://example.invalid/day1.geojson",
 				ContainsLocation: true,
 				Geometry:         json.RawMessage(`{ "type" : "Polygon", "coordinates" : [ [ [ -91.0, 38.0 ], [ -90.0, 38.0 ], [ -90.0, 39.0 ], [ -91.0, 39.0 ], [ -91.0, 38.0 ] ] ] }`),
@@ -284,18 +300,27 @@ func TestMapPostgresEventOutlookStructPayload(t *testing.T) {
 				ValidTo:          time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
 				IssuedAt:         time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
 				ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
-				ContainsLocation: false,
+				ContainsLocation: true,
 				Geometry:         json.RawMessage(`{"type":"Polygon","coordinates":[[[-100,35],[-98,35],[-98,37],[-100,37],[-100,35]]]}`),
 			},
 		},
+		Discussions: []model.WeatherOutlookDiscussion{
+			{
+				Day:        1,
+				Headline:   "Day 1 Convective Outlook",
+				Summary:    "Severe thunderstorms are possible.",
+				Discussion: "Full discussion text.",
+				UpdatedAt:  &updatedAt,
+			},
+		},
 	}
 
-	writes, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, run))
+	writes, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
 	if err != nil {
 		t.Fatalf("mapPostgresEvent() error = %v", err)
 	}
-	if len(writes) != 3 {
+	if len(writes) != 4 {
-		t.Fatalf("mapPostgresEvent() writes len = %d, want 3", len(writes))
+		t.Fatalf("mapPostgresEvent() writes len = %d, want 4", len(writes))
 	}
 	if writes[0].Table != tableOutlookRuns {
 		t.Fatalf("writes[0].Table = %q, want %q", writes[0].Table, tableOutlookRuns)
@@ -303,6 +328,9 @@ func TestMapPostgresEventOutlookStructPayload(t *testing.T) {
 	if got := writes[0].Values["outlook_count"]; got != 2 {
 		t.Fatalf("outlook_runs outlook_count = %#v, want 2", got)
 	}
+	if got := writes[0].Values["discussion_count"]; got != 1 {
+		t.Fatalf("outlook_runs discussion_count = %#v, want 1", got)
+	}
 	if got := writes[0].Values["issued_at"]; got != issuedAt.UTC() {
 		t.Fatalf("outlook_runs issued_at = %#v, want UTC %s", got, issuedAt.UTC())
 	}
@@ -324,15 +352,64 @@ func TestMapPostgresEventOutlookStructPayload(t *testing.T) {
 	if got := writes[1].Values["geometry_json"]; got != `{"type":"Polygon","coordinates":[[[-91.0,38.0],[-90.0,38.0],[-90.0,39.0],[-91.0,39.0],[-91.0,38.0]]]}` {
 		t.Fatalf("first geometry_json = %#v", got)
 	}
-	if got := writes[2].Values["contains_location"]; got != false {
+	if got := writes[2].Values["contains_location"]; got != true {
-		t.Fatalf("second contains_location = %#v, want false", got)
+		t.Fatalf("second contains_location = %#v, want true", got)
+	}
+	if writes[3].Table != tableOutlookDiscussions {
+		t.Fatalf("writes[3].Table = %q, want %q", writes[3].Table, tableOutlookDiscussions)
+	}
+	if got := writes[3].Values["discussion_index"]; got != 0 {
+		t.Fatalf("discussion_index = %#v, want 0", got)
+	}
+	if got := writes[3].Values["as_of"]; got != run.AsOf.UTC() {
+		t.Fatalf("discussion as_of = %#v, want %s", got, run.AsOf.UTC())
+	}
+	if got := writes[3].Values["day"]; got != 1 {
+		t.Fatalf("discussion day = %#v, want 1", got)
+	}
+	if got := writes[3].Values["headline"]; got != "Day 1 Convective Outlook" {
+		t.Fatalf("discussion headline = %#v", got)
+	}
+	if got := writes[3].Values["summary"]; got != "Severe thunderstorms are possible." {
+		t.Fatalf("discussion summary = %#v", got)
+	}
+	if got := writes[3].Values["discussion"]; got != "Full discussion text." {
+		t.Fatalf("discussion text = %#v", got)
+	}
+	if got := writes[3].Values["updated_at"]; got != updatedAt.UTC() {
+		t.Fatalf("discussion updated_at = %#v, want UTC %s", got, updatedAt.UTC())
+	}
+
+	assertAllWritesIncludeAllColumns(t, writes)
+}
+
+func TestMapPostgresEventOutlookEmptyLocalRun(t *testing.T) {
+	run := model.WeatherOutlookRun{
+		AsOf: time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+	}
+
+	writes, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
+	if err != nil {
+		t.Fatalf("mapPostgresEvent() error = %v", err)
+	}
+	if len(writes) != 1 {
+		t.Fatalf("mapPostgresEvent() writes len = %d, want 1", len(writes))
+	}
+	if writes[0].Table != tableOutlookRuns {
+		t.Fatalf("writes[0].Table = %q, want %q", writes[0].Table, tableOutlookRuns)
+	}
+	if got := writes[0].Values["outlook_count"]; got != 0 {
+		t.Fatalf("outlook_runs outlook_count = %#v, want 0", got)
+	}
+	if got := writes[0].Values["discussion_count"]; got != 0 {
+		t.Fatalf("outlook_runs discussion_count = %#v, want 0", got)
 	}
 
 	assertAllWritesIncludeAllColumns(t, writes)
 }
 
 func TestMapPostgresEventOutlookRejectsMissingAsOf(t *testing.T) {
-	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, model.WeatherOutlookRun{}))
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, model.WeatherOutlookRun{}))
 	if err == nil {
 		t.Fatalf("mapPostgresEvent() error = nil, want missing asOf error")
 	}
@@ -353,6 +430,7 @@ func TestMapPostgresEventOutlookRejectsMissingIDAndProvider(t *testing.T) {
 		ValidTo:          time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
 		IssuedAt:         time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
 		ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+		ContainsLocation: true,
 		Geometry:         json.RawMessage(`{"type":"Polygon","coordinates":[[[-91,38],[-90,38],[-90,39],[-91,39],[-91,38]]]}`),
 	}
 
@@ -381,7 +459,7 @@ func TestMapPostgresEventOutlookRejectsMissingIDAndProvider(t *testing.T) {
 				AsOf:     time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
 				Outlooks: []model.WeatherOutlook{outlook},
 			}
-			_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, run))
+			_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
 			if err == nil {
 				t.Fatalf("mapPostgresEvent() error = nil, want %q", tt.wantErr)
 			}
@@ -402,10 +480,11 @@ func TestMapPostgresEventOutlookRejectsMissingRequiredTimes(t *testing.T) {
 			Day:              1,
 			OutlookType:      "categorical",
 			Label:            "SLGT",
+			ContainsLocation: true,
 			Geometry:         json.RawMessage(`{"type":"Polygon","coordinates":[[[-91,38],[-90,38],[-90,39],[-91,39],[-91,38]]]}`),
 		}},
 	}
-	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, run))
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
 	if err == nil {
 		t.Fatalf("mapPostgresEvent() error = nil, want missing time error")
 	}
@@ -428,9 +507,10 @@ func TestMapPostgresEventOutlookRejectsEmptyGeometry(t *testing.T) {
 			ValidTo:          time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
 			IssuedAt:         time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
 			ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+			ContainsLocation: true,
 		}},
 	}
-	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, run))
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
 	if err == nil {
 		t.Fatalf("mapPostgresEvent() error = nil, want geometry error")
 	}
@@ -439,6 +519,67 @@ func TestMapPostgresEventOutlookRejectsEmptyGeometry(t *testing.T) {
 	}
 }
 
+func TestMapPostgresEventOutlookRejectsDuplicateDiscussionDay(t *testing.T) {
+	run := model.WeatherOutlookRun{
+		AsOf: time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		Discussions: []model.WeatherOutlookDiscussion{
+			{Day: 1, Discussion: "First day one discussion."},
+			{Day: 1, Discussion: "Duplicate day one discussion."},
+		},
+	}
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
+	if err == nil {
+		t.Fatalf("mapPostgresEvent() error = nil, want duplicate discussion day error")
+	}
+	if !strings.Contains(err.Error(), "discussions[1].day duplicates discussions[0].day 1") {
+		t.Fatalf("error = %q, want duplicate discussion day context", err)
+	}
+}
+
+func TestMapPostgresEventOutlookRejectsInvalidDiscussionDay(t *testing.T) {
+	run := model.WeatherOutlookRun{
+		AsOf:        time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		Discussions: []model.WeatherOutlookDiscussion{{Day: 4, Discussion: "Invalid day."}},
+	}
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
+	if err == nil {
+		t.Fatalf("mapPostgresEvent() error = nil, want invalid discussion day error")
+	}
+	if !strings.Contains(err.Error(), "discussions[0].day must be 1, 2, or 3") {
+		t.Fatalf("error = %q, want invalid discussion day context", err)
+	}
+}
+
+func TestMapPostgresEventOutlookRejectsEmptyDiscussionContent(t *testing.T) {
+	run := model.WeatherOutlookRun{
+		AsOf:        time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		Discussions: []model.WeatherOutlookDiscussion{{Day: 1}},
+	}
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
+	if err == nil {
+		t.Fatalf("mapPostgresEvent() error = nil, want empty discussion content error")
+	}
+	if !strings.Contains(err.Error(), "discussions[0] headline, summary, or discussion is required") {
+		t.Fatalf("error = %q, want empty discussion content context", err)
+	}
+}
+
+func TestMapPostgresEventOutlookRejectsContainsLocationFalse(t *testing.T) {
+	run := model.WeatherOutlookRun{
+		AsOf:     time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		Outlooks: []model.WeatherOutlook{validTestOutlook()},
+	}
+	run.Outlooks[0].ContainsLocation = false
+
+	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV2, standards.KindOutlook, run))
+	if err == nil {
+		t.Fatalf("mapPostgresEvent() error = nil, want containsLocation error")
+	}
+	if !strings.Contains(err.Error(), "outlooks[0].containsLocation must be true") {
+		t.Fatalf("error = %q, want containsLocation context", err)
+	}
+}
+
 func TestMapPostgresEventWeatherStoryRejectsMissingAsOf(t *testing.T) {
 	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherStoryV1, standards.KindWeatherStory, model.WeatherStoryRun{}))
 	if err == nil {
@@ -508,6 +649,17 @@ func TestMapPostgresEventUnknownSchemaNoOp(t *testing.T) {
 	}
 }
 
+func TestMapPostgresEventLegacyOutlookSchemaNoOp(t *testing.T) {
+	run := model.WeatherOutlookRun{AsOf: time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC)}
+	writes, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherOutlookV1, standards.KindOutlook, run))
+	if err != nil {
+		t.Fatalf("mapPostgresEvent() error = %v", err)
+	}
+	if len(writes) != 0 {
+		t.Fatalf("mapPostgresEvent() writes len = %d, want 0", len(writes))
+	}
+}
+
 func TestMapPostgresEventMalformedPayload(t *testing.T) {
 	_, err := mapPostgresEvent(context.Background(), testEvent(standards.SchemaWeatherForecastV1, standards.KindForecast, "bad"))
 	if err == nil {
@@ -528,6 +680,56 @@ func TestMapPostgresEventForecastDiscussionMalformedPayload(t *testing.T) {
 	}
 }
 
+func TestParentEventValuesAddsEnvelopeAndPreservesProductValues(t *testing.T) {
+	emittedAt := time.Date(2026, 3, 16, 13, 31, 0, 0, time.FixedZone("CDT", -5*60*60))
+	effectiveAt := time.Date(2026, 3, 16, 13, 30, 0, 0, time.FixedZone("CDT", -5*60*60))
+	event := fkevent.Event{
+		ID:          "evt-envelope",
+		Kind:        fkevent.Kind(standards.KindForecast),
+		Source:      "test-source",
+		Schema:      standards.SchemaWeatherForecastV1,
+		EmittedAt:   emittedAt,
+		EffectiveAt: &effectiveAt,
+	}
+
+	got := parentEventValues(event, map[string]any{"product_col": "product-value"})
+
+	assertParentEnvelopeValues(t, got, event)
+	if got["product_col"] != "product-value" {
+		t.Fatalf("product_col = %#v, want product-value", got["product_col"])
+	}
+}
+
+func TestParentEventValuesNullEffectiveAt(t *testing.T) {
+	base := fkevent.Event{
+		ID:        "evt-envelope",
+		Kind:      fkevent.Kind(standards.KindObservation),
+		Source:    "test-source",
+		Schema:    standards.SchemaWeatherObservationV1,
+		EmittedAt: time.Date(2026, 3, 16, 18, 31, 0, 0, time.UTC),
+	}
+
+	for _, tt := range []struct {
+		name string
+		mut  func(*fkevent.Event)
+	}{
+		{name: "nil", mut: func(*fkevent.Event) {}},
+		{name: "zero", mut: func(event *fkevent.Event) {
+			zero := time.Time{}
+			event.EffectiveAt = &zero
+		}},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			event := base
+			tt.mut(&event)
+			got := parentEventValues(event, nil)
+			if got["event_effective_at"] != nil {
+				t.Fatalf("event_effective_at = %#v, want nil", got["event_effective_at"])
+			}
+		})
+	}
+}
+
 func testEvent(schema string, kind fkevent.Kind, payload any) fkevent.Event {
 	effectiveAt := time.Date(2026, 3, 16, 18, 30, 0, 0, time.UTC)
 	return fkevent.Event{
@@ -541,6 +743,30 @@ func testEvent(schema string, kind fkevent.Kind, payload any) fkevent.Event {
 	}
 }
 
+func assertParentEnvelopeValues(t *testing.T, values map[string]any, event fkevent.Event) {
+	t.Helper()
+
+	if got := values["event_id"]; got != event.ID {
+		t.Fatalf("event_id = %#v, want %q", got, event.ID)
+	}
+	if got := values["event_kind"]; got != string(event.Kind) {
+		t.Fatalf("event_kind = %#v, want %q", got, event.Kind)
+	}
+	if got := values["event_source"]; got != event.Source {
+		t.Fatalf("event_source = %#v, want %q", got, event.Source)
+	}
+	if got := values["event_schema"]; got != event.Schema {
+		t.Fatalf("event_schema = %#v, want %q", got, event.Schema)
+	}
+	if got := values["event_emitted_at"]; got != event.EmittedAt.UTC() {
+		t.Fatalf("event_emitted_at = %#v, want %s", got, event.EmittedAt.UTC())
+	}
+	wantEffective := nullableTime(event.EffectiveAt)
+	if got := values["event_effective_at"]; got != wantEffective {
+		t.Fatalf("event_effective_at = %#v, want %#v", got, wantEffective)
+	}
+}
+
 func firstWriteForTable(writes []fksinks.PostgresWrite, table string) (fksinks.PostgresWrite, bool) {
 	for _, w := range writes {
 		if w.Table == table {
@@ -550,6 +776,16 @@ func firstWriteForTable(writes []fksinks.PostgresWrite, table string) (fksinks.P
 	return fksinks.PostgresWrite{}, false
 }
 
+func writesForTable(writes []fksinks.PostgresWrite, table string) []fksinks.PostgresWrite {
+	out := make([]fksinks.PostgresWrite, 0)
+	for _, w := range writes {
+		if w.Table == table {
+			out = append(out, w)
+		}
+	}
+	return out
+}
+
 func assertAllWritesIncludeAllColumns(t *testing.T, writes []fksinks.PostgresWrite) {
 	t.Helper()
 	colCounts := tableColumnCounts()
@@ -573,6 +809,23 @@ func tableColumnCounts() map[string]int {
 	return m
 }
 
+func validTestOutlook() model.WeatherOutlook {
+	return model.WeatherOutlook{
+		ID:               "outlook-1",
+		Provider:         "spc",
+		Product:          "convective",
+		Day:              1,
+		OutlookType:      "categorical",
+		Label:            "SLGT",
+		ValidFrom:        time.Date(2026, 6, 11, 13, 0, 0, 0, time.UTC),
+		ValidTo:          time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+		IssuedAt:         time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+		ContainsLocation: true,
+		Geometry:         json.RawMessage(`{"type":"Polygon","coordinates":[[[-91,38],[-90,38],[-90,39],[-91,39],[-91,38]]]}`),
+	}
+}
+
 func wmoCodePtr(v model.WMOCode) *model.WMOCode {
 	out := v
 	return &out

internal/sinks/postgres/schema.go

@@ -18,6 +18,7 @@ const (
 	tableAlertReferences               = "alert_references"
 	tableOutlookRuns                   = "outlook_runs"
 	tableOutlooks                      = "outlooks"
+	tableOutlookDiscussions            = "outlook_discussions"
 )
 
 // PostgresSchema returns weatherfeeder's Postgres schema definition.
@@ -26,13 +27,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 		Tables: []fksinks.PostgresTable{
 			{
 				Name: tableObservations,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "station_id", Type: "TEXT", Nullable: true},
 					{Name: "station_name", Type: "TEXT", Nullable: true},
 					{Name: "observed_at", Type: "TIMESTAMPTZ", Nullable: false},
@@ -48,7 +43,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "visibility_meters", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "relative_humidity_percent", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "apparent_temperature_c", Type: "DOUBLE PRECISION", Nullable: true},
-				},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "observed_at",
 				Indexes: []fksinks.PostgresIndex{
@@ -73,13 +68,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 			},
 			{
 				Name: tableForecasts,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "location_id", Type: "TEXT", Nullable: true},
 					{Name: "location_name", Type: "TEXT", Nullable: true},
 					{Name: "issued_at", Type: "TIMESTAMPTZ", Nullable: false},
@@ -89,7 +78,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "longitude", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "elevation_meters", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "period_count", Type: "INTEGER", Nullable: false},
-				},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "issued_at",
 				Indexes: []fksinks.PostgresIndex{
@@ -137,13 +126,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 			},
 			{
 				Name: tableForecastDiscussions,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "office_id", Type: "TEXT", Nullable: true},
 					{Name: "office_name", Type: "TEXT", Nullable: true},
 					{Name: "issued_at", Type: "TIMESTAMPTZ", Nullable: false},
@@ -156,7 +139,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "long_term_issued_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "long_term_text", Type: "TEXT", Nullable: true},
 					{Name: "key_message_count", Type: "INTEGER", Nullable: false},
-				},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "issued_at",
 				Indexes: []fksinks.PostgresIndex{
@@ -180,17 +163,11 @@ func PostgresSchema() fksinks.PostgresSchema {
 			},
 			{
 				Name: tableWeatherStoryRuns,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "office_id", Type: "TEXT", Nullable: true},
 					{Name: "as_of", Type: "TIMESTAMPTZ", Nullable: false},
 					{Name: "story_count", Type: "INTEGER", Nullable: false},
-				},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "as_of",
 				Indexes: []fksinks.PostgresIndex{
@@ -225,20 +202,14 @@ func PostgresSchema() fksinks.PostgresSchema {
 			},
 			{
 				Name: tableAlertRuns,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "location_id", Type: "TEXT", Nullable: true},
 					{Name: "location_name", Type: "TEXT", Nullable: true},
 					{Name: "as_of", Type: "TIMESTAMPTZ", Nullable: false},
 					{Name: "latitude", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "longitude", Type: "DOUBLE PRECISION", Nullable: true},
 					{Name: "alert_count", Type: "INTEGER", Nullable: false},
-				},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "as_of",
 				Indexes: []fksinks.PostgresIndex{
@@ -267,6 +238,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "sent", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "effective", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "onset", Type: "TIMESTAMPTZ", Nullable: true},
+					{Name: "ends", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "expires", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "area_description", Type: "TEXT", Nullable: true},
 					{Name: "sender_name", Type: "TEXT", Nullable: true},
@@ -301,13 +273,7 @@ func PostgresSchema() fksinks.PostgresSchema {
 			},
 			{
 				Name: tableOutlookRuns,
-				Columns: []fksinks.PostgresColumn{
+				Columns: parentEnvelopeColumns([]fksinks.PostgresColumn{
-					{Name: "event_id", Type: "TEXT", Nullable: false},
-					{Name: "event_kind", Type: "TEXT", Nullable: false},
-					{Name: "event_source", Type: "TEXT", Nullable: false},
-					{Name: "event_schema", Type: "TEXT", Nullable: false},
-					{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
-					{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "location_id", Type: "TEXT", Nullable: true},
 					{Name: "location_name", Type: "TEXT", Nullable: true},
 					{Name: "latitude", Type: "DOUBLE PRECISION", Nullable: true},
@@ -315,7 +281,8 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "as_of", Type: "TIMESTAMPTZ", Nullable: false},
 					{Name: "issued_at", Type: "TIMESTAMPTZ", Nullable: true},
 					{Name: "outlook_count", Type: "INTEGER", Nullable: false},
-				},
+					{Name: "discussion_count", Type: "INTEGER", Nullable: false},
+				}...),
 				PrimaryKey:  []string{"event_id"},
 				PruneColumn: "as_of",
 				Indexes: []fksinks.PostgresIndex{
@@ -342,9 +309,6 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "issued_at", Type: "TIMESTAMPTZ", Nullable: false},
 					{Name: "expires_at", Type: "TIMESTAMPTZ", Nullable: false},
 					{Name: "forecaster", Type: "TEXT", Nullable: true},
-					{Name: "headline", Type: "TEXT", Nullable: true},
-					{Name: "summary", Type: "TEXT", Nullable: true},
-					{Name: "discussion", Type: "TEXT", Nullable: true},
 					{Name: "source_url", Type: "TEXT", Nullable: true},
 					{Name: "image_url", Type: "TEXT", Nullable: true},
 					{Name: "contains_location", Type: "BOOLEAN", Nullable: false},
@@ -358,7 +322,38 @@ func PostgresSchema() fksinks.PostgresSchema {
 					{Name: "idx_wf_outlooks_valid", Columns: []string{"valid_from", "valid_to"}},
 				},
 			},
+			{
+				Name: tableOutlookDiscussions,
+				Columns: []fksinks.PostgresColumn{
+					{Name: "run_event_id", Type: "TEXT REFERENCES outlook_runs(event_id) ON DELETE CASCADE", Nullable: false},
+					{Name: "discussion_index", Type: "INTEGER", Nullable: false},
+					{Name: "as_of", Type: "TIMESTAMPTZ", Nullable: false},
+					{Name: "day", Type: "INTEGER", Nullable: false},
+					{Name: "headline", Type: "TEXT", Nullable: true},
+					{Name: "summary", Type: "TEXT", Nullable: true},
+					{Name: "discussion", Type: "TEXT", Nullable: true},
+					{Name: "updated_at", Type: "TIMESTAMPTZ", Nullable: true},
+				},
+				PrimaryKey:  []string{"run_event_id", "discussion_index"},
+				PruneColumn: "as_of",
+				Indexes: []fksinks.PostgresIndex{
+					{Name: "idx_wf_outlook_discussions_day_as_of", Columns: []string{"day", "as_of"}},
+					{Name: "idx_wf_outlook_discussions_run_day", Columns: []string{"run_event_id", "day"}, Unique: true},
+				},
+			},
 		},
 		MapEvent: mapPostgresEvent,
 	}
 }
+
+func parentEnvelopeColumns(extra ...fksinks.PostgresColumn) []fksinks.PostgresColumn {
+	columns := []fksinks.PostgresColumn{
+		{Name: "event_id", Type: "TEXT", Nullable: false},
+		{Name: "event_kind", Type: "TEXT", Nullable: false},
+		{Name: "event_source", Type: "TEXT", Nullable: false},
+		{Name: "event_schema", Type: "TEXT", Nullable: false},
+		{Name: "event_emitted_at", Type: "TIMESTAMPTZ", Nullable: false},
+		{Name: "event_effective_at", Type: "TIMESTAMPTZ", Nullable: true},
+	}
+	return append(columns, extra...)
+}

internal/sinks/postgres/schema_test.go

@@ -1,8 +1,11 @@
 package postgres
 
 import (
+	"reflect"
 	"strings"
 	"testing"
+
+	fksinks "gitea.maximumdirect.net/ejr/feedkit/sinks"
 )
 
 func TestWeatherPostgresSchemaShape(t *testing.T) {
@@ -25,6 +28,7 @@ func TestWeatherPostgresSchemaShape(t *testing.T) {
 		tableAlertReferences:               true,
 		tableOutlookRuns:                   true,
 		tableOutlooks:                      true,
+		tableOutlookDiscussions:            true,
 	}
 
 	if len(s.Tables) != len(wantTables) {
@@ -50,7 +54,7 @@ func TestWeatherPostgresSchemaShape(t *testing.T) {
 
 func TestWeatherPostgresSchemaIncludesOutlookTables(t *testing.T) {
 	runColumns := columnsForTable(t, tableOutlookRuns)
-	for _, col := range []string{"event_id", "event_kind", "event_source", "event_schema", "event_emitted_at", "event_effective_at", "location_id", "location_name", "latitude", "longitude", "as_of", "issued_at", "outlook_count"} {
+	for _, col := range []string{"event_id", "event_kind", "event_source", "event_schema", "event_emitted_at", "event_effective_at", "location_id", "location_name", "latitude", "longitude", "as_of", "issued_at", "outlook_count", "discussion_count"} {
 		if !runColumns[col] {
 			t.Fatalf("%s missing %s column", tableOutlookRuns, col)
 		}
@@ -60,15 +64,40 @@ func TestWeatherPostgresSchemaIncludesOutlookTables(t *testing.T) {
 	assertTableIndex(t, tableOutlookRuns, "idx_wf_outlook_run_as_of", []string{"as_of"})
 
 	outlookColumns := columnsForTable(t, tableOutlooks)
-	for _, col := range []string{"run_event_id", "outlook_index", "as_of", "outlook_id", "provider", "product", "day", "outlook_type", "label", "label_text", "severity_rank", "valid_from", "valid_to", "issued_at", "expires_at", "forecaster", "headline", "summary", "discussion", "source_url", "image_url", "contains_location", "geometry_json"} {
+	for _, col := range []string{"run_event_id", "outlook_index", "as_of", "outlook_id", "provider", "product", "day", "outlook_type", "label", "label_text", "severity_rank", "valid_from", "valid_to", "issued_at", "expires_at", "forecaster", "source_url", "image_url", "contains_location", "geometry_json"} {
 		if !outlookColumns[col] {
 			t.Fatalf("%s missing %s column", tableOutlooks, col)
 		}
 	}
+	for _, col := range []string{"headline", "summary", "discussion"} {
+		if outlookColumns[col] {
+			t.Fatalf("%s still includes legacy %s column", tableOutlooks, col)
+		}
+	}
 	assertTablePrimaryKey(t, tableOutlooks, []string{"run_event_id", "outlook_index"})
 	assertTableIndex(t, tableOutlooks, "idx_wf_outlooks_contains_valid", []string{"contains_location", "valid_from", "valid_to"})
 	assertTableIndex(t, tableOutlooks, "idx_wf_outlooks_day_type_label", []string{"day", "outlook_type", "label"})
 	assertTableIndex(t, tableOutlooks, "idx_wf_outlooks_valid", []string{"valid_from", "valid_to"})
+
+	discussionColumns := columnsForTable(t, tableOutlookDiscussions)
+	for _, col := range []string{"run_event_id", "discussion_index", "as_of", "day", "headline", "summary", "discussion", "updated_at"} {
+		if !discussionColumns[col] {
+			t.Fatalf("%s missing %s column", tableOutlookDiscussions, col)
+		}
+	}
+	assertTablePrimaryKey(t, tableOutlookDiscussions, []string{"run_event_id", "discussion_index"})
+	assertTablePruneColumn(t, tableOutlookDiscussions, "as_of")
+	assertTableIndex(t, tableOutlookDiscussions, "idx_wf_outlook_discussions_day_as_of", []string{"day", "as_of"})
+	assertTableUniqueIndex(t, tableOutlookDiscussions, "idx_wf_outlook_discussions_run_day", []string{"run_event_id", "day"})
+}
+
+func TestWeatherPostgresSchemaIncludesAlertEndsColumn(t *testing.T) {
+	alertColumns := columnsForTable(t, tableAlerts)
+	for _, col := range []string{"run_event_id", "alert_index", "as_of", "alert_id", "onset", "ends", "expires"} {
+		if !alertColumns[col] {
+			t.Fatalf("%s missing %s column", tableAlerts, col)
+		}
+	}
 }
 
 func TestWeatherPostgresSchemaIncludesWeatherStoryColumns(t *testing.T) {
@@ -88,53 +117,102 @@ func TestWeatherPostgresSchemaIncludesWeatherStoryColumns(t *testing.T) {
 	}
 }
 
+func TestWeatherPostgresSchemaParentTablesStartWithEnvelopeColumns(t *testing.T) {
+	for _, table := range []string{
+		tableObservations,
+		tableForecasts,
+		tableForecastDiscussions,
+		tableWeatherStoryRuns,
+		tableAlertRuns,
+		tableOutlookRuns,
+	} {
+		t.Run(table, func(t *testing.T) {
+			columns := orderedColumnsForTable(t, table)
+			want := parentEnvelopeColumns()
+			if len(columns) < len(want) {
+				t.Fatalf("%s has %d columns, want at least %d", table, len(columns), len(want))
+			}
+			if !reflect.DeepEqual(columns[:len(want)], want) {
+				t.Fatalf("%s envelope prefix = %#v, want %#v", table, columns[:len(want)], want)
+			}
+		})
+	}
+}
+
 func assertTablePrimaryKey(t *testing.T, table string, want []string) {
 	t.Helper()
-	for _, tbl := range PostgresSchema().Tables {
+	tbl := tableByName(t, table)
-		if tbl.Name != table {
-			continue
-		}
 	if strings.Join(tbl.PrimaryKey, ",") != strings.Join(want, ",") {
 		t.Fatalf("%s primary key = %#v, want %#v", table, tbl.PrimaryKey, want)
 	}
-		return
+}
+
+func assertTablePruneColumn(t *testing.T, table string, want string) {
+	t.Helper()
+	tbl := tableByName(t, table)
+	if tbl.PruneColumn != want {
+		t.Fatalf("%s prune column = %q, want %q", table, tbl.PruneColumn, want)
 	}
-	t.Fatalf("missing table %q", table)
 }
 
 func assertTableIndex(t *testing.T, table string, name string, want []string) {
 	t.Helper()
-	for _, tbl := range PostgresSchema().Tables {
+	assertTableIndexWithUnique(t, table, name, want, false)
-		if tbl.Name != table {
+}
-			continue
+
-		}
+func assertTableUniqueIndex(t *testing.T, table string, name string, want []string) {
+	t.Helper()
+	assertTableIndexWithUnique(t, table, name, want, true)
+}
+
+func assertTableIndexWithUnique(t *testing.T, table string, name string, want []string, unique bool) {
+	t.Helper()
+	tbl := tableByName(t, table)
 	for _, idx := range tbl.Indexes {
 		if idx.Name == name {
 			if strings.Join(idx.Columns, ",") != strings.Join(want, ",") {
 				t.Fatalf("%s index %s columns = %#v, want %#v", table, name, idx.Columns, want)
 			}
+			if idx.Unique != unique {
+				t.Fatalf("%s index %s unique = %v, want %v", table, name, idx.Unique, unique)
+			}
 			return
 		}
 	}
 	t.Fatalf("%s missing index %s", table, name)
+}
+
+func tableByName(t *testing.T, table string) fksinks.PostgresTable {
+	t.Helper()
+	for _, tbl := range PostgresSchema().Tables {
+		if tbl.Name == table {
+			return tbl
+		}
 	}
 	t.Fatalf("missing table %q", table)
+	return fksinks.PostgresTable{}
+}
+
+func orderedColumnsForTable(t *testing.T, table string) []fksinks.PostgresColumn {
+	t.Helper()
+
+	schema := PostgresSchema()
+	for _, tbl := range schema.Tables {
+		if tbl.Name == table {
+			return tbl.Columns
+		}
+	}
+	t.Fatalf("missing table %q", table)
+	return nil
 }
 
 func columnsForTable(t *testing.T, table string) map[string]bool {
 	t.Helper()
 
-	schema := PostgresSchema()
+	ordered := orderedColumnsForTable(t, table)
-	for _, tbl := range schema.Tables {
+	cols := make(map[string]bool, len(ordered))
-		if tbl.Name != table {
+	for _, col := range ordered {
-			continue
-		}
-		cols := make(map[string]bool, len(tbl.Columns))
-		for _, col := range tbl.Columns {
 		cols[col.Name] = true
 	}
 	return cols
-	}
-	t.Fatalf("missing table %q", table)
-	return nil
 }

internal/sources/spc/convective_outlook_test.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
-	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -78,8 +76,8 @@ func TestConvectiveOutlookSourcePollEmitsRawBundle(t *testing.T) {
 	if bundle.Latitude != 38.6239 || bundle.Longitude != -90.3571 {
 		t.Fatalf("coordinates = %v,%v", bundle.Latitude, bundle.Longitude)
 	}
-	if len(bundle.Products) != 12 {
+	if len(bundle.Products) != 9 {
-		t.Fatalf("Products length = %d, want 12", len(bundle.Products))
+		t.Fatalf("Products length = %d, want 9", len(bundle.Products))
 	}
 	if len(bundle.Discussions) != 3 {
 		t.Fatalf("Discussions length = %d, want 3", len(bundle.Discussions))
@@ -312,7 +310,7 @@ func geoJSONFixtureForProduct(t *testing.T, key string, blankIssueISO bool) []by
 	case strings.HasPrefix(key, "day2_"):
 		name = "day2_torn.geojson"
 	case strings.HasPrefix(key, "day3_"):
-		name = "day3_wind.geojson"
+		name = "day3_cat.geojson"
 	default:
 		t.Fatalf("unknown product key %q", key)
 	}
@@ -340,16 +338,6 @@ func discussionFixtureForProduct(t *testing.T, key string) []byte {
 	}
 }
 
-func readSPCTestFixture(t *testing.T, name string) []byte {
-	t.Helper()
-	path := filepath.Join("..", "..", "providers", "spc", "testdata", name)
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		t.Fatalf("read fixture %s: %v", path, err)
-	}
-	return raw
-}
-
 const testRSS = `<?xml version="1.0"?>
 <rss version="2.0">
   <channel>

internal/sources/spc/fixture_test.go

@@ -0,0 +1,17 @@
+package spc
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func readSPCTestFixture(t *testing.T, name string) []byte {
+	t.Helper()
+	path := filepath.Join("..", "..", "providers", "spc", "testdata", name)
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatalf("read fixture %s: %v", path, err)
+	}
+	return raw
+}

model/alert.go

@@ -55,9 +55,11 @@ type WeatherAlert struct {
 	Instruction string `json:"instruction,omitempty"`
 
 	// Timing (all optional; provider-dependent).
+	// Onset and Ends describe the alert period. Expires is provider expiration metadata.
 	Sent      *time.Time `json:"sent,omitempty"`
 	Effective *time.Time `json:"effective,omitempty"`
 	Onset     *time.Time `json:"onset,omitempty"`
+	Ends      *time.Time `json:"ends,omitempty"`
 	Expires   *time.Time `json:"expires,omitempty"`
 
 	// Scope / affected area.

model/docs_test.go

@@ -0,0 +1,38 @@
+package model
+
+import (
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestDocumentedConsumerModelTypes(t *testing.T) {
+	raw, err := os.ReadFile("../docs/consumers/pkg-model.md")
+	if err != nil {
+		t.Fatalf("ReadFile(pkg-model.md) error = %v", err)
+	}
+	doc := string(raw)
+
+	required := []string{
+		"gitea.maximumdirect.net/ejr/weatherfeeder/model",
+		"WeatherObservation",
+		"WeatherForecastRun",
+		"WeatherForecastPeriod",
+		"WeatherForecastDiscussion",
+		"WeatherForecastDiscussionSection",
+		"WeatherStoryRun",
+		"WeatherStory",
+		"WeatherAlertRun",
+		"WeatherAlert",
+		"WeatherAlertReference",
+		"WeatherOutlookRun",
+		"WeatherOutlookDiscussion",
+		"WeatherOutlook",
+		"WMOCode",
+	}
+	for _, want := range required {
+		if !strings.Contains(doc, want) {
+			t.Fatalf("docs/consumers/pkg-model.md missing %q", want)
+		}
+	}
+}

model/outlook.go

@@ -15,6 +15,16 @@ type WeatherOutlookRun struct {
 	AsOf         time.Time                  `json:"asOf"`
 	IssuedAt     *time.Time                 `json:"issuedAt,omitempty"`
 	Outlooks     []WeatherOutlook           `json:"outlooks"`
+	Discussions  []WeatherOutlookDiscussion `json:"discussions"`
+}
+
+// WeatherOutlookDiscussion is run-level SPC outlook prose for one outlook day.
+type WeatherOutlookDiscussion struct {
+	Day        int        `json:"day"`
+	Headline   string     `json:"headline,omitempty"`
+	Summary    string     `json:"summary,omitempty"`
+	Discussion string     `json:"discussion,omitempty"`
+	UpdatedAt  *time.Time `json:"updatedAt,omitempty"`
 }
 
 // WeatherOutlook is a canonical representation of one outlook polygon.
@@ -32,9 +42,6 @@ type WeatherOutlook struct {
 	IssuedAt         time.Time       `json:"issuedAt"`
 	ExpiresAt        time.Time       `json:"expiresAt"`
 	Forecaster       string          `json:"forecaster,omitempty"`
-	Headline         string          `json:"headline,omitempty"`
-	Summary          string          `json:"summary,omitempty"`
-	Discussion       string          `json:"discussion,omitempty"`
 	SourceURL        string          `json:"sourceUrl,omitempty"`
 	ImageURL         string          `json:"imageUrl,omitempty"`
 	ContainsLocation bool            `json:"containsLocation"`

model/outlook_test.go

@@ -0,0 +1,60 @@
+package model
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestWeatherOutlookJSONShape(t *testing.T) {
+	updatedAt := time.Date(2026, 6, 11, 16, 30, 0, 0, time.UTC)
+	run := WeatherOutlookRun{
+		AsOf: time.Date(2026, 6, 11, 19, 45, 0, 0, time.UTC),
+		Outlooks: []WeatherOutlook{{
+			ID:               "outlook-1",
+			Provider:         "spc",
+			Product:          "convective",
+			Day:              1,
+			OutlookType:      "categorical",
+			Label:            "SLGT",
+			ValidFrom:        time.Date(2026, 6, 11, 13, 0, 0, 0, time.UTC),
+			ValidTo:          time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+			IssuedAt:         time.Date(2026, 6, 11, 12, 34, 56, 0, time.UTC),
+			ExpiresAt:        time.Date(2026, 6, 12, 12, 0, 0, 0, time.UTC),
+			ContainsLocation: true,
+			Geometry:         json.RawMessage(`{"type":"Polygon","coordinates":[[[-91,38],[-90,38],[-90,39],[-91,39],[-91,38]]]}`),
+		}},
+		Discussions: []WeatherOutlookDiscussion{{
+			Day:        1,
+			Headline:   "Day 1 Convective Outlook",
+			Summary:    "Severe thunderstorms are possible.",
+			Discussion: "Full discussion text.",
+			UpdatedAt:  &updatedAt,
+		}},
+	}
+
+	raw, err := json.Marshal(run)
+	if err != nil {
+		t.Fatalf("Marshal(WeatherOutlookRun) error = %v", err)
+	}
+	got := string(raw)
+
+	for _, want := range []string{`"outlooks"`, `"discussions"`, `"headline"`, `"summary"`, `"discussion"`, `"updatedAt"`} {
+		if !strings.Contains(got, want) {
+			t.Fatalf("WeatherOutlookRun JSON missing %s: %s", want, got)
+		}
+	}
+
+	outlookStart := strings.Index(got, `"outlooks"`)
+	discussionStart := strings.Index(got, `"discussions"`)
+	if outlookStart == -1 || discussionStart == -1 || discussionStart <= outlookStart {
+		t.Fatalf("WeatherOutlookRun JSON has unexpected outlook/discussion order: %s", got)
+	}
+	outlookJSON := got[outlookStart:discussionStart]
+	for _, unwanted := range []string{`"headline"`, `"summary"`, `"discussion"`} {
+		if strings.Contains(outlookJSON, unwanted) {
+			t.Fatalf("WeatherOutlook JSON contains polygon-level prose key %s: %s", unwanted, got)
+		}
+	}
+}

standards/docs_test.go

@@ -17,20 +17,52 @@ func TestDocumentedEventSchemas(t *testing.T) {
 	}
 	doc := string(raw)
 
-	schemas := schemaConstants(t)
+	for _, schema := range schemaConstants(t, false) {
-	for _, schema := range schemas {
 		if !strings.Contains(doc, schema) {
 			t.Fatalf("docs/integrations/events.md missing schema %q", schema)
 		}
 	}
 }
 
-func schemaConstants(t *testing.T) []string {
+func TestDocumentedConsumerStandardsConstants(t *testing.T) {
+	raw, err := os.ReadFile("../docs/consumers/pkg-standards.md")
+	if err != nil {
+		t.Fatalf("ReadFile(pkg-standards.md) error = %v", err)
+	}
+	doc := string(raw)
+
+	for _, schema := range schemaConstants(t, true) {
+		if !strings.Contains(doc, schema) {
+			t.Fatalf("docs/consumers/pkg-standards.md missing schema %q", schema)
+		}
+	}
+	for _, kind := range kindConstants(t) {
+		if !strings.Contains(doc, kind) {
+			t.Fatalf("docs/consumers/pkg-standards.md missing kind %q", kind)
+		}
+	}
+}
+
+func schemaConstants(t *testing.T, includeNonCurrent bool) []string {
 	t.Helper()
 
-	file, err := parser.ParseFile(token.NewFileSet(), "schema.go", nil, 0)
+	return stringConstantsFromFile(t, "schema.go", "Schema", func(name string) bool {
+		return !includeNonCurrent && schemaConstantNotInCurrentContract(name)
+	})
+}
+
+func kindConstants(t *testing.T) []string {
+	t.Helper()
+
+	return stringConstantsFromFile(t, "kind.go", "Kind", nil)
+}
+
+func stringConstantsFromFile(t *testing.T, path string, prefix string, skip func(string) bool) []string {
+	t.Helper()
+
+	file, err := parser.ParseFile(token.NewFileSet(), path, nil, 0)
 	if err != nil {
-		t.Fatalf("ParseFile(schema.go) error = %v", err)
+		t.Fatalf("ParseFile(%s) error = %v", path, err)
 	}
 
 	var out []string
@@ -40,30 +72,35 @@ func schemaConstants(t *testing.T) []string {
 			return true
 		}
 		for i, name := range valueSpec.Names {
-			if !strings.HasPrefix(name.Name, "Schema") || schemaConstantNotInCurrentContract(name.Name) {
+			if !strings.HasPrefix(name.Name, prefix) || (skip != nil && skip(name.Name)) {
 				continue
 			}
 			if i >= len(valueSpec.Values) {
-				t.Fatalf("schema constant %s has no explicit value", name.Name)
+				t.Fatalf("constant %s has no explicit value", name.Name)
 			}
 			lit, ok := valueSpec.Values[i].(*ast.BasicLit)
 			if !ok || lit.Kind != token.STRING {
-				t.Fatalf("schema constant %s is not a string literal", name.Name)
+				t.Fatalf("constant %s is not a string literal", name.Name)
 			}
-			schema, err := strconv.Unquote(lit.Value)
+			value, err := strconv.Unquote(lit.Value)
 			if err != nil {
-				t.Fatalf("schema constant %s value is not a quoted string: %v", name.Name, err)
+				t.Fatalf("constant %s value is not a quoted string: %v", name.Name, err)
 			}
-			out = append(out, schema)
+			out = append(out, value)
 		}
 		return true
 	})
 	if len(out) == 0 {
-		t.Fatalf("no schema constants found")
+		t.Fatalf("no %s constants found in %s", prefix, path)
 	}
 	return out
 }
 
 func schemaConstantNotInCurrentContract(name string) bool {
-	return name == "SchemaRawOpenWeatherHourlyForecastV1"
+	switch name {
+	case "SchemaRawOpenWeatherHourlyForecastV1":
+		return true
+	default:
+		return false
+	}
 }

standards/schema.go

@@ -33,4 +33,5 @@ const (
 	SchemaWeatherStoryV1              = "weather.weather_story.v1"
 	SchemaWeatherAlertV1              = "weather.alert.v1"
 	SchemaWeatherOutlookV1            = "weather.outlook.v1"
+	SchemaWeatherOutlookV2            = "weather.outlook.v2"
 )