@mxtommy/kip 4.8.0-beta.1 → 4.8.1

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+# v4.9.0
+## New Contributors
+* Special thanks to @dillan for their first of many contributions.
+* Special thanks to @macjl for their first of many contributions.
+## Improvements
+* Enhanced switch panel control states and sizing for clearer status visibility and easier interaction.
+* Simplified and clarified Time-Series documentation for faster onboarding and fewer setup mistakes.
+* Made the V2 autopilot mode menu provider-agnostic for broader compatibility.
+* Hid the Action Sidebar Fullscreen button when hosted in AppDock for a cleaner, context-aware UI and to prevent browsers from being stuck in fullscreen. Fixes #1062.
+* Multiple performance improvements increasing responsiveness and providing a smoother experience on low powered devices.
+* Reduced startup bundle size to deliver faster app startup.
+## Fixes
+* Restored TTL reset to "--" after data timeouts to keep stale-state feedback accurate. Fixes #1069.
+* Corrected layering so the autopilot SVG menu now appears above widget overlays. Fixes #1071.
+* Fixed the autopilot static standby button label for clearer control feedback. Fixes #1072.
+* Corrected the autopilot key map. Fixes #1073.
+* Fixed Help image 404 errors when KIP is served under a base href. Fixes #1056.
+* Resolved a test suite issue. Fixes #1074.
+* Fixed remote storage request handling. Fixes #1075.
+* Corrected Windsteer simple mode's True Wind Angle offset and simplified the interface to better match familiar, classic wind gauge features. Fixes #1066, #1063.
+* Added circular directional angle support in the Data Charts widget using the Advancedwind wind shift path. Fixes #1070.
+# v4.8.0
+## New Features
+* Solar Charger Widget: Get instant clarity on your solar system with a compact, purpose-built Solar Charger Widget. Track individual panels or full arrays in real time, including State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature. Device discovery is automatic, and Zones support keeps warnings and alarms state highly visible.
+* AC/DC Charger Widget: Monitor charging performance at a glance with a compact AC/DC Charger Widget. View single or multiple chargers with charge mode, voltage, current, power and temperature. Chargers are discovered automatically.
+## Improvements
+* Battery Monitor Widget visual cleanup for better readability and tighter consistency with the electrical widget family.
+* Framework upgrades and core refactoring to improve long-term maintainability and runtime performance.
+* New Display Testing option allowing widgets with invalid paths to be saved.
+## Fixes
+* Improved Battery Monitor text contrast when color state is Alert (yellow), making critical values easier to read. Fixes #1027
+* Restored Countdown Timer visibility in Add Widgets.
 # v4.7.0
 ## New Features
 * Battery Monitor Widget: Stay on top of your vessel’s power system with a dedicated compact Battery Monitor Widget. Instantly view individual batteries or whole banks, including State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature. Batteries are detected automatically, with Signal K Zones support for clear warning and alarm visibility at a glance.

package/LICENSE

@@ -19,3 +19,6 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+This repository may not be used to train machine learning or AI models
+without explicit permission from the author.

package/README.md

@@ -18,7 +18,7 @@ KIP is designed for sailors and boaters who want:
 
 With KIP, you get the **familiar feel of professional Multi-Function Displays** combined with the flexibility of Signal K. It’s simple, reliable, and highly usable — the ultimate ready-to-go, modern, touch-first, Multi-Function Display for [Signal K](https://signalk.org) vessels.
 
-![KIP](./images/KIPDemo.png)
+![KIP](https://github.com/mxtommy/Kip/blob/master/images/KIPDemo.png)
 
 ## Table of Content
 - [Installations Showcase](#installations-showcase)
@@ -35,7 +35,7 @@ With KIP, you get the **familiar feel of professional Multi-Function Displays**
 - [Connect, Share, and Support](#connect-share-and-support) & [Features, Ideas, Bugs](#features-ideas-bugs)
 
 ## Installations Showcase
-![Form factor support](./images/exterior_user_installs.png)
+![Form factor support](https://github.com/mxtommy/Kip/blob/master/images/exterior_user_installs.png)
 In addition to the obvious navstation, wall mounted instrument panel and autopilot remote control usecases using PCs, tablets and phones, users have taken KIP into the elements using Raspberry Pi, Pi Zero, rugged tablets and all kinds of low cost AliExpress screens and industry leading, high quality, sunlight readable marine touch screens. KIP's native remote control feature opens up all kinds of possibilities.
 
 ## Read the Help Introduction How-To
@@ -50,7 +50,7 @@ The goal is to replicate and enhance the functionality of modern marine instrume
 - **Cross-Device Compatibility**: Guarantee a consistent and responsive experience across phones, tablets, computers, and other devices.
 - **Modern Browser Support**: Include support for the latest versions of Chromium and other modern web browsers to ensure optimal performance and compatibility.
 
-![Form factor support](./images/formfactor.png)
+![Form factor support](https://github.com/mxtommy/Kip/blob/master/images/formfactor.png)
 
 ## User Experience
 
@@ -67,10 +67,10 @@ The goal is to replicate and enhance the functionality of modern marine instrume
 - Easily switch between multiple user and device configurations profiles for different roles, formfactors or use cases.
 
 Sidenav for quick access to all important features.
-![Sidenav Dashboard Access](./images/ActionSidenav.png)
+![Sidenav Dashboard Access](https://github.com/mxtommy/Kip/blob/master/images/ActionSidenav.png)
 
 Chartplotter Mode with dashboards
-![Chartplotter Mode](./images/ChartplotterMode.png)
+![Chartplotter Mode](https://github.com/mxtommy/Kip/blob/master/images/ChartplotterMode.png)
 
 ## Dashboards and Configuration
 
@@ -80,75 +80,68 @@ Meant to build purposeful dashboards with however many widgets you want, whereve
 Add, resize, and position the widgets of your choosing. Need more? Add as many additional dashboards as you wish to keep your display purposeful. Simply swipe up and down to quickly cycle through dashboards or effortlessly jump between dashboards with a single tap in the action sidenav, always knowing exactly where you are thanks to clear highlighting of your current dashboard.
 
 Widget lists are sorted by category.
-![Layouts Configuration Image](./images/KipWidgetConfig-layout-1024.png)
+![Layouts Configuration Image](https://github.com/mxtommy/Kip/blob/master/images/KipWidgetConfig-layout-1024.png)
 
 Intuitive widget configuration.
-![Gauges Configuration Image](./images/KipConfig-display-1024x488.png)
+![Gauges Configuration Image](https://github.com/mxtommy/Kip/blob/master/images/KipConfig-display-1024x488.png)
 
 See what Signal K has to offer that you can leverage with widgets. Select it and tweak the display options to suit your purpose.
-![Paths Configuration Image](./images/KipWidgetConfig-paths-1024x488.png)
+![Paths Configuration Image](https://github.com/mxtommy/Kip/blob/master/images/KipWidgetConfig-paths-1024x488.png)
 
 Many units are supported. Choose your preferred app defaults, then tweak them widget-by-widget as necessary. KIP will automatically convert the units for you.
-![Units Configuration Image](./images/KipConfig-Units-1024.png)
+![Units Configuration Image](https://github.com/mxtommy/Kip/blob/master/images/KipConfig-Units-1024.png)
 
 Organize your dashboards and access tools.
-![Options and Dashboards](./images/Options.png)
+![Options and Dashboards](https://github.com/mxtommy/Kip/blob/master/images/Options.png)
 
 ## Widget Library
 All KIP widgets are visual presentation controls that are very versatile, with multiple advanced configuration options available to suit your needs:
-- **Numeric**: Create gauges to display any numerical data sent by your system: SOG, depth, wind speed, VMG, refrigerator temperature, weather data, etc.
-- **Text**: Create gauges to display any textual data sent by your system: MPPT state, vessel details, next waypoint, Fusion radio song information, noon and sun phases, any system component configuration detail or status available, etc.
-- **Date & Time**: A timezone-aware control with flexible presentation formatting support.
-- **Position**: Position coordinates in textual format.
-- **Simple Linear gauge**: A visual display for electrical numerical data: chargers, MPPT, shunt, etc.
-- **Linear gauge**: Visually display any numerical data on a vertical or horizontal scale: tank and reservoir levels, battery remaining capacity, etc.
-- **Radial gauge**: Visually display any numerical data on a radial scale: boat speed, wind speed, engine RPM, etc.
-- **Compass gauge**: A card or marine compass to display directional data such as heading, bearing to next waypoint, wind angle, etc.
-- **Radial and linear Steel gauge**: Old-school look & feel gauges.
-- **Level gauge**: Dual-scale heel angle indicator combining a high‑precision ±5° fine level with a wide ±40° coarse arc for fast trim tuning and broader heel / sea‑state monitoring.
-- **Pitch & Roll gauge**: Horizon-style attitude indicator showing live pitch and roll for monitoring trim, heel, and sea-state response.
-- **Battery Monitor**: Stay on top of batteries or whole banks state with a compact view displaying State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature.
-- **Solar Charger**: Track solar generation and charging performance at a glance with live panel output, battery-side metrics, and clear charger and relay status indicators.
-- **Windsteer**: Combines wind, wind sectors, heading, COG, and waypoint info for sailboat wind steering.
-- **Racesteer**: Sailboat race steering display fusing polar performance data with live conditions for optimal tactics.
-- **Countdown Timer**: A simple start sequences timer.
-- **Racer Start Timer**: Advanced race countdown timer with OCS (On Course Side) detection and automatic dashboard switching.
-- **Start Line Insight**: Analyze and visualize the start line for tactical racing advantage, including favored end and distance-to-line.
-- **Boolean Control Panel**: A digital switchboard to configure and operate remote devices: lights, bilge pumps, solenoids, or any Signal K compatible device that supports On/Off operations.
-- **Slider**: A versatile control that allows users to adjust values within a defined range by sliding. Commonly used for settings like light intensity, volume control, or any parameter requiring fine-tuned adjustments.
-- **Multi State Switch**: Lists all available device modes/states (e.g., On, Off, Charge Only, Invert Only), highlights the current state, and lets you select a new state to send to the device and see the result.
-- **Zones State Panel**: Monitor the health/state of multiple sensors and devices at a glance. Configure multiple paths per panel; each control uses KIP’s zone severity colors and status messages so warnings and alarms stand out immediately.
-- **Freeboard-SK Chart Plotter**: High-quality Signal K chartplotter integration widget.
-- **Autopilot Head**: Operate your autopilot from any device remotely.
+- **Compact Linear** – Simple horizontal linear gauge with a large value label and modern look.
+- **Linear** – Horizontal or vertical linear gauge with zone highlighting.
+- **Radial** – Radial gauge with configurable dials and zone highlighting.
+- **Compass** – Rotating compass gauge with multiple cardinal indicator options.
+- **Level Gauge** – Dual-scale heel angle indicator for trim tuning and sea-state monitoring.
+- **Pitch & Roll** – Horizon-style attitude indicator showing live pitch and roll degrees.
+- **Classic Steel** – Traditional steel-look linear & radial gauges with range sizes and zone highlights.
+- **Windsteer** – Combines wind, wind sectors, heading, COG, and waypoint info for wind steering.
+- **Wind Trends** – Real-time True Wind trends with dual axes for direction and speed, live values, and averages.
+- **Battery Monitor** - Display batteries or whole banks state State of Charge, remaining capacity, remaining time, voltage, current, power flow, and temperature.
+- **Solar Charger**- Track solar generation and charging performance at a glance with live panel output, battery-side metrics, and clear charger and relay status indicators.
+- **AC/DC Charger**- Monitor charging performance at a glance with a compact AC/DC Charger Widget. View single or multiple chargers with charge mode, voltage, current, power and temperature. Chargers are discovered automatically.
+- **Freeboard-SK** – Adds the Freeboard-SK chart plotter as a widget with automatic sign-in.
+- **Autopilot Head** – Typical autopilot controls for compatible Signal K Autopilot devices.
+- **Realtime Data Chart** – Visualizes data on a real-time chart with actuals, averages, and min/max.
 - **AIS Radar**: Display AIS targets with range rings, interactive target details, and quick zoom and filtering controls.
-- **Data Chart**: Visualize data trends over time.
-- **Embedded Webpage**: A powerful way to display web-based apps published on your Signal K server, such as Grafana and Node-RED dashboards, or your own standalone web app.
-- **Label**: A static text widget.
+- **Embed Webpage Viewer** – Embeds external web apps (Grafana, Node-RED, etc.) into your dashboard.
+- **Racesteer** – Race steering display fusing polar performance data with live conditions for optimal tactics.
+- **Racer - Start Line Insight** – Set and adjust start line ends, see distance, favored end, and line bias; integrates with Freeboard SK.
+- **Racer - Start Timer** – Advanced racing countdown timer with OCS status and auto dashboard switching.
+- **Countdown Timer** – Simple race start countdown timer with start, pause, sync, and reset options.
 
 Get the latest version of KIP to see what's new!
 
 ### Widget Samples
 Gauges sample
-![Sample Gauges Image](./images/KipGaugeSample1-1024x545.png)
+![Sample Gauges Image](https://github.com/mxtommy/Kip/blob/master/images/KipGaugeSample1-1024x545.png)
 
 Various other types of widgets
-![Electrical Concept Image](./images/KipGaugeSample2-1024x488.png)
+![Electrical Concept Image](https://github.com/mxtommy/Kip/blob/master/images/KipGaugeSample2-1024x488.png)
 
 Freeboard-SK Chartplotter integration with Autopilot widget
-![Freeboard-SK Image](./images/KipFreeboard-SK-1024.png)
+![Freeboard-SK Image](https://github.com/mxtommy/Kip/blob/master/images/KipFreeboard-SK-1024.png)
 
 Grafana integration with other widgets
-![Embedded Webpage Concept Image](./images/KipGaugeSample3-1024x508.png)
+![Embedded Webpage Concept Image](https://github.com/mxtommy/Kip/blob/master/images/KipGaugeSample3-1024x508.png)
 
 ## Historical Data
-Experience effortless insight into your vessel’s past with KIP’s Widget Historical Charts—automatically track, store, and visualize key data, unlocking instant access charts showing up to the last full day of performance. Whether you’re sailing or docked, simply tap or right-click widgets to reveal a seamless history dialog—no setup, no clutter, just the trends you need. With full support for Data Driven widgets, live-to-history transitions, KIP puts your boat’s story at your fingertips—so you can make smarter decisions, spot patterns, and sail with confidence.
+Experience effortless insight into your vessel’s past with KIP’s Widget Historical Charts—automatically track, store, and visualize key data, unlocking instant access charts showing up to the last full day of performance. Whether you’re sailing or docked, simply two-finger tap or right-click widgets to reveal a seamless history dialog—no setup, no clutter, just the trends you need. When combining data visualisation using Data Driven widgets, live-to-history transitions, KIP puts your boat’s story at your fingertips—so you can make smarter decisions, spot patterns, and sail with confidence.
 
 ## Night Modes
 Keep your night vision with automatic or manual day and night switching to a color preserving dim mode or an all Red theme. The images below look very dark, but at night... they are perfect!
 
-![Night mode - All Red](./images/KipNightMode-1024.png)
+![Night mode - All Red](https://github.com/mxtommy/Kip/blob/master/images/KipNightMode-1024.png)
 
-![Night mode - Brightness](./images/KipBrightness-1024.png)
+![Night mode - Brightness](https://github.com/mxtommy/Kip/blob/master/images/KipBrightness-1024.png)
 
 ## Chartplotter Mode
 Keep a live Freeboard‑SK chart visible while switching dashboards for an MFD‑style workflow. The chart persists (no reload or flicker), you can choose its side, collapse it per‑dashboard for full data pages, and drag resize the split. Layout auto‑stacks in portrait / narrow screens. See the dedicated Chartplotter Mode help page for setup, performance tips, and troubleshooting.
@@ -188,7 +181,9 @@ Stay informed with notifications about the state of the data you are interested
 For example, Signal K will notify KIP when a water depth or temperature sensor reaches certain levels. In addition to KIP's centralized notification menu, individual widgets offer tailored visual representations appropriate to their design objectives, providing an optimal user experience.
 
 # How To Contribute
-KIP is under the MIT license and is built with Node and Angular using various open-source assets. All free!
+KIP is under the MIT license and is built with Node and Angular using various open-source assets. All free! The project want's to insure your time is well invested by favouring discussion before submitting bug fixes and new features.
+
+Please ensure you submit an issue (bug/feature) before submitting a pull request.
 
 ## Project Scope
 What KIP IS about:
@@ -265,17 +260,26 @@ Once done with your work, from your fork's working branch, make a GitHub pull re
 For comprehensive development guidance, please refer to these instruction files:
 
 ### Primary Instructions
-- **[COPILOT.md](./COPILOT.md)**: Complete KIP project guidelines including architecture, services, widget development patterns, theming, and Signal K integration.
+- **[Project Instructions](./.github/instructions/project.instructions.md)**: KIP policy owner for architecture/domain rules, including widget creation and Host2 contracts.
+- **[COPILOT.md](./COPILOT.md)**: Architecture context, rationale, and evolution notes (non-policy).
 - **[Angular Instructions](./.github/instructions/angular.instructions.md)**: Modern Angular v21+ coding standards, component patterns, and framework best practices.
 - **[Copilot Agent Instructions](./.github/copilot-instructions.md)**: Architecture details and coding-agent guardrails for this repository.
 
 ### Development Workflow
-1. **Start Here**: Read `COPILOT.md` for KIP-specific architecture and patterns.
+1. **Start Here**: Read `.github/instructions/project.instructions.md` for KIP policy contracts.
 2. **Angular Standards**: Follow `.github/instructions/angular.instructions.md` for modern Angular development.
-3. **Setup & Build**: Use this README for project setup and build commands.
+3. **Architecture Context**: Use `COPILOT.md` for rationale and dated architecture notes.
+4. **Setup & Build**: Use this README for project setup and build commands.
+
+### Widget Creation Workflow
+1. Scaffold with `npm run generate:widget` (Host2 schematic-first path).
+2. Use `docs/widget-schematic.md` for CLI flags, prompting behavior, and troubleshooting.
+3. Follow Host2 runtime/stream patterns in `.agents/skills/kip-host2-widget/SKILL.md`.
+4. Apply widget creation implementation checklist from `.agents/skills/kip-widget-creation/SKILL.md`.
+5. Keep enforceable behavior aligned with `.github/instructions/project.instructions.md` (`Widget Creation Domain Rules`).
 
 ### Key Priorities
-- **Widget Development**: Use the Host2 widget pattern (signals + directives) and scaffold new widgets with the `create-host2-widget` schematic (see `COPILOT.md`).
+- **Widget Development**: Use Host2 patterns and scaffold with the `create-host2-widget` schematic (see `docs/widget-schematic.md`).
 - **Angular Patterns**: Use signals, standalone components, and modern control flow.
 - **Theming**: Follow KIP's theme system for consistent UI.
 - **Code Quality**: Run `npm run lint` before commits.
@@ -288,3 +292,6 @@ KIP has its own Discord Signal K channel for getting in touch. Join us at https:
 # Features, Ideas, Bugs
 See KIP's GitHub project for the latest feature requests:
 https://github.com/mxtommy/Kip/issues
+
+This repository may not be used to train machine learning or AI models
+without explicit permission from the author.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxtommy/kip",
-  "version": "4.8.0-beta.1",
+  "version": "4.8.1",
   "description": "An advanced and versatile marine instrumentation package to display Signal K data.",
   "license": "MIT",
   "author": {
@@ -65,48 +65,51 @@
   },
   "schematics": "tools/schematics/collection.json",
   "devDependencies": {
-    "@angular-devkit/build-angular": "^21.2.3",
     "@angular-devkit/schematics-cli": "^20.1.6",
-    "@angular/animations": "21.2.5",
-    "@angular/build": "^21.2.3",
-    "@angular/cdk": "21.2.3",
-    "@angular/cli": "^21.2.3",
-    "@angular/common": "21.2.5",
-    "@angular/compiler": "21.2.5",
-    "@angular/compiler-cli": "21.2.5",
-    "@angular/core": "21.2.5",
-    "@angular/forms": "21.2.5",
-    "@angular/language-service": "21.2.5",
-    "@angular/material": "21.2.3",
-    "@angular/platform-browser": "21.2.5",
-    "@angular/platform-browser-dynamic": "21.2.5",
-    "@angular/router": "21.2.5",
+    "@angular/animations": "22.0.5",
+    "@angular/build": "^22.0.5",
+    "@angular/cdk": "22.0.3",
+    "@angular/cli": "^22.0.5",
+    "@angular/common": "22.0.5",
+    "@angular/compiler": "22.0.5",
+    "@angular/compiler-cli": "22.0.5",
+    "@angular/core": "22.0.5",
+    "@angular/forms": "22.0.5",
+    "@angular/language-service": "22.0.5",
+    "@angular/material": "22.0.3",
+    "@angular/platform-browser": "22.0.5",
+    "@angular/platform-browser-dynamic": "22.0.5",
+    "@angular/router": "22.0.5",
     "@aziham/chartjs-plugin-streaming": "^3.5.1",
     "@godind/ng-canvas-gauges": "^6.2.1",
     "@types/canvas-gauges": "^2.1.8",
     "@types/d3": "^7.4.3",
+    "@types/d3-selection": "^3.0.11",
+    "@types/d3-shape": "^3.1.8",
+    "@types/express": "^5.0.6",
     "@types/js-quantities": "^1.6.6",
     "@types/lodash-es": "^4.17.9",
     "@types/node": "^24.1.0",
     "@vitest/coverage-v8": "^4.1.0",
     "@zakj/no-sleep": "^0.13.5",
-    "angular-eslint": "21.3.1",
+    "angular-eslint": "^22.0.0",
     "chart.js": "^4.5.1",
     "chartjs-adapter-date-fns": "^3.0.0",
     "chartjs-plugin-annotation": "^3.0.1",
     "clipboard": "^2.0.11",
-    "codelyzer": "^6.0.0",
     "compare-versions": "^6.1.1",
     "core-js": "^3.13.1",
     "d3": "^7.9.0",
+    "d3-selection": "^3.0.0",
+    "d3-shape": "^3.2.0",
     "date-fns": "^2.30.0",
     "eslint": "^9.29.0",
     "gridstack": "^12.3.3",
     "js-quantities": "^1.8.0",
     "jsdom": "^26.1.0",
     "lodash-es": "^4.17.23",
-    "ng-packagr": "^21.0.1",
-    "ngx-markdown": "^21.0.1",
+    "ng-packagr": "^22.0.1",
+    "ngx-markdown": "^22.0.0",
     "prismjs": "^1.30.0",
     "pwa-asset-generator": "^8.1.1",
     "rxjs": "^7.8.2",
@@ -116,7 +119,7 @@
     "steelseries": "^2.0.9",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "vitest": "^4.1.0"
   },
   "dependencies": {

package/plugin/history-series.service.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HistorySeriesService = exports.isKipTemplateSeriesDefinition = exports.isKipSolarTemplateSeriesDefinition = exports.isKipSeriesEnabled = exports.isKipConcreteSeriesDefinition = exports.isKipBmsTemplateSeriesDefinition = void 0;
+exports.HistorySeriesService = exports.isKipTemplateSeriesDefinition = exports.isKipSolarTemplateSeriesDefinition = exports.isKipSeriesEnabled = exports.isKipElectricalTemplateSeriesDefinition = exports.isKipConcreteSeriesDefinition = exports.isKipBmsTemplateSeriesDefinition = void 0;
 const kip_series_contract_1 = require("./kip-series-contract");
+Object.defineProperty(exports, "isKipElectricalTemplateSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipElectricalTemplateSeriesDefinition; } });
 Object.defineProperty(exports, "isKipBmsTemplateSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipBmsTemplateSeriesDefinition; } });
 Object.defineProperty(exports, "isKipConcreteSeriesDefinition", { enumerable: true, get: function () { return kip_series_contract_1.isKipConcreteSeriesDefinition; } });
 Object.defineProperty(exports, "isKipSeriesEnabled", { enumerable: true, get: function () { return kip_series_contract_1.isKipSeriesEnabled; } });
@@ -227,6 +228,18 @@ class HistorySeriesService {
             if (!seriesKeys || seriesKeys.length === 0) {
                 return;
             }
+            const hasSpecificSourceMatch = seriesKeys.some(seriesKey => {
+                const series = this.seriesById.get(seriesKey);
+                if (!series) {
+                    return false;
+                }
+                const seriesContext = series.context ?? 'vessels.self';
+                if (!this.isContextMatch(seriesContext, context)) {
+                    return false;
+                }
+                const seriesSource = series.source ?? 'default';
+                return seriesSource !== 'default' && seriesSource === source;
+            });
             seriesKeys.forEach(seriesKey => {
                 const series = this.seriesById.get(seriesKey);
                 if (!series) {
@@ -240,6 +253,9 @@ class HistorySeriesService {
                 if (!this.isSourceMatch(seriesSource, source)) {
                     return;
                 }
+                if (seriesSource === 'default' && source !== 'default' && hasSpecificSourceMatch) {
+                    return;
+                }
                 if (this.recordSampleByKey(seriesKey, leaf.value, ts)) {
                     recorded += 1;
                 }
@@ -328,8 +344,9 @@ class HistorySeriesService {
             && leftComparable.ownerWidgetSelector === rightComparable.ownerWidgetSelector
             && leftComparable.path === rightComparable.path
             && leftComparable.expansionMode === rightComparable.expansionMode
-            && this.areStringArraysEquivalent(leftComparable.allowedBatteryIds, rightComparable.allowedBatteryIds)
-            && this.areStringArraysEquivalent(leftComparable.allowedSolarIds, rightComparable.allowedSolarIds)
+            && leftComparable.familyKey === rightComparable.familyKey
+            && this.areStringArraysEquivalent(leftComparable.allowedIds, rightComparable.allowedIds)
+            && this.areTrackedDevicesEquivalent(leftComparable.trackedDevices, rightComparable.trackedDevices)
             && leftComparable.source === rightComparable.source
             && leftComparable.context === rightComparable.context
             && leftComparable.timeScale === rightComparable.timeScale
@@ -344,11 +361,22 @@ class HistorySeriesService {
         void reconcileTs;
         return {
             ...comparable,
-            allowedBatteryIds: this.normalizeComparableStringArray(comparable.allowedBatteryIds),
-            allowedSolarIds: this.normalizeComparableStringArray(comparable.allowedSolarIds),
+            allowedIds: this.normalizeComparableStringArray(comparable.allowedIds),
+            trackedDevices: this.normalizeComparableTrackedDevices(comparable.trackedDevices),
             methods: this.normalizeComparableStringArray(comparable.methods)
         };
     }
+    areTrackedDevicesEquivalent(left, right) {
+        const normalizedLeft = this.normalizeComparableTrackedDevices(left) ?? [];
+        const normalizedRight = this.normalizeComparableTrackedDevices(right) ?? [];
+        if (normalizedLeft.length !== normalizedRight.length) {
+            return false;
+        }
+        return normalizedLeft.every((value, index) => {
+            const candidate = normalizedRight[index];
+            return value.id === candidate?.id && value.source === candidate?.source;
+        });
+    }
     areStringArraysEquivalent(left, right) {
         const normalizedLeft = this.normalizeComparableStringArray(left) ?? [];
         const normalizedRight = this.normalizeComparableStringArray(right) ?? [];
@@ -365,6 +393,31 @@ class HistorySeriesService {
             .filter((value) => typeof value === 'string')
             .sort((left, right) => left.localeCompare(right));
     }
+    normalizeComparableTrackedDevices(values) {
+        if (!Array.isArray(values) || values.length === 0) {
+            return undefined;
+        }
+        const normalizedByKey = new Map();
+        values.forEach(value => {
+            if (!value || typeof value !== 'object') {
+                return;
+            }
+            const id = typeof value.id === 'string' ? value.id.trim() : '';
+            const sourceText = typeof value.source === 'string' ? value.source.trim() : '';
+            const source = sourceText.length > 0 ? sourceText : 'default';
+            if (!id) {
+                return;
+            }
+            normalizedByKey.set(`${id}||${source}`, { id, source });
+        });
+        if (normalizedByKey.size === 0) {
+            return undefined;
+        }
+        return Array.from(normalizedByKey.values()).sort((left, right) => {
+            const idCompare = left.id.localeCompare(right.id);
+            return idCompare !== 0 ? idCompare : left.source.localeCompare(right.source);
+        });
+    }
     isChartWidget(ownerWidgetSelector, ownerWidgetUuid) {
         if (ownerWidgetSelector === 'widget-data-chart' || ownerWidgetSelector === 'widget-windtrends-chart') {
             return true;
@@ -391,18 +444,29 @@ class HistorySeriesService {
         }
         const ownerWidgetSelector = typeof input.ownerWidgetSelector === 'string' ? input.ownerWidgetSelector.trim() : null;
         const expansionMode = input.expansionMode ?? null;
-        if (expansionMode === 'bms-battery-tree' && ownerWidgetSelector !== 'widget-bms') {
-            throw new Error('BMS template series must use ownerWidgetSelector "widget-bms"');
-        }
-        if (expansionMode === 'solar-tree' && ownerWidgetSelector !== 'widget-solar-charger') {
-            throw new Error('Solar template series must use ownerWidgetSelector "widget-solar-charger"');
+        const familyKey = expansionMode ? this.expansionModeToFamilyKey(expansionMode) : null;
+        let normalizedTemplateSelector = null;
+        if (expansionMode) {
+            const selectorByMode = {
+                'bms-battery-tree': 'widget-bms',
+                'solar-tree': 'widget-solar-charger',
+                'charger-tree': 'widget-charger',
+                'inverter-tree': 'widget-inverter',
+                'alternator-tree': 'widget-alternator',
+                'ac-tree': 'widget-ac'
+            };
+            const requiredSelector = selectorByMode[expansionMode];
+            if (ownerWidgetSelector !== requiredSelector) {
+                throw new Error(`Template series mode "${expansionMode}" must use ownerWidgetSelector "${requiredSelector}"`);
+            }
+            normalizedTemplateSelector = requiredSelector;
         }
         const normalizedMethods = this.normalizeComparableStringArray(input.methods);
-        const normalizedAllowedBatteryIds = expansionMode === 'bms-battery-tree'
-            ? this.normalizeComparableStringArray(input.allowedBatteryIds)
+        const normalizedAllowedIds = expansionMode
+            ? this.normalizeComparableStringArray(input.allowedIds)
             : undefined;
-        const normalizedAllowedSolarIds = expansionMode === 'solar-tree'
-            ? this.normalizeComparableStringArray(input.allowedSolarIds)
+        const normalizedTrackedDevices = expansionMode
+            ? this.normalizeComparableTrackedDevices(input.trackedDevices)
             : undefined;
         const isDataWidget = this.isChartWidget(ownerWidgetSelector, ownerWidgetUuid);
         const retentionMs = this.resolveRetentionMs(input);
@@ -423,6 +487,7 @@ class HistorySeriesService {
             ownerWidgetUuid,
             ownerWidgetSelector,
             path,
+            familyKey,
             source: input.source ?? 'default',
             context: input.context ?? 'vessels.self',
             timeScale: input.timeScale ?? null,
@@ -433,34 +498,47 @@ class HistorySeriesService {
             methods: normalizedMethods,
             reconcileTs: input.reconcileTs
         };
-        if (expansionMode === 'bms-battery-tree') {
-            const templateSeries = {
-                ...normalizedBase,
-                ownerWidgetSelector: 'widget-bms',
-                expansionMode,
-                allowedBatteryIds: normalizedAllowedBatteryIds ?? null,
-                allowedSolarIds: null
-            };
-            return templateSeries;
-        }
-        if (expansionMode === 'solar-tree') {
+        if (expansionMode) {
+            if (!normalizedTemplateSelector) {
+                throw new Error(`Template series mode \"${expansionMode}\" must resolve a non-null ownerWidgetSelector`);
+            }
             const templateSeries = {
                 ...normalizedBase,
-                ownerWidgetSelector: 'widget-solar-charger',
+                ownerWidgetSelector: normalizedTemplateSelector,
                 expansionMode,
-                allowedBatteryIds: null,
-                allowedSolarIds: normalizedAllowedSolarIds ?? null
+                familyKey,
+                allowedIds: normalizedAllowedIds ?? null,
+                trackedDevices: normalizedTrackedDevices ?? null
             };
             return templateSeries;
         }
         const concreteSeries = {
             ...normalizedBase,
             expansionMode: null,
-            allowedBatteryIds: null,
-            allowedSolarIds: null
+            familyKey: null,
+            allowedIds: null,
+            trackedDevices: null
         };
         return concreteSeries;
     }
+    expansionModeToFamilyKey(mode) {
+        switch (mode) {
+            case 'bms-battery-tree':
+                return 'batteries';
+            case 'solar-tree':
+                return 'solar';
+            case 'charger-tree':
+                return 'chargers';
+            case 'inverter-tree':
+                return 'inverters';
+            case 'alternator-tree':
+                return 'alternators';
+            case 'ac-tree':
+                return 'ac';
+            default:
+                throw new Error(`Unsupported expansion mode: ${String(mode)}`);
+        }
+    }
     resolveRetentionMs(series) {
         if (Number.isFinite(series.retentionDurationMs) && series.retentionDurationMs > 0) {
             return series.retentionDurationMs;