@orellbuehler/homeassistant-mcp 0.5.0 → 0.5.1

package/dist/server.js

@@ -10,7 +10,7 @@ import { registerEnergyTools } from "./tools/energy.js";
 import { registerTraceTools } from "./tools/trace.js";
 import { registerZhaTools } from "./tools/zha.js";
 export function createServer(client, wsClient) {
-    const server = new McpServer({ name: "homeassistant-mcp", version: "0.5.0" });
+    const server = new McpServer({ name: "homeassistant-mcp", version: "0.5.1" });
     registerEntityTools(server, client);
     registerServiceTools(server, client);
     registerSystemTools(server, client);

package/dist/tools/zha.js

@@ -1,5 +1,19 @@
 import { z } from "zod";
 import { ok, err } from "../hass/format.js";
+// An entity_id can be listed either on the groupable endpoint itself or, on some
+// HA versions where the endpoint list comes back empty/null, only under the
+// device. Check both.
+function endpointHasEntity(ep, entityId) {
+    const onEndpoint = ep.entities?.some((e) => e?.entity_id === entityId);
+    const onDevice = ep.device?.entities?.some((e) => e?.entity_id === entityId);
+    return Boolean(onEndpoint || onDevice);
+}
+function endpointEntityIds(ep) {
+    const refs = [...(ep.entities ?? []), ...(ep.device?.entities ?? [])];
+    return [
+        ...new Set(refs.filter((e) => !!e?.entity_id).map((e) => e.entity_id)),
+    ];
+}
 const memberSchema = z.union([
     z.string(),
     z.object({
@@ -16,7 +30,7 @@ async function resolveMembers(ws, members) {
     return members.map((m) => {
         if (typeof m !== "string")
             return { ieee: m.ieee, endpoint_id: m.endpoint_id };
-        const hit = groupable.find((ep) => ep.entities?.some((e) => e.entity_id === m));
+        const hit = groupable.find((ep) => endpointHasEntity(ep, m));
         if (!hit) {
             throw new Error(`'${m}' is not a groupable ZHA entity. A ZHA group member must be a ZHA entity on an endpoint that supports the Zigbee Groups cluster (see list_zha_groupable). Non-ZHA entities (Wi-Fi/Shelly/Hue-bridge/etc.) cannot join a ZHA group.`);
         }
@@ -39,7 +53,7 @@ export function registerZhaTools(server, ws) {
                 ieee: ep.device?.ieee ?? null,
                 endpoint_id: ep.endpoint_id,
                 device_name: ep.device?.user_given_name ?? ep.device?.name ?? null,
-                entities: (ep.entities ?? []).map((e) => e.entity_id),
+                entities: endpointEntityIds(ep),
             }));
             return ok({ count: endpoints.length, endpoints });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orellbuehler/homeassistant-mcp",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Model Context Protocol server for Home Assistant: introspect entities, services, events, registries, render templates and validate configuration to help AI agents author HA configs and automations.",
   "type": "module",
   "bin": {