evcc master 12.10. übernehmen (Automatik-Modus)

.github/actions/build-toolchain/action.yml

@@ -20,7 +20,7 @@ runs:
 
     - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
       with:
-        node-version: "26"
+        node-version-file: ".node-version"
         cache: true
 
     # Writes are namespaced by cache-scope so a PR build cannot poison the

.github/dependabot.yml

@@ -27,3 +27,9 @@ updates:
     open-pull-requests-limit: 0
     labels:
       - "infrastructure"
+  - package-ecosystem: "pip"
+    directory: "/.github"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "infrastructure"

.github/requirements.txt

@@ -0,0 +1 @@
+cloudsmith-cli==1.28.0

.github/upstream-check/watch.json

@@ -105,7 +105,7 @@
     {
       "name": "Batterie-Vermessung (Kapazität, Wirkungsgrad)",
       "files": ["core/site_battery_ident.go"],
-      "keywords": ["roundtrip", "round trip", "RoundTrip", "usable capacity"]
+      "keywords": ["roundtrip efficiency", "round trip efficiency", "round-trip efficiency", "RoundTripEfficiency", "roundTripEfficiency", "RoundtripEfficiency", "usable capacity", "UsableCapacity"]
     },
     {
       "name": "Zweiter Einspeisetarif (EEG) / Energieseite",

.github/workflows/claude-code-review-run.yml

@@ -93,7 +93,7 @@ jobs:
 
       # Default checkout (base ref) only — do NOT check out the untrusted PR head.
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 1
 
@@ -102,7 +102,7 @@ jobs:
         continue-on-error: true # always report status below, even on failure
         # pinned: v1 (Claude Code 2.1.216) fails every Bash call with
         # "bwrap: Can't create file at /home/.mcp.json: Permission denied"
-        uses: anthropics/claude-code-action@8ce9314fa9a404564fa7e954cd84f25bcba2b829 # v1 @ 2.1.215
+        uses: anthropics/claude-code-action@58985842b834ed26087302ba27d07bc24ca8697a # v1 @ 2.1.215
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           # Provided explicitly so the review can post on fork PRs; also required

.github/workflows/claude-issue-agent-run.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Run Claude
         # pinned: v1 (Claude Code 2.1.216) fails every Bash call with
         # "bwrap: Can't create file at /home/.mcp.json: Permission denied"
-        uses: anthropics/claude-code-action@8ce9314fa9a404564fa7e954cd84f25bcba2b829 # v1 @ 2.1.215
+        uses: anthropics/claude-code-action@58985842b834ed26087302ba27d07bc24ca8697a # v1 @ 2.1.215
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -399,7 +399,8 @@ jobs:
           if [ "$MODE" = triage ]; then
             args+=(--draft)
           fi
-          if [ "$(gh api "repos/$GITHUB_REPOSITORY/issues/$ISSUE" --jq '.type.name // empty')" = Bug ]; then
-            args+=(--label bug)
-          fi
+          # carry the triaged issue labels over: the PR labeling job skips bot authors
+          mapfile -t labels < <(gh api "repos/$GITHUB_REPOSITORY/issues/$ISSUE" \
+            --jq '[.labels[].name] + (if .type.name == "Bug" then ["bug"] else [] end) | unique | .[]')
+          for l in "${labels[@]}"; do args+=(--label "$l"); done
           gh pr create "${args[@]}"

.github/workflows/claude-issue-agent.yml

@@ -158,7 +158,7 @@ jobs:
       - name: Run Claude PR Labeler
         # pinned: v1 (Claude Code 2.1.216) fails every Bash call with
         # "bwrap: Can't create file at /home/.mcp.json: Permission denied"
-        uses: anthropics/claude-code-action@8ce9314fa9a404564fa7e954cd84f25bcba2b829 # v1 @ 2.1.215
+        uses: anthropics/claude-code-action@58985842b834ed26087302ba27d07bc24ca8697a # v1 @ 2.1.215
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cli-docs.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
         with:
           node-version-file: ".node-version"
           cache: true

.github/workflows/command-pr-build.yml

@@ -130,7 +130,7 @@ jobs:
 
       - name: Setup Buildx
         id: buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
 
       - name: Restore build cache
         uses: ./.github/actions/docker-cache

.github/workflows/default.yml

@@ -57,7 +57,7 @@ jobs:
           go-version-file: go.mod
         id: go
 
-      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
         with:
           node-version-file: ".node-version"
           cache: true
@@ -127,7 +127,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
         with:
           node-version-file: ".node-version"
           cache: true
@@ -210,7 +210,7 @@ jobs:
           go-version-file: go.mod
         id: go
 
-      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
         with:
           node-version-file: ".node-version"
           cache: true
@@ -332,7 +332,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      - uses: voidzero-dev/setup-vp@3754dd7dbdb32bd8f6d28b6043de13ad3a75f21f # v1.21.1
         with:
           node-version-file: ".node-version"
           cache: true

.github/workflows/documentation.yml

@@ -55,10 +55,18 @@ jobs:
         with:
           persist-credentials: false
 
+      - uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+        with:
+          node-version-file: ".node-version"
+          cache: true
+
+      - name: Install
+        run: make install-ui
+
       - name: Prepare OpenAPI spec
         run: |
           mkdir -p ./openapi-deploy
-          npx --yes @redocly/cli@2 bundle ./server/openapi.yaml -o ./openapi-deploy/openapi.yaml
+          npx redocly bundle ./server/openapi.yaml -o ./openapi-deploy/openapi.yaml
 
       - name: Deploy OpenAPI spec to docs repo
         uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4

.github/workflows/fork-tests.yml

@@ -55,9 +55,13 @@ jobs:
       - name: Race detector
         run: |
           set -o pipefail
-          # charger: only the fork's tests, evcc's TestTemplates has an intermittent race of its own
+          # charger: only the fork's tests, evcc's TestTemplates has an intermittent race of its own.
+          # core: evcc's enableAutomatic (optimizer_automatic_test.go) writes sponsor.Subject while an
+          # optimizer run started by an earlier evcc test still reads it; evcc runs no race detector
+          evccRace='^(TestAutomaticLevels|TestOptimizerGate|TestOptimizerSurplusRegime|TestOptimizerStopFollowsSurplus|TestOptimizerFlexibility|TestOptimizerGateInactive|TestOptimizerGateStale|TestSmartCostLimitUnavailable|TestBatteryModeAutomatic|TestBatteryGridChargeLimitUnavailable)$'
           {
-            go test -race -count=1 ./core/lm/... ./core/peak/ ./core/ ./server/ &&
+            go test -race -count=1 ./core/lm/... ./core/peak/ ./server/ &&
+              go test -race -count=1 -skip "$evccRace" ./core/ &&
               go test -race -count=1 -run 'TestSwitchStages|TestSwitchSocketRatedPower' ./charger/
           } 2>&1 | tee /tmp/race.log || {
             grep -E "^(--- FAIL|FAIL|panic:)" /tmp/race.log | head -20 | sed "s/^/::error::/"

.github/workflows/nightly.yml

@@ -137,7 +137,7 @@ jobs:
           python-version: 3.12
 
       - name: Install Cloudsmith CLI
-        run: pip install cloudsmith-cli==1.16.0
+        run: pip install -r .github/requirements.txt
 
       - name: Publish .deb to Cloudsmith
         env:

.github/workflows/openapi-validate.yml

@@ -10,6 +10,7 @@ on:
       - "server/openapi.yaml"
       - "server/openapi.state.yaml"
       - ".github/workflows/openapi-validate.yml"
+      - "go.mod" # validator version follows go.mod
 
 jobs:
   validate-openapi:
@@ -23,4 +24,4 @@ jobs:
         with:
           go-version-file: go.mod
       - name: Validate OpenAPI spec
-        run: go run github.com/getkin/kin-openapi/cmd/validate@v0.133.0 -ext -- server/openapi.yaml
+        run: go tool validate -ext -- server/openapi.yaml

.github/workflows/release.yml

@@ -156,7 +156,7 @@ jobs:
           python-version: 3.12
 
       - name: Install Cloudsmith CLI
-        run: pip install cloudsmith-cli==1.16.0
+        run: pip install -r .github/requirements.txt
 
       - name: Publish .deb to Cloudsmith
         env:

AGENTS.md

@@ -209,7 +209,7 @@ Deep documentation on specific subsystems is available in `docs/agents/`. Load w
 
 - Use CSS Custom Properties for theming (semantic names: `--evcc-green`, `--evcc-battery`)
 - No inline `style` attributes; use Bootstrap utility classes or scoped CSS (inline only for truly dynamic values)
-- Use existing custom media queries for responsive breakpoints
+- Use the custom media queries from `assets/css/breakpoints.css` (`@media (--sm-and-up)`) for responsive breakpoints, never raw px `min-width`/`max-width`. Write mobile-first and override upwards instead of adding max-width queries
 - Use `$t()` function for all user-facing strings
 - Update both `i18n/en.json` and `i18n/de.json` for new strings
 - Use hierarchical namespace: `{section}.{component}.{purpose}`

Dockerfile

@@ -1,5 +1,5 @@
 # STEP 1 build ui
-FROM --platform=$BUILDPLATFORM ghcr.io/voidzero-dev/vite-plus:1.0.0@sha256:8d788678fb9783ba8994c4fe5652af3316bfc414f7ef6ead0136932ee6075b8b AS node
+FROM --platform=$BUILDPLATFORM ghcr.io/voidzero-dev/vite-plus:1.1.0@sha256:15dedad6ab1f100c096aaebac6b0fb40ccf1f3dd0dd0169141e2a56588489b60 AS node
 
 USER root
 

assets/css/app.css

@@ -96,6 +96,9 @@
 		"Noto Color Emoji";
 	--bs-success: var(--evcc-primary);
 	--bs-success-rgb: var(--bs-primary-rgb);
+	--evcc-success-bg: oklch(from var(--evcc-darker-green) 96% 0.035 h);
+	--evcc-success-text: oklch(from var(--evcc-darker-green) 45% 0.11 h);
+	--evcc-success-text-secondary: oklch(from var(--evcc-darker-green) 52% 0.08 h);
 	--bs-code-color: var(--evcc-darkest-green);
 	--evcc-backdrop: #93949eaa; /* --bs-gray-medium + transparent */
 
@@ -127,6 +130,9 @@
 	--bs-border-color-translucent: rgba(255, 255, 255, 0.08);
 	--bs-code-color: var(--evcc-dark-green);
 	--evcc-backdrop: #000000aa; /* black + transparent */
+	--evcc-success-bg: oklch(from var(--evcc-darker-green) 30% 0.06 h);
+	--evcc-success-text: oklch(from var(--evcc-darker-green) 82% 0.17 h);
+	--evcc-success-text-secondary: oklch(from var(--evcc-darker-green) 80% 0.07 h);
 	--tab-bar-background: var(--evcc-box);
 	color-scheme: dark;
 }

assets/js/components/Battery/BatteryConfigCard.vue

@@ -6,7 +6,9 @@
 				class="text-primary flex-shrink-0 mt-1"
 			></shopicon-regular-sun>
 			<div>
-				<div class="fw-bold mb-1">{{ $t("battery.config.priorityTitle") }}</div>
+				<div class="fw-bold mb-1">
+					{{ $t("battery.config.priorityTitle") }}
+				</div>
 				<i18n-t
 					:keypath="
 						selectedPrioritySoc > 0
@@ -37,7 +39,9 @@
 				class="text-primary flex-shrink-0 mt-1"
 			></shopicon-regular-lightning>
 			<div>
-				<div class="fw-bold mb-1">{{ $t("battery.config.bufferTitle") }}</div>
+				<div class="fw-bold mb-1">
+					{{ $t("battery.config.bufferTitle") }}
+				</div>
 				<i18n-t
 					:keypath="
 						selectedBufferSoc < 100
@@ -71,22 +75,55 @@
 			</div>
 		</div>
 
+		<p
+			v-if="optimizerControlledTitles.length"
+			class="d-flex gap-3 text-muted small mb-0"
+			data-testid="battery-optimizer-hint"
+		>
+			<OptimizerAuto class="flex-shrink-0" />
+			<i18n-t keypath="battery.config.optimizerControlledHint" tag="span" scope="global">
+				<template #loadpoints>{{ controlledTitleList }}</template>
+				<template #optimizer>
+					<router-link to="/optimize" class="text-muted">
+						{{ $t("config.optimizer.linkWord") }}
+					</router-link>
+				</template>
+			</i18n-t>
+		</p>
+
 		<template v-if="controllable">
 			<hr class="my-3" />
-			<div class="form-check form-switch">
+			<div
+				class="form-check form-switch"
+				:class="{ 'opacity-25 pe-none': optimizerAutomatic }"
+			>
 				<input
 					id="batteryDischarge"
-					:checked="batteryDischargeControl"
+					:checked="batteryDischargeControl && !optimizerAutomatic"
 					class="form-check-input"
 					type="checkbox"
 					role="switch"
+					:disabled="optimizerAutomatic"
 					@change="changeDischargeControl"
 				/>
 				<label class="form-check-label" for="batteryDischarge">
 					{{ $t("battery.config.discharge") }}
 				</label>
 			</div>
-			<div v-if="experimental" class="form-check form-switch mt-2">
+			<p
+				v-if="optimizerAutomatic"
+				class="switch-indent d-flex gap-3 text-muted small mt-2 mb-3"
+			>
+				<OptimizerAuto class="flex-shrink-0" />
+				<i18n-t keypath="config.optimizer.controlled" tag="span" scope="global">
+					<template #optimizer>
+						<router-link to="/optimize" class="text-muted">
+							{{ $t("config.optimizer.linkWord") }}
+						</router-link>
+					</template>
+				</i18n-t>
+			</p>
+			<div v-if="gridDischargeVisible" class="form-check form-switch mt-2">
 				<input
 					id="batteryGridDischarge"
 					:checked="batteryGridDischarge"
@@ -123,7 +160,8 @@
 				>
 					<template #link>
 						<router-link :to="siteConfigRoute" @click="closeGridDischargeConfirm">
-							{{ $t("config.main.title") }} › {{ $t("config.general.site") }}
+							{{ $t("config.main.title") }} ›
+							{{ $t("config.general.site") }}
 						</router-link>
 					</template>
 				</i18n-t>
@@ -142,11 +180,12 @@ import type { Battery } from "@/types/evcc";
 import Card from "../Helper/Card.vue";
 import ConfirmModal from "../Helper/ConfirmModal.vue";
 import InlineSocSelect from "./InlineSocSelect.vue";
+import OptimizerAuto from "../MaterialIcon/OptimizerAuto.vue";
 
 // Battery usage controls: surplus priority, charging buffer and discharge switches.
 export default defineComponent({
 	name: "BatteryConfigCard",
-	components: { Card, ConfirmModal, InlineSocSelect },
+	components: { Card, ConfirmModal, InlineSocSelect, OptimizerAuto },
 	mixins: [formatter],
 	props: {
 		bufferSoc: { type: Number, default: 100 },
@@ -156,6 +195,11 @@ export default defineComponent({
 		batteryGridDischarge: Boolean,
 		battery: { type: Object as PropType<Battery> },
 		experimental: Boolean,
+		optimizerAutomatic: Boolean,
+		optimizerControlledTitles: {
+			type: Array as PropType<string[]>,
+			default: () => [],
+		},
 		country: String,
 	},
 	data() {
@@ -166,6 +210,16 @@ export default defineComponent({
 		};
 	},
 	computed: {
+		// keep visible while enabled so it can be switched off
+		gridDischargeVisible(): boolean {
+			const supported = (this.battery?.devices ?? []).some((d) =>
+				d.modes?.includes("discharge")
+			);
+			return this.experimental && (supported || this.batteryGridDischarge);
+		},
+		controlledTitleList(): string {
+			return new Intl.ListFormat(this.$i18n?.locale).format(this.optimizerControlledTitles);
+		},
 		siteConfigRoute() {
 			return { path: "/config", query: { site: "" } };
 		},
@@ -326,11 +380,20 @@ export default defineComponent({
 		},
 		getBufferStartName(value: number) {
 			const key = value === 0 ? "never" : value === 100 ? "full" : "above";
-			return this.$t(`battery.config.bufferStart.${key}`, { soc: this.fmtSoc(value) });
+			return this.$t(`battery.config.bufferStart.${key}`, {
+				soc: this.fmtSoc(value),
+			});
 		},
 		fmtSoc(soc: number) {
 			return this.fmtPercentage(soc);
 		},
 	},
 });
 </script>
+
+<style scoped>
+/* matches .form-switch padding so the note aligns with the label text */
+.switch-indent {
+	padding-left: 2.5rem;
+}
+</style>

assets/js/components/ChargingPlans/ChargingPlanModal.vue

@@ -18,6 +18,7 @@
 					:effectivePlanTime="loadpoint?.effectivePlanTime ?? undefined"
 					:effectivePlanSoc="loadpoint?.effectivePlanSoc"
 					:effectivePlanStrategy="loadpoint?.effectivePlanStrategy"
+					:activePlan="loadpoint?.plan"
 					:planEnergy="loadpoint?.planEnergy"
 					:limitEnergy="loadpoint?.limitEnergy"
 					:socBasedPlanning="!!loadpoint?.socBasedPlanning"