OPT-23-28 review: the unheld-shortfall line says another battery or the grid

With A on Leftover solar and B on Cheap hours (the dynamic scenario, and the
owner's planned setup), the line said "The batteries cannot hold it all. The
grid covers N kWh", while B holds a full charge for the same hours. It now
says "The expensive hours need more than Leftover solar can hold. The rest,
N kWh, comes from another battery or the grid." (NL likewise). DOCS,
DECISIONS and the dayplan/homeview docstrings say the same. Text only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC

goodwe_controller/DECISIONS/OPT-23-28-the-night-charge-covers-the-dear-hours.md

@@ -6,6 +6,6 @@
 
 - **Shortfall.** `sum_h max(0, house_h - trust x sun_h)` over every expensive hour, `/ EFF`, from the floor. It replaces the use over the run with no sun counted, which on a day and night tariff bought for the whole day (G1, `reports/UX-69-design-report.md`). The sun before the run is unchanged. A run with its dear hours after sunset gives the old number.
 - **House use.** An hour with sun is read at no less than the night base, as the sun sum reads it (the profile is net of the sun). An hour without is read as measured. An hour with no forecast counts no sun.
-- **Several batteries.** One total, shared by capacity with the ceiling passed on (`dayplan._spread()`). With the same floor and ceiling for all, they reach the ceiling together, so a shortfall that one battery cannot hold fills both to the same level, not one first. More than all hold: all go to the ceiling, `Plan.uncovered_kwh` is the rest, and the grid carries it at the expensive price.
+- **Several batteries.** One total, shared by capacity with the ceiling passed on (`dayplan._spread()`). With the same floor and ceiling for all, they reach the ceiling together, so a shortfall that one battery cannot hold fills both to the same level, not one first. More than all hold: all go to the ceiling, `Plan.uncovered_kwh` is the rest, carried by another battery (Cheap hours, Solar first) or the grid, as the screen says.
 - **Cheap hours** still fills up and is not counted in the share; **Solar first** still never charges from the grid. The mode help says so.
 - **Not done:** the run length (OPT-25); netting what a Cheap hours or Solar first battery will hold against the shortfall.

goodwe_controller/DOCS.md

@@ -549,7 +549,7 @@ With battery modes on, these choices replace the *Charging and selling on price*
 - The hourly shape is kept only if every sensor has one. Otherwise the total is spread over the day as for Forecast.Solar.
 - Before each cheap run the add-on asks: will the sun fill the batteries before the expensive hours? It counts on `solar_trust_pct` of the forecast (70 %), less what the house uses. Solar first batteries get that sun first.
 - *Leftover solar* then charges from the grid only the shortfall: for each expensive hour, what the house uses less the sun counted for that hour (never below 0), added up over all the expensive hours, early morning and evening. With a day and night tariff that is 07:00 to 22:00. Not up to the top level.
-- All *Leftover solar* batteries hold that shortfall together, shared by their size. A battery that reaches the top level passes the rest to the others. If all of them together cannot hold it, they all fill to the top level and the grid covers the rest in the expensive hours. The Batteries screen says so. The sun before the expensive hours still fills first, and is taken off what is bought.
+- All *Leftover solar* batteries hold that shortfall together, shared by their size. A battery that reaches the top level passes the rest to the others. If all of them together cannot hold it, they all fill to the top level. In the expensive hours the rest comes from another battery (*Cheap hours only* or *Solar first*) or from the grid. The Batteries screen says so. The sun before the expensive hours still fills first, and is taken off what is bought.
 - A forecast that gives only one figure for the day (Forecast.Solar) is spread over the hours from now, so the hours add up to that figure.
 - *Cheap hours only* ignores the forecast and fills to the top level.
 - *Solar first* never charges from the grid.

goodwe_controller/app/dayplan.py

@@ -19,8 +19,8 @@ OPT-28 for the second):
   hour of the run, early morning and evening. The Leftover solar batteries
   hold it together: `short / EFF` above the floor, shared by capacity, and
   a battery that reaches the ceiling passes the rest to the others. What
-  all of them cannot hold (`Plan.uncovered_kwh`) is not bought: the grid
-  carries it at the dear price.
+  all of them cannot hold (`Plan.uncovered_kwh`) is not bought: another
+  battery (Cheap hours, Solar first) or the grid carries it.
 * Cheap hours only ignores the plan and fills to the ceiling, as in P3 and
   the design (section 1). Skipping the sun's share cost money in the replay
   (PR #156 review: 29.72 against 29.41 EUR on real 2026 prices).

goodwe_controller/app/homeview.py

@@ -1446,7 +1446,8 @@ def line_solar(fc_kwh, count_kwh, at) -> str:
 
 
 def line_uncovered(kwh) -> str:
-    """OPT-28: the batteries cannot hold the expensive hours' shortfall."""
+    """OPT-28: the Leftover solar batteries cannot hold the expensive hours'
+    shortfall. The rest comes from another battery or the grid."""
     return _t("solar.uncovered", kwh=_kwh(kwh))
 
 

goodwe_controller/app/ui_text/en.json

@@ -360,7 +360,7 @@
       "tops_up": "It charges from the grid to {pct}. That covers {kwh} of expensive hours the sun will not.",
       "no_forecast": "No solar forecast, so it charges from solar only."
     },
-    "solar": {"line": "Solar still to come today: {kwh}, we count on {count}. Updated {at}.", "uncovered": "The batteries cannot hold it all. The grid covers {kwh} of the expensive hours.", "no_forecast": "No solar forecast now, so Leftover solar charges from solar only.", "learning": "The add-on is learning your house's use. The plan starts after one full day."},
+    "solar": {"line": "Solar still to come today: {kwh}, we count on {count}. Updated {at}.", "uncovered": "The expensive hours need more than Leftover solar can hold. The rest, {kwh}, comes from another battery or the grid.", "no_forecast": "No solar forecast now, so Leftover solar charges from solar only.", "learning": "The add-on is learning your house's use. The plan starts after one full day."},
     "today": {
       "not_planned": "Not planned yet.",
       "no_runs": "No cheap or expensive hours left today.",

goodwe_controller/app/ui_text/nl.json

@@ -300,7 +300,7 @@
       "tops_up": "Ze laadt van het net tot {pct}. Dat dekt {kwh} dat de zon in dure uren niet levert.",
       "no_forecast": "Geen zonneprognose, dus ze laadt alleen met zonne-energie."
     },
-    "solar": {"line": "Nog verwachte zon vandaag: {kwh}, we rekenen op {count}. Bijgewerkt om {at}.", "uncovered": "De batterijen kunnen niet alles bevatten. Het net dekt {kwh} van de dure uren.", "no_forecast": "Nu geen zonneprognose, dus Overschot zonne-energie laadt alleen met zon.", "learning": "De add-on leert eerst het verbruik van uw huis. Het plan start na één volle dag."},
+    "solar": {"line": "Nog verwachte zon vandaag: {kwh}, we rekenen op {count}. Bijgewerkt om {at}.", "uncovered": "De dure uren vragen meer dan Overschot zonne-energie kan opslaan. De rest, {kwh}, komt van een andere batterij of het net.", "no_forecast": "Nu geen zonneprognose, dus Overschot zonne-energie laadt alleen met zon.", "learning": "De add-on leert eerst het verbruik van uw huis. Het plan start na één volle dag."},
     "today": {
       "not_planned": "Nog niet gepland.",
       "no_runs": "Vandaag geen goedkope of dure uren meer.",

goodwe_controller/test_opt23_28.py

@@ -341,8 +341,8 @@ print(f"    4 kW house, 2 kWh: shortfall {sh4:.1f} kWh; both hold "
       f"levels {p4.targets}")
 check("more than all of them hold: both go to the ceiling, never above",
       p4.targets[A] == CEIL and p4.targets[B] == CEIL)
-check("...and the rest is said, not bought: the grid carries it at the "
-      "expensive price (`uncovered_kwh` = shortfall less what they cover)",
+check("...and the rest is said, not bought: another battery or the grid "
+      "carries it (`uncovered_kwh` = shortfall less what they cover)",
       abs(p4.uncovered_kwh - (sh4 - rooms * EFF)) < 0.01
       and abs(sum(p4.cover_kwh.values()) - rooms * EFF) < 0.01)
 # The pass-through itself: a battery that reaches its ceiling passes the rest.
@@ -494,7 +494,8 @@ for lang in ("en", "nl"):
         check(f"{lang}: '{key}' is at most 2 sentences of at most 12 words",
               len(sentences) <= 2 and all(
                   len(s.split()) <= 12 for s in sentences))
-# More than all hold: the Batteries screen says the grid carries the rest.
+# More than all hold: the Batteries screen says another battery or the grid
+# carries the rest (here B is on Cheap hours: "the grid" alone is not true).
 c2 = S.make("dynamic", now, soc=(20.0, 20.0))
 c2.solar_fc = S.forecast(now, 1.0, 1.0)
 c2.house_profile = profile_of({h: 3500.0 for h in range(24)})
@@ -506,16 +507,18 @@ print(f"    a 3.5 kW house: shortfall {dp2.short_kwh:.1f} kWh, unheld "
       f"{dp2.uncovered_kwh:.1f} kWh")
 check("the plan finds more than the battery holds", dp2.uncovered_kwh > 1.0
       and c2.plan_targets()[A] == 95.0)
-check("EN: the line under the Batteries cards says the batteries cannot "
-      "hold it all and the grid covers the rest",
-      "cannot hold it all" in sol["line"]
+check("EN: the line under the Batteries cards says Leftover solar cannot "
+      "hold it all and the rest comes from another battery or the grid",
+      "more than Leftover solar can hold" in sol["line"]
+      and "another battery or the grid" in sol["line"]
       and homeview._kwh(dp2.uncovered_kwh) in sol["line"])
 with homeview.in_lang("nl"):
     sol_nl = homeview.solar_block(c2, now)
-check("NL: and in Dutch", "niet alles bevatten" in sol_nl["line"]
+check("NL: and in Dutch", "meer dan Overschot zonne-energie kan opslaan"
+      in sol_nl["line"] and "andere batterij of het net" in sol_nl["line"]
       and "{" not in sol_nl["line"])
 check("a covered plan has no such sentence",
-      "cannot hold" not in homeview.solar_block(c, now)["line"])
+      "can hold" not in homeview.solar_block(c, now)["line"])
 
 # The mode help.
 en_w, nl_w = uitext.words("en"), uitext.words("nl")