homebridge-ecobee-security 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 0.9.1
+
+- New setting **Add Comfort Setting switches** (`comfortSetting`, `comfortHoldType`): a Comfort Setting
+  accessory with a switch for each ecobee comfort setting (Home, Away, Sleep and your own). Turning one on
+  holds it, turning it off goes back to the schedule, and holds set in the ecobee app show up too.
+- New setting **Two-way talk (beta)** (`twoWayAudio`, off by default): talk through the doorbell from the Home
+  app's live view. Needs the doorbell to accept audio from the plugin; the log says what it answered. With it
+  on, `twoWayAudioTest` (config only) plays a 3-second tone on the doorbell when a live view starts.
+- New setting **Enable presence sensors for household members** (`memberPresence`, `presenceMembers`):
+  an occupancy sensor per person, Occupied while the ecobee app's location says they are home, for Home
+  app conditions like "only if Alex is home". Needs location set to Always in the ecobee app on that
+  person's phone; shows No Response while unknown.
+- New setting **Home Occupied source** (`occupancySource`): besides your own Home app automations
+  (the default), Home Occupied can follow **ecobee Autopilot**, the ecobee app's location on household
+  members' phones, which arms and disarms like the switch does. ecobee's Smart Home & Away stays as the
+  third choice, now labelled beta.
+- Two new settings with the Vacation Mode switch (off by default; they need the Home Occupied switch and
+  a source other than ecobee Smart Home & Away): **Start a vacation when the home has been empty for**
+  (`vacationWhenEmpty`, `vacationEmptyHours`), a safety net that starts a vacation once, and **End the
+  vacation when someone comes home** (`vacationEndOnArrival`), which also ends dated vacations.
+- When the last hold is released (a robot back on its base, say) and it had switched Away to Home, Away is
+  armed again after a 3-second countdown instead of the full exit delay. The house was already empty, so
+  the delay only left it unarmed longer. Away you asked for during the hold still gets the normal exit delay.
+- Fixed: turning Vacation Mode on in the Home app didn't start a vacation (ecobee rejected the vacation's
+  name).
+
 ## 0.9.0
 
 ### Doorbell camera (beta)

package/README.md

@@ -150,6 +150,8 @@ Sign-in: see [Sign-in](#sign-in).
 | `doorbellCamera` | `false` | Adds the doorbell camera (beta). Restart the bridge after changing it. |
 | `motionGrace` | `15` | Seconds the motion sensor stays on after the doorbell's motion ends (6 to 120). |
 | `ffmpegPath` | `/usr/local/bin/ffmpeg` if it exists, else `ffmpeg` | The ffmpeg to use. |
+| `twoWayAudio` | `false` | Talk through the doorbell from the Home app's live view (beta; see [Two-way talk](#two-way-talk-beta)). |
+| `twoWayAudioTest` | `false` | With `twoWayAudio`: plays a 3-second tone on the doorbell when a live view starts (config file only). |
 | `debugRecordings` | `false` | Keeps the last five recordings for troubleshooting (config file only; see [Troubleshooting](#troubleshooting)). |
 
 ### Switches and sensors settings
@@ -157,7 +159,14 @@ Sign-in: see [Sign-in](#sign-in).
 | Setting | Default | |
 |---|---|---|
 | `occupancySwitch` | `false` | Adds a **Home Occupied** switch for your presence automations (see [Home Occupied switch](#home-occupied-switch)). |
+| `occupancySource` | `"home"` | Who sets Home Occupied: `"home"` (your automations), `"autopilot"` or `"ecobee"` (see [Home Occupied source](#home-occupied-source)). |
+| `memberPresence` | `false` | Adds a presence sensor for each household member in `presenceMembers` (see [Member presence sensors](#member-presence-sensors)). |
+| `presenceMembers` | none | The ecobee account ids of the people to add; the settings page lists them. |
 | `vacationSwitch` | `false` | Adds a **Vacation Mode** switch that is on while an ecobee vacation is running (see [Vacation Mode switch](#vacation-mode-switch)). |
+| `vacationWhenEmpty` | `false` | Starts a vacation when Home Occupied has been off for `vacationEmptyHours` (default 24; see [Vacations that follow Home Occupied](#vacations-that-follow-home-occupied)). |
+| `vacationEndOnArrival` | `false` | Ends running vacations when Home Occupied turns on. |
+| `comfortSetting` | `false` | Adds a **Comfort Setting** accessory with a switch per ecobee comfort setting (see [Comfort Setting](#comfort-setting)). |
+| `comfortHoldType` | `"nextTransition"` | How long a comfort setting turned on is held: `"nextTransition"` or `"indefinite"`. |
 | `smokeSensor` | `true` | Adds a separate **Smoke Alarm** accessory (a Smoke Sensor) that detects smoke while ecobee has a smoke-alarm incident open, for automations and Home app smoke notifications. Set to `false` to remove it. |
 | `airQuality` | `true` | For each thermostat with an air quality sensor: an accessory "<thermostat> Air Quality" with an **Air Quality Sensor** (overall level; VOC as ecobee reports it, in ppb, which the Home app labels µg/m³) and a **Carbon Dioxide Sensor** (ppm). Read every 5 minutes. The level follows the ecobee app's Clean–Poor bar: its first two segments are Excellent, then Good, Fair, Inferior, Poor; Unknown while the sensor calibrates. |
 | `co2Alert` | `1000` | CO2 (ppm) at or above which the Carbon Dioxide Sensor reports abnormal levels. |
@@ -231,9 +240,9 @@ Using a robot vacuum as the example:
 
 | Situation | What the security system does |
 |---|---|
-| The robot starts cleaning while the system is armed **Away** | Switches to Home, and goes back to Away when the robot is done. |
+| The robot starts cleaning while the system is armed **Away** | Switches to Home, and goes back to Away when the robot is done, after a 3-second countdown. |
 | The robot starts while the system is set to **Home**, **Night** or **Off** | Nothing changes. |
-| You arm **Away in the Home app** while the robot is cleaning (the tile, a scene, an automation or Siri) | Stays in Home until the robot is done, then arms Away. The tile shows "Arming…" meanwhile. |
+| You arm **Away in the Home app** while the robot is cleaning (the tile, a scene, an automation or Siri) | Stays in Home until the robot is done, then arms Away with the normal exit delay. The tile shows "Arming…" meanwhile. |
 | You want Away **now** | Turn on the **Arm Away Now** switch (see [Hold options](#hold-options)). It arms Away right away and sends the robot home. |
 | You arm **Away in the ecobee app** while the robot is cleaning | Sends the robot home, and gives it up to 2 extra minutes on the countdown. It arms as soon as the robot is docked, but never earlier than your normal countdown. If the robot won't make it in time, it stops where it is before the sensors arm. |
 | You arm **Away at the keypad** while the robot is cleaning | Stops the robot where it is. ecobee doesn't report keypad countdowns, so this happens once Away is already armed: there's a window of up to 10 seconds in which a motion sensor could still catch the robot. |
@@ -313,7 +322,7 @@ camera isn't published and the log says why.
 
 Skip steps 2 to 4 to run the camera without the link: it is then a second tile, a plain camera named
 "<name> Camera", next to ecobee's own doorbell tile, which keeps the ring, motion and recordings. With the
-link the camera replaces ecobee's doorbell. Two-way talk isn't supported yet (see the notes above).
+link the camera replaces ecobee's doorbell.
 
 Notes:
 
@@ -369,6 +378,18 @@ person, animal and package detection, are then made by HomeKit.
 
 To inspect recordings, see [Troubleshooting](#troubleshooting).
 
+### Two-way talk (beta)
+
+Turn on **Two-way talk** (`twoWayAudio`) and restart the bridge to talk through the doorbell from the Home app's
+live view (the microphone button). It is a beta: whether the doorbell accepts audio from the plugin isn't known for
+every firmware, and talking adds a little delay. The log says at start-up what the doorbell answered ("two-way
+talk: the camera answered audio sendrecv" is good; anything else means it can't take audio and the plugin carries
+on receive-only, as before). The live view's picture and sound are not affected.
+
+To check that audio reaches the doorbell, set `"twoWayAudioTest": true` in the config (there is no settings-page
+switch), open the live view while standing at the door, and listen for a 3-second tone; the log says "test tone
+sent". Turn it off afterwards.
+
 ## Home Occupied switch
 
 Apple Home asks you to confirm (a notification you have to tap) whenever a people-arrive or
@@ -404,6 +425,42 @@ What each direction does:
 > or from a shared home member's phone, turns off an Away system, so treat it as as sensitive as the
 > security tile itself.
 
+### Home Occupied source
+
+Who sets the switch is the **Home Occupied source** (`occupancySource`), shown once the switch is on.
+Restart the bridge after changing it.
+
+| Source | `occupancySource` | What decides |
+|---|---|---|
+| **Set via Home App Automations** | `"home"` (default) | You do, with Home app arrive/leave automations, which use Apple's location of each person in your Home. Fastest, and you keep the most control. Nothing to set up in ecobee. |
+| **ecobee Autopilot** | `"autopilot"` | The ecobee app's location on each household member's phone, read every 30 seconds. Location must be set to **Always** in the ecobee app on every phone that counts. Reacts quickly, but doesn't see guests or people without the ecobee app. |
+| **ecobee Smart Home & Away (beta)** | `"ecobee"` | The thermostat, part of ecobee's eco+: it decides from motion on ecobee sensors, plus phones when Autopilot is on. It notices anyone in the house, but can take a long time to decide the home is empty. Paused during an ecobee vacation. Doesn't arm or disarm anything. |
+
+With Autopilot, someone home is any member whose phone is tracked and reads home; nobody home is all of
+those reading away. If some are unknown and none is home, the switch keeps its last state, and so it
+does if no member is tracked or ecobee can't be reached (the log says which). After a restart, Autopilot's first reading only brings the switch up to date, without arming or disarming
+anything; later changes arm and disarm exactly as the switch does. With either ecobee source the switch follows ecobee, so changing it
+in the Home app is undone.
+
+> [!NOTE]
+> If ecobee's own Autopilot is set to arm and disarm by itself in the ecobee app, ecobee and the plugin
+> both act on the same arrivals and departures. Pick one.
+
+## Member presence sensors
+
+Turn on **Enable presence sensors for household members** (`memberPresence`) and tick the people in the
+settings (`presenceMembers`, their ecobee account ids). Each gets an occupancy sensor named after them,
+**Occupied** while the ecobee app's location says they are home, for Home app conditions like "only if
+Alex is home" or "only when nobody else is home". The plugin reads ecobee every 30 seconds and logs
+when someone comes or goes. Restart the bridge after changing the setting.
+
+- The person's phone must report to ecobee with location set to **Always** in the ecobee app. A person
+  for whom that isn't so isn't listed as available in the settings, and gets no sensor until it is.
+- Only household members count. Guests, and people without the ecobee app, aren't seen.
+- **No Response** means unknown: ecobee doesn't know where the phone is, the person is no longer tracked,
+  or ecobee couldn't be reached for a while.
+- Anyone you share your Home with can see these sensors, and so where the people are.
+
 ## Vacation Mode switch
 
 Turn on **Vacation Mode switch** (`vacationSwitch`) and the plugin adds a switch named **Vacation Mode**
@@ -421,6 +478,47 @@ ends.
 - Like the other sensors, the switch shows No Response while ecobee can't be reached or you're
   signed out. Restart the bridge after changing the setting.
 
+### Vacations that follow Home Occupied
+
+Two optional settings in the Vacation Mode section (off by default). They need both the Home Occupied
+and the Vacation Mode switches, and a [Home Occupied source](#home-occupied-source) other than ecobee
+Smart Home & Away, which ecobee pauses during a vacation.
+
+- **Start a vacation when the home has been empty for** (`vacationWhenEmpty`, `vacationEmptyHours`,
+  24 by default, 1 to 720): once Home Occupied has been off that long and no vacation is running, the
+  plugin starts one as the switch does. It does this at most once per empty period, so a vacation you
+  end by hand while still away stays ended. Treat it as a safety net and start vacations deliberately,
+  with the switch or dated in the ecobee app: a wrongly "empty" home (say, a phone without location
+  set to Always under ecobee Autopilot) would start one, which is why the default is long.
+- **End the vacation when someone comes home** (`vacationEndOnArrival`): when Home Occupied turns on,
+  every running ecobee vacation ends, including dated ones from the ecobee app. The reading right
+  after a restart doesn't count.
+
+Visitors while you're away aren't household members, so Home Occupied stays off and the vacation keeps
+running. They disarm with their keypad code and arm Away from the ecobee keypad when they leave. If
+they forget, the Home app's security notification shows the disarm, and you can arm from your phone.
+
+## Comfort Setting
+
+Turn on **Add Comfort Setting switches** (`comfortSetting`) and the plugin adds one accessory,
+**Comfort Setting**, with a switch for each of your ecobee comfort settings (Home, Away, Sleep and your own,
+read from the thermostats' program; with several thermostats, a setting any of them has). It is for
+automations such as "Home Occupied off → Away on".
+
+- Turning a switch **on** holds that comfort setting on the thermostats that have it, and the others
+  turn off. How long: `comfortHoldType`, `"nextTransition"` (default, until the next scheduled change)
+  or `"indefinite"` (until you change it).
+- Turning the active switch **off** goes back to your schedule, so all off means following the schedule.
+- A hold set in the ecobee app or on the thermostat lights the matching switch (read every minute). A
+  temperature-only hold lights none.
+- During an ecobee vacation all switches are off and changes are refused (the log says so).
+- Like the other sensors, the switches show No Response while ecobee can't be reached. Restart the
+  bridge after changing the setting.
+
+> [!NOTE]
+> The Home app shows the switches as one tile, and tapping the tile toggles all of them. Open the tile
+> and pick one, or use **Show as Separate Tiles** in the accessory's settings.
+
 ## Smoke alarm and air quality
 
 - **Smoke Alarm** (`smokeSensor`, on by default) is its own accessory, a Smoke Sensor that detects smoke while ecobee has a smoke-alarm incident open. It is separate from the security tile (the Home app would otherwise merge it into the tile with a cloud icon).

package/config.schema.json

@@ -106,17 +106,121 @@
         "default": false,
         "description": "Adds a Home Occupied switch to the Home app, with an occupancy sensor. By default your own people-arrive and people-leave automations set it, and it does the rest: off (nobody home) arms Away, on (someone home) turns Away off. Switches don't ask for confirmation the way automations that change the security system do. See \"Home Occupied switch\" in the README."
       },
+      "occupancySource": {
+        "title": "Home Occupied source",
+        "type": "string",
+        "default": "home",
+        "oneOf": [
+          {
+            "title": "Set via Home App Automations",
+            "enum": [
+              "home"
+            ]
+          },
+          {
+            "title": "ecobee Autopilot",
+            "enum": [
+              "autopilot"
+            ]
+          },
+          {
+            "title": "ecobee Smart Home & Away (beta)",
+            "enum": [
+              "ecobee"
+            ]
+          }
+        ],
+        "description": "Who sets Home Occupied. Home App Automations: your arrive/leave automations. ecobee Autopilot: the ecobee app's location on household members' phones, which need location set to Always in the ecobee app. ecobee Smart Home & Away: the thermostat decides from motion on ecobee sensors (plus phones when Autopilot is on); it can be slow to notice an empty home, and it doesn't arm or disarm. See \"Home Occupied source\" in the README.",
+        "condition": {
+          "functionBody": "return model.occupancySwitch === true;"
+        }
+      },
+      "memberPresence": {
+        "title": "Presence sensors for household members",
+        "type": "boolean",
+        "default": false,
+        "description": "Adds an occupancy sensor for each person in presenceMembers, for Home app conditions like \"only if Alex is home\". Anyone you share your Home with can see them. Each person's phone needs location set to Always in the ecobee app. See \"Member presence sensors\" in the README."
+      },
+      "presenceMembers": {
+        "title": "People with a presence sensor",
+        "type": "array",
+        "items": {
+          "type": "string"
+        },
+        "description": "ecobee account ids of the people to add (the settings page lists them). With no list, none.",
+        "condition": {
+          "functionBody": "return model.memberPresence === true;"
+        }
+      },
       "vacationSwitch": {
         "title": "Vacation Mode switch",
         "type": "boolean",
         "default": false,
         "description": "Shows when an ecobee vacation is on, for other accessories to follow. Turn it on to start a vacation now, until you turn it off; set dated vacations in the ecobee app."
       },
+      "vacationWhenEmpty": {
+        "title": "Start a vacation when the home has been empty for",
+        "type": "boolean",
+        "default": false,
+        "description": "A safety net if you forget to turn Vacation Mode on: starts an ecobee vacation once Home Occupied has been off for vacationEmptyHours. Needs the Home Occupied and Vacation Mode switches, and a Home Occupied source other than ecobee Smart Home & Away.",
+        "condition": {
+          "functionBody": "return model.vacationSwitch === true && model.occupancySwitch === true && model.occupancySource !== 'ecobee';"
+        }
+      },
+      "vacationEmptyHours": {
+        "title": "Hours empty before the vacation starts",
+        "type": "integer",
+        "default": 24,
+        "minimum": 1,
+        "maximum": 720,
+        "description": "How long the home has to be empty first.",
+        "condition": {
+          "functionBody": "return model.vacationWhenEmpty === true && model.vacationSwitch === true && model.occupancySwitch === true && model.occupancySource !== 'ecobee';"
+        }
+      },
+      "vacationEndOnArrival": {
+        "title": "End the vacation when someone comes home",
+        "type": "boolean",
+        "default": false,
+        "description": "Ends any running ecobee vacation, including dated ones from the ecobee app, when Home Occupied turns on. Needs the Home Occupied and Vacation Mode switches, and a Home Occupied source other than ecobee Smart Home & Away.",
+        "condition": {
+          "functionBody": "return model.vacationSwitch === true && model.occupancySwitch === true && model.occupancySource !== 'ecobee';"
+        }
+      },
+      "comfortSetting": {
+        "title": "Add Comfort Setting switches",
+        "type": "boolean",
+        "default": false,
+        "description": "One switch per ecobee comfort setting (Home, Away, Sleep and your own). Turning one on holds it; turning it off goes back to your schedule. Restart the bridge after changing this."
+      },
+      "comfortHoldType": {
+        "title": "Comfort setting hold",
+        "type": "string",
+        "default": "nextTransition",
+        "oneOf": [
+          {
+            "title": "Until the next scheduled change",
+            "enum": [
+              "nextTransition"
+            ]
+          },
+          {
+            "title": "Until I change it",
+            "enum": [
+              "indefinite"
+            ]
+          }
+        ],
+        "description": "How long a comfort setting you turn on in the Home app is held.",
+        "condition": {
+          "functionBody": "return model.comfortSetting === true;"
+        }
+      },
       "doorbellCamera": {
         "title": "Doorbell camera",
         "type": "boolean",
         "default": false,
-        "description": "Brings the ecobee doorbell into HomeKit Secure Video: recordings, activity zones and Apple's person and package detection in the Home app, plus live view. With the doorbell link it replaces ecobee's doorbell (instant ring and motion). Two-way talk isn't supported yet. Restart the bridge after changing this. Add it in the Home app with the setup code shown in the Homebridge log. Needs an ffmpeg with libfdk_aac and libx264. See \"Doorbell camera\" in the README."
+        "description": "Brings the ecobee doorbell into HomeKit Secure Video: recordings, activity zones and Apple's person and package detection in the Home app, plus live view. With the doorbell link it replaces ecobee's doorbell (instant ring and motion). Restart the bridge after changing this. Add it in the Home app with the setup code shown in the Homebridge log. Needs an ffmpeg with libfdk_aac and libx264. See \"Doorbell camera\" in the README."
       },
       "motionGrace": {
         "title": "Motion grace period (seconds)",
@@ -129,6 +233,24 @@
           "functionBody": "return model.doorbellCamera === true;"
         }
       },
+      "twoWayAudio": {
+        "title": "Two-way talk",
+        "type": "boolean",
+        "default": false,
+        "description": "Talk through the doorbell from the Home app's live view.",
+        "condition": {
+          "functionBody": "return model.doorbellCamera === true;"
+        }
+      },
+      "twoWayAudioTest": {
+        "title": "Two-way talk test tone",
+        "type": "boolean",
+        "default": false,
+        "description": "Plays a 3-second tone on the doorbell when live view starts, to check that audio reaches it. Turn it off afterwards.",
+        "condition": {
+          "functionBody": "return model.doorbellCamera === true && model.twoWayAudio === true;"
+        }
+      },
       "ffmpegPath": {
         "title": "ffmpeg path",
         "type": "string",

package/homebridge-ui/public/index.html

@@ -152,6 +152,12 @@
       </div>
       <div id="link-error" class="alert alert-danger mt-2 mb-0" role="alert" hidden></div>
     </div>
+    <div class="form-check form-switch mb-1">
+      <input class="form-check-input" type="checkbox" role="switch" id="s-twoWayAudio" data-key="twoWayAudio" data-type="bool" data-default="false">
+      <label class="form-check-label" for="s-twoWayAudio">Two-way talk (beta)</label>
+    </div>
+    <p class="hint mb-2">Talk through the doorbell from the Home app's live view. Restart the bridge after changing this.
+      <a href="https://github.com/seanfletchr/homebridge-ecobee-security#two-way-talk-beta" target="_blank" rel="noopener">Learn more…</a></p>
     <details>
       <summary>Advanced</summary>
       <div class="mt-2">
@@ -179,6 +185,27 @@
       off (nobody home) arms Away, on (someone home) turns Away off. Switches don't ask for confirmation the way
       automations that change the security system do. Restart the bridge after changing this.
       <a href="https://github.com/seanfletchr/homebridge-ecobee-security#home-occupied-switch" target="_blank" rel="noopener">Learn more…</a></p>
+    <div id="occupancy-source-box" hidden>
+      <label for="s-occupancySource" class="form-label mb-1">Home Occupied source</label>
+      <select class="form-select" id="s-occupancySource" data-key="occupancySource" data-type="select" data-default="home"><option value="home">Set via Home App Automations</option><option value="autopilot">ecobee Autopilot</option><option value="ecobee">ecobee Smart Home &amp; Away (beta)</option></select>
+      <p class="hint mt-1 mb-0"><span id="occupancy-source-hint"></span>
+        Restart the bridge after changing this.
+        <a href="https://github.com/seanfletchr/homebridge-ecobee-security#home-occupied-source" target="_blank" rel="noopener">Learn more…</a></p>
+    </div>
+  </div>
+
+  <div class="mt-3">
+    <h6 class="mb-1">Household members</h6>
+    <div class="form-check form-switch mb-1">
+      <input class="form-check-input" type="checkbox" role="switch" id="s-memberPresence" data-key="memberPresence" data-type="bool" data-default="false">
+      <label class="form-check-label" for="s-memberPresence">Enable presence sensors for household members</label>
+    </div>
+    <p class="hint mb-2">Adds a sensor for each person you tick, for Home app conditions like "only if Alex is home". Anyone you share your Home with can see them. Restart the bridge after changing this.
+      <a href="https://github.com/seanfletchr/homebridge-ecobee-security#member-presence-sensors" target="_blank" rel="noopener">Learn more…</a></p>
+    <div id="members-box" hidden>
+      <div class="mb-1">People with a sensor</div>
+      <div id="members"></div>
+    </div>
   </div>
 
   <div class="mt-3">
@@ -188,6 +215,37 @@
       <label class="form-check-label" for="s-vacationSwitch">Add a Vacation Mode switch</label>
     </div>
     <p class="hint mb-2">Shows when an ecobee vacation is on, for other accessories to follow. Turn it on to start a vacation now, until you turn it off; set dated vacations in the ecobee app. Restart the bridge after changing this.</p>
+    <div id="vacation-options" hidden>
+      <div class="form-check mb-1">
+        <input class="form-check-input" type="checkbox" id="s-vacationWhenEmpty" data-key="vacationWhenEmpty" data-type="bool" data-default="false">
+        <label class="form-check-label" for="s-vacationWhenEmpty">Start a vacation when the home has been empty for</label>
+      </div>
+      <div class="d-flex align-items-center gap-2 mb-1 ms-4">
+        <input class="form-control" style="width: 6rem" type="number" step="1" min="1" max="720" id="s-vacationEmptyHours" data-key="vacationEmptyHours" data-type="int" data-default="24" aria-label="Hours empty before the vacation starts">
+        <span>hours</span>
+      </div>
+      <div class="hint mb-2 ms-4">A safety net if you forget to turn Vacation Mode on.</div>
+      <div class="form-check mb-1">
+        <input class="form-check-input" type="checkbox" id="s-vacationEndOnArrival" data-key="vacationEndOnArrival" data-type="bool" data-default="false">
+        <label class="form-check-label" for="s-vacationEndOnArrival">End the vacation when someone comes home</label>
+      </div>
+      <div class="hint ms-4">Also ends vacations you set in the ecobee app.</div>
+      <p class="hint mt-2 mb-0" id="vacation-options-hint" hidden></p>
+    </div>
+  </div>
+
+  <div class="mt-3">
+    <h6 class="mb-1">Comfort Setting</h6>
+    <div class="form-check form-switch mb-1">
+      <input class="form-check-input" type="checkbox" role="switch" id="s-comfortSetting" data-key="comfortSetting" data-type="bool" data-default="false">
+      <label class="form-check-label" for="s-comfortSetting">Add Comfort Setting switches</label>
+    </div>
+    <p class="hint mb-2">One switch per ecobee comfort setting (Home, Away, Sleep and your own). Turning one on holds it; turning it off goes back to your schedule. Restart the bridge after changing this.
+      <a href="https://github.com/seanfletchr/homebridge-ecobee-security#comfort-setting" target="_blank" rel="noopener">Learn more…</a></p>
+    <div id="comfort-box" hidden>
+      <label for="s-comfortHoldType" class="form-label mb-1">Hold</label>
+      <select class="form-select" id="s-comfortHoldType" data-key="comfortHoldType" data-type="select" data-default="nextTransition"><option value="nextTransition">Until the next scheduled change</option><option value="indefinite">Until I change it</option></select>
+    </div>
   </div>
 
   <div class="mt-3">
@@ -357,6 +415,10 @@
       }
     }
     $('co2-box').hidden = block?.airQuality === false;
+    showOccupancySource();
+    showVacationOptions();
+    $('comfort-box').hidden = block?.comfortSetting !== true;
+    await showMembers(block);
     $('camera-box').hidden = block?.doorbellCamera !== true;
     if (block?.doorbellCamera === true) {
       await showLink();
@@ -383,6 +445,83 @@
     $('home-box').hidden = homes.length < 2 && !set;
   }
 
+  const SOURCE_HINTS = {
+    home: 'Your arrive/leave automations in the Home app set it.',
+    autopilot: 'Follows the ecobee app\'s location on household members\' phones. Each phone needs location set to Always in the ecobee app.',
+    ecobee: 'The thermostat decides from motion on ecobee sensors (plus phones when Autopilot is on). It can be slow to notice an empty home.',
+  };
+
+  /** The Home Occupied source choice, shown only while the switch is on, with the hint for the chosen source. */
+  function showOccupancySource() {
+    $('occupancy-source-box').hidden = !$('s-occupancySwitch').checked;
+    $('occupancy-source-hint').textContent = SOURCE_HINTS[$('s-occupancySource').value] ?? SOURCE_HINTS.home;
+  }
+
+  /** The vacation options: shown with the Vacation Mode switch, usable only with Home Occupied and a source other than ecobee's. */
+  function showVacationOptions() {
+    $('vacation-options').hidden = !$('s-vacationSwitch').checked;
+    const occupied = $('s-occupancySwitch').checked;
+    const ecobee = $('s-occupancySource').value === 'ecobee';
+    for (const id of ['s-vacationWhenEmpty', 's-vacationEmptyHours', 's-vacationEndOnArrival']) {
+      $(id).disabled = !occupied || ecobee;
+    }
+    const hint = $('vacation-options-hint');
+    hint.hidden = occupied && !ecobee;
+    hint.textContent = !occupied
+      ? 'These need the Home Occupied switch above.'
+      : 'Not available with ecobee Smart Home & Away as the Home Occupied source: ecobee pauses it during a vacation, so it couldn\'t tell when someone comes home.';
+  }
+
+  /** The household members to tick, from what the plugin last saw (untracked ones greyed out with the reason). */
+  async function showMembers(blockIn) {
+    const block = blockIn ?? (await homebridge.getPluginConfig())[0] ?? {};
+    $('members-box').hidden = block.memberPresence !== true;
+    if (block.memberPresence !== true) {
+      return;
+    }
+    const members = await homebridge.request('/members').catch(() => []);
+    const box = $('members');
+    box.textContent = '';
+    if (!members.length) {
+      const p = document.createElement('p');
+      p.className = 'hint mb-0';
+      p.textContent = block.refreshToken
+        ? 'No household members found yet. They show up here a minute after the bridge starts.'
+        : 'Sign in to ecobee first.';
+      box.append(p);
+      return;
+    }
+    const chosen = Array.isArray(block.presenceMembers) ? block.presenceMembers : [];
+    for (const member of members) {
+      const id = `member-${member.accountId.replace(/[^a-z0-9]/gi, '-')}`;
+      const input = Object.assign(document.createElement('input'), {
+        className: 'form-check-input', type: 'checkbox', id, checked: chosen.includes(member.accountId),
+      });
+      input.addEventListener('change', () => setMember(member.accountId, input.checked));
+      const label = Object.assign(document.createElement('label'), { className: 'form-check-label', htmlFor: id });
+      label.textContent = member.name;
+      const row = Object.assign(document.createElement('div'), { className: 'form-check mb-1' });
+      row.append(input, label);
+      if (!member.tracked) {
+        // Ticked but untracked stays enabled so it can be unticked; the plugin doesn't publish it meanwhile.
+        input.disabled = !input.checked;
+        label.style.opacity = '0.6';
+        const hint = Object.assign(document.createElement('div'), { className: 'hint' });
+        hint.textContent = `Not available: ${member.reason}.`;
+        row.append(hint);
+      }
+      box.append(row);
+    }
+  }
+
+  async function setMember(accountId, on) {
+    const blocks = await homebridge.getPluginConfig();
+    const block = blocks[0];
+    const current = Array.isArray(block.presenceMembers) ? block.presenceMembers : [];
+    block.presenceMembers = on ? [...new Set([...current, accountId])] : current.filter(k => k !== accountId);
+    await homebridge.updatePluginConfig([block, ...blocks.slice(1)]);
+  }
+
   /** Write one setting. Top-level keys are cleared with undefined, never deleted (the UI merges shallowly). */
   async function setSetting(key, value) {
     const blocks = await homebridge.getPluginConfig();
@@ -398,6 +537,15 @@
         await setSetting(key, input.checked);
         if (key === 'airQuality') {
           $('co2-box').hidden = !input.checked;
+        } else if (key === 'occupancySwitch') {
+          showOccupancySource();
+          showVacationOptions();
+        } else if (key === 'comfortSetting') {
+          $('comfort-box').hidden = !input.checked;
+        } else if (key === 'vacationSwitch') {
+          showVacationOptions();
+        } else if (key === 'memberPresence') {
+          await showMembers();
         } else if (key === 'doorbellCamera') {
           $('camera-box').hidden = !input.checked;
           if (input.checked) {
@@ -413,6 +561,10 @@
         }
       } else if (type === 'select') {
         await setSetting(key, input.value === '' ? undefined : input.value);
+        if (key === 'occupancySource') {
+          showOccupancySource();
+          showVacationOptions();
+        }
       } else {
         await setSetting(key, input.value.trim() === '' ? undefined : input.value.trim());
       }

package/homebridge-ui/server.js

@@ -8,6 +8,7 @@ import { fileURLToPath } from 'node:url';
 
 import { HomebridgePluginUiServer, RequestError } from '@homebridge/plugin-ui-utils';
 
+import { memberTracking } from '../lib/ecobee.js';
 import { findDoorbells, pairDoorbell, readPairing, unpairDoorbell } from '../lib/camera/hap-pairing.js';
 import { browserSignInLink, finishBrowserSignIn, finishMfa, passwordSignIn, SignInError } from '../lib/auth.js';
 
@@ -93,6 +94,18 @@ class UiServer extends HomebridgePluginUiServer {
       }
     });
 
+    // The household members the plugin last saw (only that list leaves state.json), with whether the
+    // ecobee app can tell where they are. The plugin reads them from ecobee with its own sign-in, so
+    // the page doesn't use the refresh token (a second user of it could invalidate the plugin's).
+    this.onRequest('/members', async () => {
+      try {
+        const store = JSON.parse(await readFile(join(this.homebridgeStoragePath, 'ecobee-security', 'state.json'), 'utf8'));
+        return (store.members ?? []).map(m => ({ accountId: m.accountId, name: m.name, ...memberTracking(m) }));
+      } catch {
+        return [];
+      }
+    });
+
     // The doorbell link: pairing with the doorbell's own HomeKit server. The setup code is used once
     // and neither logged nor kept.
     const pairingPath = () => join(this.homebridgeStoragePath, 'ecobee-security', 'doorbell-pairing.json');