@mxpicture/tesla-superchargers-mate 0.1.62 → 0.1.64

package/db/migrations/20260907181456_refs_precision_checks.sql

@@ -0,0 +1,183 @@
+-- pic_refs: the precision `hours` needs now that pic_refs_v divides by it, and
+-- two invariants stated as CHECK constraints.
+--
+-- (1) hours: 2 -> 6 dp. It was a display value, which is why 20260903171045
+--     moved mean_draw_kw off it and onto the raw interval. It stops being one
+--     here: pic_refs_v's gross_mean_draw_kw becomes
+--     gross_dropped_kwh / gross_hours, so `hours` is a divisor one level up --
+--     and rounding a divisor is what caused that defect in the first place. At
+--     2 dp the resulting error on gross_mean_draw_kw reaches 5.9455 kW and two
+--     sub-18-second refs round to a zero divisor and vanish; at 6 dp the error
+--     is 0.0020 kW and nothing vanishes. It also keeps a row self-consistent:
+--     at 2 dp, 354 of 700 rows would show a gross_mean_draw_kw that does not
+--     reconcile with the gross_hours printed beside it.
+--
+--     Nothing else moves. mean_draw_kw at 3 dp (1 W), cost_per_kwh at 4 (the
+--     0.08 EUR/kWh band the column exists to resolve) and the rest are terminal
+--     display values that feed no computation, and each scale was chosen for
+--     what its column measures.
+--
+-- (2) efficiency > 0. Four generation expressions carried NULLIF(efficiency, 0)
+--     to keep a zero out of a divisor. All that could ever do was turn a broken
+--     row into a silent NULL; stating the invariant once, checked on write, is
+--     the same guarantee and a better failure. A car with efficiency = 0 now
+--     fails the build loudly, which is consistent with what already happens for
+--     a NULL efficiency (review Md-6). The NULLIF then comes out of those four
+--     expressions, each keeping its round() scale exactly as it was.
+--
+-- (3) end_date >= start_date. An interval that runs backwards gives a negative
+--     `hours` and a mean_draw_kw whose sign means the opposite of what it says.
+--     Both CHECKs are validated against every existing row on ADD, and both
+--     return zero rows on the dev history; re-run the two SELECTs in section 8
+--     of the plan against production before applying.
+--
+-- The order below is forced, not stylistic. PG18 refuses SET EXPRESSION on a
+-- VIRTUAL generated column while the table carries any CHECK constraint
+-- (0A000), so every expression has to be rewritten before the CHECKs go on --
+-- and a later migration that wants to change one of these columns has to drop
+-- the two CHECKs, rewrite, and add them back. migrate:down runs the same
+-- sequence in reverse for the same reason.
+--
+-- Every column touched is VIRTUAL, so SET EXPRESSION is a catalog edit and none
+-- of this rewrites the table. The two CHECKs do scan it once.
+--
+-- docs/plans/2026-09-07_pic-refs-gross-ratios.md, sections 5 and 8.
+-- migrate:up
+ALTER TABLE pic_refs
+ALTER COLUMN hours
+SET
+  EXPRESSION AS (
+    round(
+      EXTRACT(
+        epoch
+        FROM
+          (end_date - start_date)
+      ) / 3600.0,
+      6
+    )
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN mean_draw_kw
+SET
+  EXPRESSION AS (
+    round(
+      (start_range_km - end_range_km) * efficiency / NULLIF(
+        EXTRACT(
+          epoch
+          FROM
+            (end_date - start_date)
+        ) / 3600.0,
+        0::NUMERIC
+      ),
+      3
+    )
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN dropped_kwh
+SET
+  EXPRESSION AS ((start_range_km - end_range_km) * efficiency);
+
+ALTER TABLE pic_refs
+ALTER COLUMN kwh_per_real_1km
+SET
+  EXPRESSION AS (
+    round(
+      (start_range_km - end_range_km) * efficiency / NULLIF(real_km, 0::NUMERIC),
+      6
+    )
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN cost_per_kwh
+SET
+  EXPRESSION AS (
+    CASE
+      WHEN start_range_km < end_range_km THEN NULL
+      ELSE round(
+        cost / NULLIF(
+          (start_range_km - end_range_km) * efficiency,
+          0::NUMERIC
+        ),
+        4
+      )
+    END
+  );
+
+ALTER TABLE pic_refs
+ADD CONSTRAINT pic_refs_efficiency_positive CHECK (efficiency > 0);
+
+ALTER TABLE pic_refs
+ADD CONSTRAINT pic_refs_date_order CHECK (end_date >= start_date);
+
+-- migrate:down
+ALTER TABLE pic_refs
+DROP CONSTRAINT IF EXISTS pic_refs_date_order;
+
+ALTER TABLE pic_refs
+DROP CONSTRAINT IF EXISTS pic_refs_efficiency_positive;
+
+ALTER TABLE pic_refs
+ALTER COLUMN cost_per_kwh
+SET
+  EXPRESSION AS (
+    CASE
+      WHEN start_range_km < end_range_km THEN NULL
+      ELSE round(
+        cost / NULLIF(
+          (start_range_km - end_range_km) * NULLIF(efficiency, 0),
+          0::NUMERIC
+        ),
+        4
+      )
+    END
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN kwh_per_real_1km
+SET
+  EXPRESSION AS (
+    round(
+      (start_range_km - end_range_km) * NULLIF(efficiency, 0) / NULLIF(real_km, 0::NUMERIC),
+      6
+    )
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN dropped_kwh
+SET
+  EXPRESSION AS (
+    (start_range_km - end_range_km) * NULLIF(efficiency, 0)
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN mean_draw_kw
+SET
+  EXPRESSION AS (
+    round(
+      (start_range_km - end_range_km) * NULLIF(efficiency, 0) / NULLIF(
+        EXTRACT(
+          epoch
+          FROM
+            (end_date - start_date)
+        ) / 3600.0,
+        0::NUMERIC
+      ),
+      3
+    )
+  );
+
+ALTER TABLE pic_refs
+ALTER COLUMN hours
+SET
+  EXPRESSION AS (
+    round(
+      EXTRACT(
+        epoch
+        FROM
+          (end_date - start_date)
+      ) / 3600.0,
+      2
+    )
+  );

package/db/migrations/20260913164819_additional_costs.sql

@@ -0,0 +1,61 @@
+-- pic_additional_costs: costs TeslaMate never sees -- service, repairs, tyres,
+-- insurance, tax, subsidies -- entered by hand and attributed to a car and a day.
+--
+-- The first pic_* table whose rows are not derivable: everything else here is a
+-- cache of a feed or of an algorithm and can be rebuilt, these can only be
+-- retyped. No upsert path, no sync, no soft delete.
+--
+-- A recurring cost is ONE row: recurrence = 'monthly' with date as the first
+-- occurrence, end_date as the last (NULL = still running) and cost as the amount
+-- PER MONTH. The future Grafana view expands it with generate_series; nothing
+-- materializes the occurrences.
+-- migrate:up
+CREATE TYPE pic_cost_category AS ENUM(
+  'service',
+  'repair',
+  'tyres',
+  'insurance',
+  'tax',
+  'funding', -- subsidies and quota credits; normally a NEGATIVE cost
+  'other' -- escape hatch, so an unforeseen cost never needs a migration
+);
+
+CREATE TYPE pic_cost_recurrence AS ENUM('once', 'monthly');
+
+CREATE TABLE IF NOT EXISTS pic_additional_costs (
+  id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  -- SMALLINT and no FK, like pic_refs.car_id: a REFERENCES cars (id) would put
+  -- constraint triggers on a TeslaMate table, which this project never writes to.
+  car_id SMALLINT NOT NULL,
+  category pic_cost_category NOT NULL,
+  -- A calendar day, not an instant; for a recurring row, the first occurrence.
+  -- Read and written as YYYY-MM-DD text by the store -- see the plan for why.
+  date DATE NOT NULL,
+  description TEXT NOT NULL,
+  -- EUR, like every stored cost here. Negative is allowed: a refund or a
+  -- 'funding' credit. On a recurring row this is the amount per occurrence.
+  cost NUMERIC(10, 2) NOT NULL,
+  recurrence pic_cost_recurrence NOT NULL DEFAULT 'once',
+  -- last occurrence of a monthly row; NULL = still running
+  end_date DATE,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+  CONSTRAINT pic_additional_costs_description_ck CHECK (btrim(description) <> ''),
+  CONSTRAINT pic_additional_costs_end_date_ck CHECK (
+    end_date IS NULL
+    OR (
+      recurrence = 'monthly'
+      AND end_date >= date
+    )
+  )
+);
+
+-- The predicate a per-car cost-over-time panel will filter and order on.
+-- NOT unique: several entries per car and day are explicitly allowed.
+CREATE INDEX IF NOT EXISTS pic_additional_costs_car_date_idx ON pic_additional_costs (car_id, date);
+
+-- migrate:down
+DROP TABLE IF EXISTS pic_additional_costs;
+
+DROP TYPE IF EXISTS pic_cost_recurrence;
+
+DROP TYPE IF EXISTS pic_cost_category;

package/db/schema.sql

@@ -11,6 +11,10 @@
 
 CREATE TYPE public.pic_address_type AS ENUM ('geofence', 'cluster', 'address', 'position');
 
+CREATE TYPE public.pic_cost_category AS ENUM ('service', 'repair', 'tyres', 'insurance', 'tax', 'funding', 'other');
+
+CREATE TYPE public.pic_cost_recurrence AS ENUM ('once', 'monthly');
+
 CREATE TYPE public.pic_ref_type AS ENUM ('drive', 'charge', 'idle');
 
 --
@@ -35,6 +39,39 @@ SET default_tablespace = '';
 
 SET default_table_access_method = heap;
 
+--
+-- Name: pic_additional_costs; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.pic_additional_costs (
+    id bigint NOT NULL,
+    car_id smallint NOT NULL,
+    category public.pic_cost_category NOT NULL,
+    date date NOT NULL,
+    description text NOT NULL,
+    cost numeric(10,2) NOT NULL,
+    recurrence public.pic_cost_recurrence DEFAULT 'once'::public.pic_cost_recurrence NOT NULL,
+    end_date date,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    CONSTRAINT pic_additional_costs_description_ck CHECK ((btrim(description) <> ''::text)),
+    CONSTRAINT pic_additional_costs_end_date_ck CHECK (((end_date IS NULL) OR ((recurrence = 'monthly'::public.pic_cost_recurrence) AND (end_date >= date))))
+);
+
+
+--
+-- Name: pic_additional_costs_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+ALTER TABLE public.pic_additional_costs ALTER COLUMN id ADD GENERATED ALWAYS AS IDENTITY (
+    SEQUENCE NAME public.pic_additional_costs_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
 --
 -- Name: pic_zip_country; Type: TABLE; Schema: public; Owner: -
 --
@@ -415,17 +452,19 @@ CREATE TABLE public.pic_refs (
     real_km numeric(8,4),
     used_cp_ids integer[],
     cost numeric(6,2),
-    hours numeric GENERATED ALWAYS AS (round((EXTRACT(epoch FROM (end_date - start_date)) / 3600.0), 2)),
-    mean_draw_kw numeric GENERATED ALWAYS AS (round((((start_range_km - end_range_km) * NULLIF(efficiency, (0)::numeric)) / NULLIF((EXTRACT(epoch FROM (end_date - start_date)) / 3600.0), (0)::numeric)), 3)),
+    hours numeric GENERATED ALWAYS AS (round((EXTRACT(epoch FROM (end_date - start_date)) / 3600.0), 6)),
+    mean_draw_kw numeric GENERATED ALWAYS AS (round((((start_range_km - end_range_km) * efficiency) / NULLIF((EXTRACT(epoch FROM (end_date - start_date)) / 3600.0), (0)::numeric)), 3)),
     dropped_km numeric GENERATED ALWAYS AS ((start_range_km - end_range_km)),
-    dropped_kwh numeric GENERATED ALWAYS AS (((start_range_km - end_range_km) * NULLIF(efficiency, (0)::numeric))),
-    kwh_per_real_1km numeric GENERATED ALWAYS AS (round((((start_range_km - end_range_km) * NULLIF(efficiency, (0)::numeric)) / NULLIF(real_km, (0)::numeric)), 6)),
+    dropped_kwh numeric GENERATED ALWAYS AS (((start_range_km - end_range_km) * efficiency)),
+    kwh_per_real_1km numeric GENERATED ALWAYS AS (round((((start_range_km - end_range_km) * efficiency) / NULLIF(real_km, (0)::numeric)), 6)),
     cost_per_real_100km numeric GENERATED ALWAYS AS (round(((cost * (100)::numeric) / NULLIF(real_km, (0)::numeric)), 2)),
     cost_per_kwh numeric GENERATED ALWAYS AS (
 CASE
     WHEN (start_range_km < end_range_km) THEN NULL::numeric
-    ELSE round((cost / NULLIF(((start_range_km - end_range_km) * NULLIF(efficiency, (0)::numeric)), (0)::numeric)), 4)
-END)
+    ELSE round((cost / NULLIF(((start_range_km - end_range_km) * efficiency), (0)::numeric)), 4)
+END),
+    CONSTRAINT pic_refs_date_order CHECK ((end_date >= start_date)),
+    CONSTRAINT pic_refs_efficiency_positive CHECK ((efficiency > (0)::numeric))
 );
 
 
@@ -534,6 +573,14 @@ CREATE UNLOGGED TABLE public.pic_zip_import (
 );
 
 
+--
+-- Name: pic_additional_costs pic_additional_costs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.pic_additional_costs
+    ADD CONSTRAINT pic_additional_costs_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: pic_chargers pic_chargers_location_guid_key; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -678,6 +725,13 @@ ALTER TABLE ONLY public.pic_zip_country
     ADD CONSTRAINT pic_zip_country_pkey PRIMARY KEY (country_code);
 
 
+--
+-- Name: pic_additional_costs_car_date_idx; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX pic_additional_costs_car_date_idx ON public.pic_additional_costs USING btree (car_id, date);
+
+
 --
 -- Name: pic_charg_proc_link_uq_idx; Type: INDEX; Schema: public; Owner: -
 --
@@ -2669,17 +2723,17 @@ CREATE VIEW public.pic_refs_v AS
             ELSE r.cost
         END AS dropped_cost,
         CASE
-            WHEN (r.ref_type = 'charge'::public.pic_ref_type) THEN ((- r.cost) - COALESCE(i.cost, 0.0))
-            ELSE (r.cost + COALESCE(i.cost, 0.0))
+            WHEN (r.ref_type = 'charge'::public.pic_ref_type) THEN (- s.gross_cost)
+            ELSE s.gross_cost
         END AS gross_dropped_cost,
-    (r.cost + COALESCE(i.cost, 0.0)) AS gross_cost,
-    (r.hours + COALESCE(i.hours, 0.0)) AS gross_hours,
-    (r.mean_draw_kw + COALESCE(i.mean_draw_kw, 0.0)) AS gross_mean_draw_kw,
-    (r.dropped_km + COALESCE(i.dropped_km, 0.0)) AS gross_dropped_km,
-    (r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0)) AS gross_dropped_kwh,
-    (r.kwh_per_real_1km + COALESCE(i.kwh_per_real_1km, 0.0)) AS gross_kwh_per_real_1km,
-    (r.cost_per_real_100km + COALESCE(i.cost_per_real_100km, 0.0)) AS gross_cost_per_real_100km,
-    (r.cost_per_kwh + COALESCE(i.cost_per_kwh, 0.0)) AS gross_cost_per_kwh,
+    s.gross_cost,
+    s.gross_hours,
+    g.gross_mean_draw_kw,
+    s.gross_dropped_km,
+    s.gross_dropped_kwh,
+    g.gross_kwh_per_real_1km,
+    g.gross_cost_per_real_100km,
+    g.gross_cost_per_kwh,
     sm.seed_address_id AS start_seed_address_id,
     em.seed_address_id AS end_seed_address_id,
     sm.cluster_id AS start_cluster_id,
@@ -2700,8 +2754,8 @@ CREATE VIEW public.pic_refs_v AS
         END AS end_address_type,
     COALESCE(sg.name, (sa.address)::character varying, (sa_fallback.address)::character varying) AS start_address,
     COALESCE(eg.name, (ea.address)::character varying, (ea_fallback.address)::character varying) AS end_address
-   FROM (((((((((public.pic_refs r
-     LEFT JOIN public.pic_refs i ON (((i.ref_type = 'idle'::public.pic_ref_type) AND (r.ref_type = 'drive'::public.pic_ref_type) AND (i.next_type = r.ref_type) AND (i.next_id = r.ref_id))))
+   FROM (((((((((((public.pic_refs r
+     LEFT JOIN public.pic_refs i ON (((i.ref_type = 'idle'::public.pic_ref_type) AND (r.ref_type = 'drive'::public.pic_ref_type) AND (i.car_id = r.car_id) AND (i.next_type = r.ref_type) AND (i.next_id = r.ref_id))))
      LEFT JOIN public.pic_cluster_map_v sm ON ((sm.address_id = r.start_address_id)))
      LEFT JOIN public.pic_cluster_map_v em ON ((em.address_id = r.end_address_id)))
      LEFT JOIN public.pic_addresses_v sa ON ((sa.id = sm.seed_address_id)))
@@ -2710,6 +2764,17 @@ CREATE VIEW public.pic_refs_v AS
      LEFT JOIN public.pic_addresses_v ea_fallback ON ((ea_fallback.id = r.end_address_id)))
      LEFT JOIN public.geofences sg ON ((sg.id = r.start_geofence_id)))
      LEFT JOIN public.geofences eg ON ((eg.id = r.end_geofence_id)))
+     CROSS JOIN LATERAL ( SELECT (r.cost + COALESCE(i.cost, 0.0)) AS gross_cost,
+            (r.hours + COALESCE(i.hours, 0.0)) AS gross_hours,
+            (r.dropped_km + COALESCE(i.dropped_km, 0.0)) AS gross_dropped_km,
+            (r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0)) AS gross_dropped_kwh) s)
+     CROSS JOIN LATERAL ( SELECT round((s.gross_dropped_kwh / NULLIF(s.gross_hours, (0)::numeric)), 3) AS gross_mean_draw_kw,
+            round((s.gross_dropped_kwh / NULLIF(r.real_km, (0)::numeric)), 6) AS gross_kwh_per_real_1km,
+            round(((s.gross_cost * (100)::numeric) / NULLIF(r.real_km, (0)::numeric)), 2) AS gross_cost_per_real_100km,
+                CASE
+                    WHEN (s.gross_dropped_kwh <= (0)::numeric) THEN NULL::numeric
+                    ELSE round((s.gross_cost / s.gross_dropped_kwh), 4)
+                END AS gross_cost_per_kwh) g)
   WHERE ((r.ref_id > 0) AND (COALESCE(r.prev_id, 0) >= 0));
 
 

package/dist/store/CarsStore.d.ts

@@ -0,0 +1,20 @@
+import { type Cars, type CarsId, type CarsInitializer, type CarsMutator } from "@mxpicture/tesla-superchargers-generated/public";
+import { IMateStore } from "./IMateStore.js";
+import { type SqlTx } from "./db.js";
+/** A car as a picker renders it; `name` is nullable in TeslaMate's own table. */
+export interface CarOption {
+    id: CarsId;
+    name: string | null;
+}
+/**
+ * Read access to TeslaMate's `cars` table. Only {@link CarsStore.queryNames}
+ * today: the additional-costs form needs a car dropdown, and with no FK on
+ * `pic_additional_costs.car_id` a free-text number would book a cost against a
+ * car that may not exist. Read-only, like every TeslaMate table here.
+ */
+export declare class CarsStore extends IMateStore<CarsId, Cars, CarsInitializer, CarsMutator> {
+    constructor();
+    queryNames(tx?: SqlTx): Promise<CarOption[]>;
+}
+export declare const carsStore: () => CarsStore;
+//# sourceMappingURL=CarsStore.d.ts.map

package/dist/store/CarsStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CarsStore.d.ts","sourceRoot":"","sources":["../../src/store/CarsStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACT,KAAK,MAAM,EACX,KAAK,eAAe,EACpB,KAAK,WAAW,EACjB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAO,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAE1C,iFAAiF;AACjF,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;;;GAKG;AACH,qBAAa,SAAU,SAAQ,UAAU,CACvC,MAAM,EACN,IAAI,EACJ,eAAe,EACf,WAAW,CACZ;;IAKc,UAAU,CAAC,EAAE,GAAE,KAAa,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CAGjE;AAGD,eAAO,MAAM,SAAS,iBAAqC,CAAC"}

package/dist/store/CarsStore.js

@@ -0,0 +1,20 @@
+import { carsInitializer, carsMutator, } from "@mxpicture/tesla-superchargers-generated/public";
+import { IMateStore } from "./IMateStore.js";
+import { sql } from "./db.js";
+/**
+ * Read access to TeslaMate's `cars` table. Only {@link CarsStore.queryNames}
+ * today: the additional-costs form needs a car dropdown, and with no FK on
+ * `pic_additional_costs.car_id` a free-text number would book a cost against a
+ * car that may not exist. Read-only, like every TeslaMate table here.
+ */
+export class CarsStore extends IMateStore {
+    constructor() {
+        super("cars", carsInitializer, carsMutator);
+    }
+    async queryNames(tx = sql()) {
+        return await tx `SELECT id, name FROM cars ORDER BY id`;
+    }
+}
+let _store = null;
+export const carsStore = () => (_store ??= new CarsStore());
+//# sourceMappingURL=CarsStore.js.map

package/dist/store/CarsStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CarsStore.js","sourceRoot":"","sources":["../../src/store/CarsStore.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,WAAW,GAKZ,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAc,MAAM,SAAS,CAAC;AAQ1C;;;;;GAKG;AACH,MAAM,OAAO,SAAU,SAAQ,UAK9B;IACC;QACE,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAY,GAAG,EAAE;QACvC,OAAO,MAAM,EAAE,CAAa,uCAAuC,CAAC;IACtE,CAAC;CACF;AAED,IAAI,MAAM,GAAqB,IAAI,CAAC;AACpC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC"}

package/dist/store/PicAdditionalCostsStore.d.ts

@@ -0,0 +1,60 @@
+import type { PicAdditionalCostsId, PicCostCategory, PicCostRecurrence } from "@mxpicture/tesla-superchargers-generated/public";
+import { type SqlTx } from "./db.js";
+/**
+ * One stored entry. Both dates are `YYYY-MM-DD` and `cost` a NUMERIC string,
+ * exactly as they leave Postgres.
+ */
+export interface AdditionalCost {
+    id: PicAdditionalCostsId;
+    car_id: number;
+    category: PicCostCategory;
+    date: string;
+    description: string;
+    cost: string;
+    recurrence: PicCostRecurrence;
+    end_date: string | null;
+    created_at: Date;
+}
+/** A full row as the UI edits it; `id` and `created_at` are the store's. */
+export interface AdditionalCostInput {
+    car_id: number;
+    category: PicCostCategory;
+    /** YYYY-MM-DD */
+    date: string;
+    description: string;
+    cost: string;
+    recurrence: PicCostRecurrence;
+    /** YYYY-MM-DD, or null on a one-off row and an open-ended monthly one */
+    end_date: string | null;
+}
+/**
+ * `pic_additional_costs` — the costs TeslaMate never sees, typed in through
+ * the web UI. Full CRUD, because nothing else creates these rows: they are the
+ * only `pic_*` rows that cannot be rebuilt from a feed or an algorithm.
+ *
+ * Deliberately NOT an {@link IMateStore}, for the same reason
+ * {@link PicZipCodesStore} is not: the base class reads with `SELECT *` and
+ * writes through the generated zod schemas, and both put a JS `Date` on the
+ * path of a `DATE` column. postgres.js parses `DATE` (OID 1082) into a `Date`
+ * at *local* midnight, which `JSON.stringify` then emits as the previous day
+ * anywhere east of UTC; writing one back casts a timestamptz to `date` in the
+ * *session* zone, which is not the process's. So this store is the boundary
+ * and it speaks `YYYY-MM-DD` strings: every read projects `date::TEXT`, every
+ * write binds `${…}::DATE`, and no JS `Date` ever exists. Overriding all four
+ * inherited methods to do that would leave nothing inherited.
+ */
+export declare class PicAdditionalCostsStore {
+    readonly table = "pic_additional_costs";
+    /** Newest day first; ties broken by insertion order, newest first. */
+    query(tx?: SqlTx): Promise<AdditionalCost[]>;
+    insert(input: AdditionalCostInput, tx?: SqlTx): Promise<AdditionalCost>;
+    /**
+     * Replace every editable column of one row — the UI edits a row as a whole,
+     * so there is no patch path. Null when no row has that id.
+     */
+    update(id: PicAdditionalCostsId, input: AdditionalCostInput, tx?: SqlTx): Promise<AdditionalCost | null>;
+    /** False when the row was already gone — deleting twice is not an error. */
+    remove(id: PicAdditionalCostsId, tx?: SqlTx): Promise<boolean>;
+}
+export declare const picAdditionalCostsStore: () => PicAdditionalCostsStore;
+//# sourceMappingURL=PicAdditionalCostsStore.d.ts.map

package/dist/store/PicAdditionalCostsStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PicAdditionalCostsStore.d.ts","sourceRoot":"","sources":["../../src/store/PicAdditionalCostsStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EAClB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAO,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAE1C;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,oBAAoB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,IAAI,CAAC;CAClB;AAED,4EAA4E;AAC5E,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,eAAe,CAAC;IAC1B,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,yEAAyE;IACzE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,uBAAuB;IAClC,SAAgB,KAAK,0BAA0B;IAE/C,sEAAsE;IACzD,KAAK,CAAC,EAAE,GAAE,KAAa,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IASnD,MAAM,CACjB,KAAK,EAAE,mBAAmB,EAC1B,EAAE,GAAE,KAAa,GAChB,OAAO,CAAC,cAAc,CAAC;IAe1B;;;OAGG;IACU,MAAM,CACjB,EAAE,EAAE,oBAAoB,EACxB,KAAK,EAAE,mBAAmB,EAC1B,EAAE,GAAE,KAAa,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAiBjC,4EAA4E;IAC/D,MAAM,CACjB,EAAE,EAAE,oBAAoB,EACxB,EAAE,GAAE,KAAa,GAChB,OAAO,CAAC,OAAO,CAAC;CAIpB;AAGD,eAAO,MAAM,uBAAuB,+BACQ,CAAC"}

package/dist/store/PicAdditionalCostsStore.js

@@ -0,0 +1,71 @@
+import { sql } from "./db.js";
+/**
+ * `pic_additional_costs` — the costs TeslaMate never sees, typed in through
+ * the web UI. Full CRUD, because nothing else creates these rows: they are the
+ * only `pic_*` rows that cannot be rebuilt from a feed or an algorithm.
+ *
+ * Deliberately NOT an {@link IMateStore}, for the same reason
+ * {@link PicZipCodesStore} is not: the base class reads with `SELECT *` and
+ * writes through the generated zod schemas, and both put a JS `Date` on the
+ * path of a `DATE` column. postgres.js parses `DATE` (OID 1082) into a `Date`
+ * at *local* midnight, which `JSON.stringify` then emits as the previous day
+ * anywhere east of UTC; writing one back casts a timestamptz to `date` in the
+ * *session* zone, which is not the process's. So this store is the boundary
+ * and it speaks `YYYY-MM-DD` strings: every read projects `date::TEXT`, every
+ * write binds `${…}::DATE`, and no JS `Date` ever exists. Overriding all four
+ * inherited methods to do that would leave nothing inherited.
+ */
+export class PicAdditionalCostsStore {
+    table = "pic_additional_costs";
+    /** Newest day first; ties broken by insertion order, newest first. */
+    async query(tx = sql()) {
+        return await tx `
+      SELECT
+        id, car_id, category, date::TEXT AS date, description, cost,
+        recurrence, end_date::TEXT AS end_date, created_at
+      FROM pic_additional_costs
+      ORDER BY date DESC, id DESC`;
+    }
+    async insert(input, tx = sql()) {
+        const [row] = await tx `
+      INSERT INTO pic_additional_costs (
+        car_id, category, date, description, cost, recurrence, end_date
+      ) VALUES (
+        ${input.car_id}, ${input.category}, ${input.date}::DATE,
+        ${input.description}, ${input.cost}, ${input.recurrence},
+        ${input.end_date}::DATE
+      )
+      RETURNING
+        id, car_id, category, date::TEXT AS date, description, cost,
+        recurrence, end_date::TEXT AS end_date, created_at`;
+        return row;
+    }
+    /**
+     * Replace every editable column of one row — the UI edits a row as a whole,
+     * so there is no patch path. Null when no row has that id.
+     */
+    async update(id, input, tx = sql()) {
+        const rows = await tx `
+      UPDATE pic_additional_costs SET
+        car_id = ${input.car_id},
+        category = ${input.category},
+        date = ${input.date}::DATE,
+        description = ${input.description},
+        cost = ${input.cost},
+        recurrence = ${input.recurrence},
+        end_date = ${input.end_date}::DATE
+      WHERE id = ${id}
+      RETURNING
+        id, car_id, category, date::TEXT AS date, description, cost,
+        recurrence, end_date::TEXT AS end_date, created_at`;
+        return rows[0] ?? null;
+    }
+    /** False when the row was already gone — deleting twice is not an error. */
+    async remove(id, tx = sql()) {
+        const result = await tx `DELETE FROM pic_additional_costs WHERE id = ${id}`;
+        return result.count > 0;
+    }
+}
+let _store = null;
+export const picAdditionalCostsStore = () => (_store ??= new PicAdditionalCostsStore());
+//# sourceMappingURL=PicAdditionalCostsStore.js.map

package/dist/store/PicAdditionalCostsStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PicAdditionalCostsStore.js","sourceRoot":"","sources":["../../src/store/PicAdditionalCostsStore.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAc,MAAM,SAAS,CAAC;AA+B1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,OAAO,uBAAuB;IAClB,KAAK,GAAG,sBAAsB,CAAC;IAE/C,sEAAsE;IAC/D,KAAK,CAAC,KAAK,CAAC,KAAY,GAAG,EAAE;QAClC,OAAO,MAAM,EAAE,CAAkB;;;;;kCAKH,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,MAAM,CACjB,KAA0B,EAC1B,KAAY,GAAG,EAAE;QAEjB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAkB;;;;UAIlC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,IAAI;UAC9C,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,UAAU;UACrD,KAAK,CAAC,QAAQ;;;;2DAImC,CAAC;QACxD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CACjB,EAAwB,EACxB,KAA0B,EAC1B,KAAY,GAAG,EAAE;QAEjB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAkB;;mBAExB,KAAK,CAAC,MAAM;qBACV,KAAK,CAAC,QAAQ;iBAClB,KAAK,CAAC,IAAI;wBACH,KAAK,CAAC,WAAW;iBACxB,KAAK,CAAC,IAAI;uBACJ,KAAK,CAAC,UAAU;qBAClB,KAAK,CAAC,QAAQ;mBAChB,EAAE;;;2DAGsC,CAAC;QACxD,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IACzB,CAAC;IAED,4EAA4E;IACrE,KAAK,CAAC,MAAM,CACjB,EAAwB,EACxB,KAAY,GAAG,EAAE;QAEjB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAA,+CAA+C,EAAE,EAAE,CAAC;QAC3E,OAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF;AAED,IAAI,MAAM,GAAmC,IAAI,CAAC;AAClD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE,CAC1C,CAAC,MAAM,KAAK,IAAI,uBAAuB,EAAE,CAAC,CAAC"}

package/dist/store/index.d.ts

@@ -1,7 +1,9 @@
+export * from "./CarsStore.js";
 export * from "./ChargingProcessesStore.js";
 export * from "./GeofencesStore.js";
 export * from "./IFailableStore.js";
 export * from "./IMateStore.js";
+export * from "./PicAdditionalCostsStore.js";
 export * from "./PicCPLinksStore.js";
 export * from "./PicChargersStore.js";
 export * from "./PicInvoiceFilesStore.js";

package/dist/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AACA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}

package/dist/store/index.js

@@ -1,8 +1,10 @@
 // This file is auto-generated by build-cli. Do not edit manually.
+export * from "./CarsStore.js";
 export * from "./ChargingProcessesStore.js";
 export * from "./GeofencesStore.js";
 export * from "./IFailableStore.js";
 export * from "./IMateStore.js";
+export * from "./PicAdditionalCostsStore.js";
 export * from "./PicCPLinksStore.js";
 export * from "./PicChargersStore.js";
 export * from "./PicInvoiceFilesStore.js";

package/dist/store/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/store/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/tesla-superchargers-mate",
-  "version": "0.1.62",
+  "version": "0.1.64",
   "description": "TeslaMate integration",
   "type": "module",
   "author": "MXPicture",
@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mxpicture/tesla-superchargers-generated": "^0.1.62",
+    "@mxpicture/tesla-superchargers-generated": "^0.1.64",
     "dbmate": "2.35.1",
     "postgres": "^3.4.9",
     "short-uuid": "^6.0.3",

package/sql/reset.sql

@@ -115,6 +115,13 @@ DROP PROCEDURE IF EXISTS pic_build_refs_car (SMALLINT);
 
 DROP PROCEDURE IF EXISTS pic_build_costs_car (SMALLINT);
 
+DROP TABLE IF EXISTS pic_additional_costs;
+
+-- After the table: both enums are only ever used by its columns.
+DROP TYPE IF EXISTS pic_cost_recurrence;
+
+DROP TYPE IF EXISTS pic_cost_category;
+
 DROP TABLE IF EXISTS pic_refs;
 
 DROP SEQUENCE IF EXISTS pic_refs_idle_id;

package/sql/test/history1.sql

@@ -0,0 +1,55 @@
+WITH
+  base AS (
+    SELECT
+      r.car_id,
+      r.ref_type,
+      sum(
+        EXTRACT(
+          EPOCH
+          FROM
+            r.end_date - r.start_date
+        )
+      ) AS duration_sec,
+      sum(r.real_km) AS real_km,
+      sum(r.start_range_km - r.end_range_km) AS dropped_km,
+      sum(r.cost) AS cost
+    FROM
+      pic_refs r
+    WHERE
+      r.car_id = 1
+      -- AND $__timeFilter(r.start_date)
+    GROUP BY
+      r.car_id,
+      r.ref_type
+  )
+SELECT
+  r.*,
+  (
+    round(
+      (r.dropped_km * c.efficiency)::NUMERIC / NULLIF(r.duration_sec / 3600.0, (0)::NUMERIC),
+      3
+    )
+  ) AS mean_draw_kw
+  -- kwh_per_real_1km
+  -- cost_per_real_100km
+  -- cost_per_kwh
+  -- floor(
+  --   extract(
+  --     epoch
+  --     FROM
+  --       r.start_date
+  --   )
+  -- ) * 1000 AS start_date_ts,
+  -- ceil(
+  --   extract(
+  --     epoch
+  --     FROM
+  --       r.end_date
+  --   )
+  -- ) * 1000 AS end_date_ts
+FROM
+  base r
+  INNER JOIN cars c ON c.id = r.car_id;
+
+-- ORDER BY
+--   r.start_date DESC;

package/sql/test/history2.sql

@@ -0,0 +1,181 @@
+WITH
+  base AS (
+    SELECT
+      *
+    FROM
+      pic_refs_v
+    WHERE
+      car_id = 1
+      -- car_id = $car_id
+      -- AND $__timeFilter(start_date)
+  ),
+  latest_base AS (
+    SELECT
+      *
+    FROM
+      pic_refs_v b
+    WHERE
+      car_id = 1
+      -- car_id = $car_id
+    ORDER BY
+      start_date DESC,
+      end_date DESC
+    LIMIT
+      1
+  ),
+  latest_selected AS (
+    SELECT
+      car_id,
+      ref_id,
+      ref_type
+    FROM
+      pic_refs_v b
+    WHERE
+      car_id = 1
+      -- car_id = $car_id
+      -- AND $__timeFilter(start_date)
+      AND ref_type = 'drive'
+    ORDER BY
+      start_date DESC,
+      end_date DESC
+    LIMIT
+      1
+  ),
+  latest AS (
+    SELECT
+      b.car_id,
+      'idle'::pic_ref_type AS ref_type,
+      (-100)::INTEGER AS ref_id,
+      end_date AS start_date,
+      (
+        SELECT
+          now()
+      ) AS end_date,
+      b.end_address AS start_address,
+      b.end_address,
+      NULL:NUMERIC AS real_km,
+      b.dropped_kwh,
+      b.gross_dropped_kwh,
+      b.dropped_cost,
+      b.gross_dropped_cost,
+      b.cost_per_real_100km,
+      b.gross_cost_per_real_100km,
+      b.kwh_per_real_1km,
+      b.gross_kwh_per_real_1km,
+      b.cost_per_kwh,
+      b.gross_cost_per_kwh
+    FROM
+      latest_base b
+      INNER JOIN latest_selected s ON s.car_id = b.car_id
+      AND s.ref_type = b.ref_type
+      AND s.ref_id = b.ref_id
+    LIMIT
+      1
+  ),
+  res AS (
+    SELECT
+      rb.start_date,
+      rb.ref_type,
+      rb.end_date,
+      rb.start_address,
+      rb.end_address,
+      rb.real_km,
+      rb.dropped_kwh,
+      rb.gross_dropped_kwh,
+      rb.dropped_cost,
+      rb.gross_dropped_cost,
+      rb.cost_per_real_100km,
+      rb.gross_cost_per_real_100km,
+      rb.kwh_per_real_1km,
+      rb.gross_kwh_per_real_1km,
+      rb.cost_per_kwh,
+      rb.gross_cost_per_kwh,
+      rb.car_id,
+      rb.ref_id
+    FROM
+      base rb
+    UNION ALL
+    SELECT
+      rl.start_date,
+      rl.ref_type,
+      rl.end_date,
+      rl.start_address,
+      rl.end_address,
+      rl.real_km,
+      rl.dropped_kwh,
+      rl.gross_dropped_kwh,
+      rl.dropped_cost,
+      rl.gross_dropped_cost,
+      rl.cost_per_real_100km,
+      rl.gross_cost_per_real_100km,
+      rl.kwh_per_real_1km,
+      rl.gross_kwh_per_real_1km,
+      rl.cost_per_kwh,
+      rl.gross_cost_per_kwh,
+      rl.car_id,
+      rl.ref_id
+    FROM
+      latest rl
+  )
+SELECT
+  r.start_date AS "Start",
+  CASE
+    WHEN r.ref_type = 'drive' THEN '🚗 Driving'
+    WHEN r.ref_type = 'idle' THEN '🅿️ Parking'
+    WHEN r.ref_type = 'charge' THEN '🔋 Charging'
+    ELSE NULL
+  END AS "Action",
+  EXTRACT(
+    EPOCH
+    FROM
+      r.end_date - r.start_date
+  ) AS "Duration",
+  r.start_address AS "From",
+  r.end_address AS "To",
+  r.real_km AS "Distance",
+  r.dropped_kwh AS "Energy (net)",
+  CASE
+    WHEN r.ref_type = 'drive' THEN r.gross_dropped_kwh
+  END AS "Energy (gross)",
+  r.dropped_cost AS "Cost (net)",
+  CASE
+    WHEN r.ref_type = 'drive' THEN r.gross_dropped_cost
+  END AS "Cost (gross)",
+  r.cost_per_real_100km AS "Cost / 100 km (net)",
+  CASE
+    WHEN r.ref_type = 'drive' THEN r.gross_cost_per_real_100km
+  END AS "Cost / 100 km (gross)",
+  r.kwh_per_real_1km AS "Energy / km (net)",
+  CASE
+    WHEN r.ref_type = 'drive' THEN r.gross_kwh_per_real_1km
+  END AS "Energy / km (gross)",
+  r.cost_per_kwh AS "Cost / kWh (net)",
+  CASE
+    WHEN r.ref_type = 'drive' THEN r.gross_cost_per_kwh
+  END AS "Cost / kWh (gross)",
+  floor(
+    extract(
+      epoch
+      FROM
+        r.start_date
+    )
+  ) * 1000 AS start_date_ts,
+  ceil(
+    extract(
+      epoch
+      FROM
+        r.end_date
+    )
+  ) * 1000 AS end_date_ts,
+  r.car_id,
+  r.ref_id AS drive_id,
+  -- h.climate_on_ratio,
+  -- CONCAT('F: ', round(h.front_defroster_ratio * 100.0, 0), ' %, R: ', round(h.rear_defroster_ratio * 100.0, 0), ' %') AS defroster_ratio,
+  h.battery_heater_ratio AS "Battery Heater"
+FROM
+  res r
+  LEFT JOIN pic_refs_hvac_ratio_v h ON h.car_id = r.car_id
+  AND h.ref_type = r.ref_type
+  AND h.ref_id = r.ref_id
+ORDER BY
+  r.start_date DESC;

package/sql/views.sql

@@ -1049,18 +1049,25 @@ SELECT
     WHEN r.ref_type = 'charge'::pic_ref_type THEN - r.cost
     ELSE r.cost
   END AS dropped_cost,
+  -- The gross_* block: this ref plus the idle that fed it. The extensive
+  -- quantities -- cost, hours, dropped_km, dropped_kwh -- are summed in `s`
+  -- and genuinely do add. The four ratios are recomputed over those sums in
+  -- `g` and are never added: the sum of two rates is not the rate over the
+  -- combined window. A 0.3 kW idle before a 25 kW drive reported 25.3 kW, and
+  -- adding the two EUR/kWh figures was out by up to 0.5853 -- seven times the
+  -- 0.08 EUR/kWh band that cost_per_kwh carries four decimals to resolve.
   CASE
-    WHEN r.ref_type = 'charge'::pic_ref_type THEN - r.cost - COALESCE(i.cost, 0.0)
-    ELSE r.cost + COALESCE(i.cost, 0.0)
+    WHEN r.ref_type = 'charge'::pic_ref_type THEN - s.gross_cost
+    ELSE s.gross_cost
   END AS gross_dropped_cost,
-  r.cost + COALESCE(i.cost, 0.0) AS gross_cost,
-  r.hours + COALESCE(i.hours, 0.0) AS gross_hours,
-  r.mean_draw_kw + COALESCE(i.mean_draw_kw, 0.0) AS gross_mean_draw_kw,
-  r.dropped_km + COALESCE(i.dropped_km, 0.0) AS gross_dropped_km,
-  r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0) AS gross_dropped_kwh,
-  r.kwh_per_real_1km + COALESCE(i.kwh_per_real_1km, 0.0) AS gross_kwh_per_real_1km,
-  r.cost_per_real_100km + COALESCE(i.cost_per_real_100km, 0.0) AS gross_cost_per_real_100km,
-  r.cost_per_kwh + COALESCE(i.cost_per_kwh, 0.0) AS gross_cost_per_kwh,
+  s.gross_cost,
+  s.gross_hours,
+  g.gross_mean_draw_kw,
+  s.gross_dropped_km,
+  s.gross_dropped_kwh,
+  g.gross_kwh_per_real_1km,
+  g.gross_cost_per_real_100km,
+  g.gross_cost_per_kwh,
   sm.seed_address_id AS start_seed_address_id,
   em.seed_address_id AS end_seed_address_id,
   sm.cluster_id AS start_cluster_id,
@@ -1083,8 +1090,11 @@ SELECT
   COALESCE(eg.name, ea.address, ea_fallback.address) AS end_address
 FROM
   pic_refs r
+  -- next_type/next_id identify the idle on their own, but the pack replay is
+  -- per-car and the join says so.
   LEFT JOIN pic_refs i ON i.ref_type = 'idle'::pic_ref_type
   AND r.ref_type = 'drive'::pic_ref_type
+  AND i.car_id = r.car_id
   AND i.next_type = r.ref_type
   AND i.next_id = r.ref_id
   LEFT JOIN pic_cluster_map_v sm ON sm.address_id = r.start_address_id
@@ -1095,6 +1105,47 @@ FROM
   LEFT JOIN pic_addresses_v ea_fallback ON ea_fallback.id = r.end_address_id
   LEFT JOIN geofences sg ON sg.id = r.start_geofence_id
   LEFT JOIN geofences eg ON eg.id = r.end_geofence_id
+  -- Two chained LATERALs rather than generated columns on pic_refs: a
+  -- generation expression cannot reference another generated column, and
+  -- gross_mean_draw_kw needs both of `s`'s sums. Each returns exactly one row,
+  -- so neither changes the cardinality above.
+  CROSS JOIN LATERAL (
+    SELECT
+      r.cost + COALESCE(i.cost, 0.0) AS gross_cost,
+      r.hours + COALESCE(i.hours, 0.0) AS gross_hours,
+      r.dropped_km + COALESCE(i.dropped_km, 0.0) AS gross_dropped_km,
+      r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0) AS gross_dropped_kwh
+  ) s
+  -- The ratios over those sums, each rounded to the scale of its per-row twin
+  -- so that gross_X and X read at the same precision. gross_hours is what
+  -- makes `hours` load-bearing rather than a display value, and why
+  -- 20260907181456 took it to 6 dp.
+  --
+  -- The per-km pair divides by r.real_km alone: an idle covers no distance, so
+  -- the drive's kilometres are the whole of the combined window's. That makes
+  -- both a per-trip fact with a legitimately heavy tail -- 24 of 320 drives
+  -- exceed 1 kWh/km, because a one-kilometre drive after a three-day park
+  -- genuinely did cost that much per km once standby is charged to it. The
+  -- car's own consumption rate is the adjacent kwh_per_real_1km on the same
+  -- row; the tail is not a defect and nothing here thresholds it away.
+  --
+  -- What the tail does break is averaging. Aggregate these as
+  -- sum(numerator) / sum(denominator), never avg(ratio): over the same drives,
+  -- sum(gross_dropped_kwh) / sum(real_km) is 0.2212 kWh/km where
+  -- avg(gross_kwh_per_real_1km) reads 0.4740. Both sums are columns of this
+  -- view.
+  CROSS JOIN LATERAL (
+    SELECT
+      round(s.gross_dropped_kwh / NULLIF(s.gross_hours, 0), 3) AS gross_mean_draw_kw,
+      round(s.gross_dropped_kwh / NULLIF(r.real_km, 0), 6) AS gross_kwh_per_real_1km,
+      round(s.gross_cost * 100 / NULLIF(r.real_km, 0), 2) AS gross_cost_per_real_100km,
+      -- The same guard as pic_refs.cost_per_kwh, for the same reason: a
+      -- non-positive kWh denominator yields a EUR/kWh that does not exist.
+      CASE
+        WHEN s.gross_dropped_kwh <= 0 THEN NULL
+        ELSE round(s.gross_cost / s.gross_dropped_kwh, 4)
+      END AS gross_cost_per_kwh
+  ) g
 WHERE
   -- The per-car seed (ref_id = -car_id) is a modelling artefact that gives the
   -- pack its opening balance; it is not a charge that happened. Anything