The next Bay Area storm is still on track for Wednesday and Thursday, and Monday's official forecast added sharper details: a possible wind advisory, a rising chance of thunderstorms, and a gale watch on parts of the coastal waters from Tuesday evening.

The National Weather Service in San Francisco, in its 4:14 a.m. PST Monday discussion, said Tuesday should be mostly dry aside from isolated or scattered showers over the water that may wander inland in the morning. By late Tuesday afternoon and evening, another cold front is expected to hit the North Bay and then shift south. Strong southerly winds ahead of that front "may necessitate a Wind Advisory at some point from late Tuesday night through the day Wednesday," the office wrote. That is a possibility, not a posted advisory yet.

Thunderstorm chances increase by Wednesday evening into Thursday, with strong wind gusts as the primary concern if storms develop and transfer 40- to 50-knot winds from aloft to the surface, the discussion said. The Weather Prediction Center had much of the area highlighted for a slight chance of excessive rainfall Wednesday into early Thursday, and a marginal chance after 4 a.m. Thursday. The strongest showers and rainfall rates would be tied to any convection that develops. Instability is forecast to peak late Wednesday night into early Thursday morning, when the coldest air aloft arrives and lapse rates increase to around 7 C per kilometer, NWS said. Post-frontal rain should persist through much of Thursday, then taper on Friday. Another system may produce rain next weekend, beginning Saturday, the discussion said; the office did not go into detail on that one.

On the water, a Small Craft Advisory was in effect until 9 a.m. Tuesday for Monterey Bay and the coastal waters from Point Reyes to Point Pinos within 10 nautical miles, with other small-craft headlines lasting into Tuesday evening or early Wednesday depending on the zone. A Gale Watch is up from Tuesday evening through late Tuesday night for the waters from Point Arena to Pigeon Point, including the 10-to-60-nautical-mile band north of Point Reyes, the discussion said. Hazardous marine conditions were expected to redevelop midweek with near-gale to gale-force gusts, rain, and a chance of thunderstorms. Seas were still very rough to high, up to 20 feet, through Tuesday morning, easing some Tuesday afternoon before building again Wednesday.

A High Surf Advisory remains in effect until 4 a.m. Tuesday, with 20- to 25-foot breaking waves and occasional 25- to 35-foot sets at favored breakpoints, including Mavericks. NWS said those waves are less energetic than Saturday's surf, which flooded parts of Pacifica and damaged Capitola Pier, but they remain hazardous.

This update is about wind, thunderstorms and marine headlines, not a repeat of Sunday's 2-to-3-inch rainfall range. Advisories can be issued, expanded or dropped. If you have outdoor plans Wednesday or Thursday, or a boat in the water, check the latest NWS San Francisco forecast and marine products before you go.

Related: Sunday's rainfall outlook and Caltrans chain and QuickMap guidance.