this is a big slop that might backfire lol... new config system and UI!

server/src/services/homeAssistantService/configuration.js

@@ -0,0 +1,49 @@
+// Home Assistant Configuration
+// Purpose: Defines the shared Home Assistant connection and the Neato, lift, entity, and button mappings that use it.
+// Scope: Keeps this connected configuration tree together without initializing any integration service.
+const { strictObject, string, boolean, integer } = require('../../configuration/schemaHelpers');
+const neato = require('../neatoService/configuration');
+const lift = require('../liftService/configuration');
+
+module.exports = {
+  key: 'homeAssistant',
+  feature: true,
+  // Retain the actual child definitions so generic configuration metadata can
+  // discover their feature switches without repeating nested paths centrally.
+  nestedDefinitions: [neato, lift],
+  defaultValue: {
+    enabled: false,
+    url: 'http://127.0.0.1:8123',
+    token: '',
+    [neato.key]: neato.defaultValue,
+    [lift.key]: lift.defaultValue,
+    entities: [],
+    buttons: [],
+  },
+  schema: strictObject({
+    enabled: boolean(),
+    url: string({ title: 'Server URL', format: 'uri', maxLength: 2048 }),
+    token: string({ title: 'Long-lived access token', writeOnly: true, maxLength: 20000 }),
+    [neato.key]: neato.schema,
+    [lift.key]: lift.schema,
+    entities: {
+      type: 'array',
+      title: 'Room entities',
+      items: strictObject({
+        id: string({ title: 'Entity id', minLength: 1, maxLength: 255 }),
+        name: string({ minLength: 1, maxLength: 120 }),
+        type: string({ enum: ['light', 'switch'] }),
+      }, { required: ['id', 'name'] }),
+    },
+    buttons: {
+      type: 'array',
+      title: 'Physical button mappings',
+      items: strictObject({
+        entityId: string({ title: 'Entity id', minLength: 1, maxLength: 255 }),
+        stateEquals: string({ minLength: 1, maxLength: 255 }),
+        cooldownMs: integer({ minimum: 0, maximum: 86400000 }),
+        action: string({ enum: ['humanAlert', 'modeTurns', 'modeAdmin', 'lightsLockToggle'] }),
+      }, { required: ['entityId', 'stateEquals', 'cooldownMs', 'action'] }),
+    },
+  }, { title: 'Home Assistant', required: ['enabled', 'url', 'token', 'neato', 'lift', 'entities', 'buttons'] }),
+};

server/src/services/homeAssistantService/index.js

@@ -2,8 +2,7 @@
 // Purpose: Composes Home Assistant transport, runtime automation engine, and event/socket hooks.
 // Scope: Exposes stable room-control APIs while delegating internals to focused modules.
 const logger = require('../../globals/logger').child('homeAssistantService');
-const { loadConfig } = require('../../helpers/configLoader');
-const { isFeatureEnabled } = require('../../helpers/features');
+const { loadConfig } = require('../../configuration');
 const { events } = require('./state');
 const { createRuntimeEngine } = require('./runtimeEngine');
 const { createTransport } = require('./transport');
@@ -11,7 +10,7 @@ const { registerHomeAssistantHooks } = require('./hooks');
 
 const config = loadConfig();
 const haConfig = config.homeAssistant || {};
-const enabled = isFeatureEnabled('homeAssistant');
+const enabled = Boolean(haConfig.enabled);
 
 let callHomeAssistantServiceImpl = async () => {
   throw new Error('Home Assistant not connected');
@@ -39,9 +38,9 @@ runtimeEngine.loadTriggerConfig();
 
 if (enabled) {
   /*
-    Loading the module should be harmless on rover-only installs. Only connect
-    to Home Assistant when the central feature gate says the integration exists,
-    so placeholder URLs/tokens in example config cannot start network traffic.
+    Loading the module should be harmless on rover-only installs. The explicit
+    service-owned switch alone decides whether connection should be attempted;
+    missing credentials are then reported as a runtime connection failure.
   */
   transport.connect();
 }

server/src/services/homeAssistantService/transport.js

@@ -73,7 +73,10 @@ function createTransport(deps) {
 
   async function connect() {
     if (!enabled) {
-      logger.info('Home Assistant integration disabled; missing url/token in config');
+      // Disabled and misconfigured are intentionally different states. The
+      // explicit switch prevents connection attempts; missing credentials are
+      // surfaced by buildAuth() as a runtime connection failure when enabled.
+      logger.info('Home Assistant disabled by config');
       return;
     }
     if (runtime.connection) return;