@coffeerunhobby/mcp-ha-connect 1.7.6 → 2.0.0

package/src/tools/common.ts

@@ -3,8 +3,7 @@
  * Shared helpers for all MCP tools
  */
 
-import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import type { CallToolResult, ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
+import type { CallToolResult, ServerContext } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { logger } from '../utils/logger.js';
 import { Permission, hasPermission, getPermissionNames } from '../permissions/index.js';
@@ -34,7 +33,7 @@ export function setLocalFullTrust(enabled: boolean): void {
  * Extra context passed to tool handlers
  * Permissions are extracted from authInfo.extra.permissions (MCP SDK standard)
  */
-export type ToolExtra = RequestHandlerExtra<ServerRequest, ServerNotification>;
+export type ToolExtra = ServerContext;
 
 /**
  * Resolve the caller's permission mask from the MCP SDK auth context.
@@ -48,7 +47,7 @@ export type ToolExtra = RequestHandlerExtra<ServerRequest, ServerNotification>;
  * semantics as `wrapToolHandler`, instead of re-reading `authInfo` ad hoc.
  */
 export function getCallerPermissions(extra: ToolExtra): number {
-  return (extra.authInfo?.extra?.permissions as number | undefined) ?? (localFullTrust ? 0xFF : 0);
+  return (extra.http?.authInfo?.extra?.permissions as number | undefined) ?? (localFullTrust ? 0xFF : 0);
 }
 
 /**
@@ -231,7 +230,7 @@ export const automationIdSchema = z.object({
 export const serviceCallSchema = z.object({
   domain: z.string().describe('Service domain (e.g., "light", "switch", "climate", "notify")'),
   service: z.string().describe('Service name (e.g., "turn_on", "turn_off", "set_temperature")'),
-  service_data: z.record(z.unknown()).optional().describe('Optional service data'),
+  service_data: z.record(z.string(), z.unknown()).optional().describe('Optional service data'),
   target: z.object({
     entity_id: z.union([z.string(), z.array(z.string())]).optional(),
     device_id: z.union([z.string(), z.array(z.string())]).optional(),
@@ -241,13 +240,13 @@ export const serviceCallSchema = z.object({
 
 // Analyze sensors schema
 export const analyzeSensorsSchema = z.object({
-  sensors: z.record(z.unknown()).describe('Sensor data to analyze. Object with entity_id keys and {state, unit, attributes} values.'),
+  sensors: z.record(z.string(), z.unknown()).describe('Sensor data to analyze. Object with entity_id keys and {state, unit, attributes} values.'),
 });
 
 // Trigger automation schema
 export const triggerAutomationSchema = z.object({
   entity_id: z.string().describe('The automation entity ID (e.g., "automation.turn_on_lights")'),
-  variables: z.record(z.unknown()).optional().describe('Optional variables to pass to the automation'),
+  variables: z.record(z.string(), z.unknown()).optional().describe('Optional variables to pass to the automation'),
 });
 
 // Create automation schema
@@ -307,7 +306,7 @@ export const controlFanSchema = z.object({
 // Run script schema
 export const runScriptSchema = z.object({
   entity_id: z.string().describe('The script entity ID (e.g., "script.morning_routine")'),
-  variables: z.record(z.unknown()).optional().describe('Optional variables to pass to the script'),
+  variables: z.record(z.string(), z.unknown()).optional().describe('Optional variables to pass to the script'),
 });
 
 // Notification action schema for actionable notifications
@@ -347,7 +346,7 @@ export const sendNotificationSchema = z.object({
   badge: z.number().optional().describe('App badge count (iOS)'),
   interruptionLevel: z.enum(['passive', 'active', 'time-sensitive', 'critical']).optional().describe('iOS interruption level'),
   // Raw data passthrough for advanced use
-  data: z.record(z.unknown()).optional().describe('Additional raw data to pass to notification service'),
+  data: z.record(z.string(), z.unknown()).optional().describe('Additional raw data to pass to notification service'),
 });
 
 // List notification targets schema (empty - no params needed)

package/src/tools/homeassistant/automationControls.ts

@@ -2,7 +2,7 @@
  * Automation control tools - Enable, disable, toggle, reload automations
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { entityIdSchema, emptySchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -14,7 +14,7 @@ export function registerEnableAutomationTool(server: McpServer, client: HaClient
     'enableAutomation',
     {
       description: 'Enable a disabled Home Assistant automation.',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('enableAutomation', async ({ entity_id }: EntityIdArgs) => {
       const result = await client.enableAutomation(entity_id);
@@ -28,7 +28,7 @@ export function registerDisableAutomationTool(server: McpServer, client: HaClien
     'disableAutomation',
     {
       description: 'Disable a Home Assistant automation.',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('disableAutomation', async ({ entity_id }: EntityIdArgs) => {
       const result = await client.disableAutomation(entity_id);
@@ -42,7 +42,7 @@ export function registerToggleAutomationTool(server: McpServer, client: HaClient
     'toggleAutomation',
     {
       description: 'Toggle a Home Assistant automation (enable if disabled, disable if enabled).',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('toggleAutomation', async ({ entity_id }: EntityIdArgs) => {
       const result = await client.toggleAutomation(entity_id);
@@ -56,7 +56,7 @@ export function registerReloadAutomationsTool(server: McpServer, client: HaClien
     'reloadAutomations',
     {
       description: 'Reload all automations from the Home Assistant configuration. Useful after editing automation YAML files.',
-      inputSchema: emptySchema.shape,
+      inputSchema: emptySchema,
     },
     wrapToolHandler('reloadAutomations', async () => {
       await client.reloadAutomations();

package/src/tools/homeassistant/calendar.ts

@@ -2,7 +2,7 @@
  * Calendar tools - List calendars and get calendar events
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { listCalendarsSchema, getCalendarEventsSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -14,7 +14,7 @@ export function registerListCalendarsTool(server: McpServer, client: HaClient):
     'listCalendars',
     {
       description: 'List all calendar entities in Home Assistant. Returns calendar names and their current state.',
-      inputSchema: listCalendarsSchema.shape,
+      inputSchema: listCalendarsSchema,
     },
     wrapToolHandler('listCalendars', async () => {
       const calendars = await client.getCalendars();
@@ -38,7 +38,7 @@ Examples:
 - Next 7 days: { days: 7 }
 - Date range: { start_date: "2026-01-01", end_date: "2026-01-31" }
 - Specific calendar + date range: { entity_id: "calendar.work", start_date: "2026-02-01", days: 14 }`,
-      inputSchema: getCalendarEventsSchema.shape,
+      inputSchema: getCalendarEventsSchema,
     },
     wrapToolHandler('getCalendarEvents', async (args: GetCalendarEventsArgs) => {
       // Parse dates

package/src/tools/homeassistant/callService.ts

@@ -2,7 +2,7 @@
  * callService tool - Call a Home Assistant service
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import type { ServiceCallData } from '../../types/index.js';
 import { serviceCallSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
@@ -12,7 +12,7 @@ export function registerCallServiceTool(server: McpServer, client: HaClient): vo
     'callService',
     {
       description: 'Call a Home Assistant service (e.g., turn on a light, set temperature).',
-      inputSchema: serviceCallSchema.shape,
+      inputSchema: serviceCallSchema,
     },
     wrapToolHandler('callService', async (args: ServiceCallData) => {
       if (!args.domain || !args.service) {

package/src/tools/homeassistant/controlClimate.ts

@@ -2,7 +2,7 @@
  * controlClimate tool - Control climate/thermostat devices
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { controlClimateSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerControlClimateTool(server: McpServer, client: HaClient):
     'controlClimate',
     {
       description: 'Control a climate/thermostat device with temperature and mode settings.',
-      inputSchema: controlClimateSchema.shape,
+      inputSchema: controlClimateSchema,
     },
     wrapToolHandler('controlClimate', async (args: ControlClimateArgs) => {
       const missing = await entityNotFoundResult(client, args.entity_id);

package/src/tools/homeassistant/controlCover.ts

@@ -2,7 +2,7 @@
  * controlCover tool - Control covers/blinds
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { controlCoverSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerControlCoverTool(server: McpServer, client: HaClient): v
     'controlCover',
     {
       description: 'Control a cover/blind with position and tilt settings.',
-      inputSchema: controlCoverSchema.shape,
+      inputSchema: controlCoverSchema,
     },
     wrapToolHandler('controlCover', async (args: ControlCoverArgs) => {
       const missing = await entityNotFoundResult(client, args.entity_id);

package/src/tools/homeassistant/controlFan.ts

@@ -2,7 +2,7 @@
  * controlFan tool - Control fans
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { controlFanSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerControlFanTool(server: McpServer, client: HaClient): voi
     'controlFan',
     {
       description: 'Control a fan with speed, oscillation, and direction settings.',
-      inputSchema: controlFanSchema.shape,
+      inputSchema: controlFanSchema,
     },
     wrapToolHandler('controlFan', async (args: ControlFanArgs) => {
       const missing = await entityNotFoundResult(client, args.entity_id);

package/src/tools/homeassistant/controlLight.ts

@@ -2,7 +2,7 @@
  * controlLight tool - Control lights with advanced options
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { controlLightSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerControlLightTool(server: McpServer, client: HaClient): v
     'controlLight',
     {
       description: 'Control a light with advanced options like brightness, color, and color temperature.',
-      inputSchema: controlLightSchema.shape,
+      inputSchema: controlLightSchema,
     },
     wrapToolHandler('controlLight', async (args: ControlLightArgs) => {
       const missing = await entityNotFoundResult(client, args.entity_id);

package/src/tools/homeassistant/controlMediaPlayer.ts

@@ -2,7 +2,7 @@
  * controlMediaPlayer tool - Control media players
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { controlMediaPlayerSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerControlMediaPlayerTool(server: McpServer, client: HaClie
     'controlMediaPlayer',
     {
       description: 'Control a media player with playback, volume, and media selection.',
-      inputSchema: controlMediaPlayerSchema.shape,
+      inputSchema: controlMediaPlayerSchema,
     },
     wrapToolHandler('controlMediaPlayer', async (args: ControlMediaPlayerArgs) => {
       const missing = await entityNotFoundResult(client, args.entity_id);

package/src/tools/homeassistant/createAutomation.ts

@@ -2,7 +2,7 @@
  * createAutomation tool - Create a new automation
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import type { AutomationTrigger, AutomationCondition, AutomationAction } from '../../types/index.js';
 import { createAutomationSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
@@ -15,7 +15,7 @@ export function registerCreateAutomationTool(server: McpServer, client: HaClient
     'createAutomation',
     {
       description: 'Create a new Home Assistant automation. Requires specifying triggers, conditions (optional), and actions.',
-      inputSchema: createAutomationSchema.shape,
+      inputSchema: createAutomationSchema,
     },
     wrapToolHandler('createAutomation', async (args: CreateAutomationArgs) => {
       if (!args.alias || !args.trigger || !args.action) {

package/src/tools/homeassistant/deleteAutomation.ts

@@ -2,7 +2,7 @@
  * deleteAutomation tool - Delete an automation
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { automationIdSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -14,7 +14,7 @@ export function registerDeleteAutomationTool(server: McpServer, client: HaClient
     'deleteAutomation',
     {
       description: 'Delete a Home Assistant automation. Only works for automations created via the UI/API.',
-      inputSchema: automationIdSchema.shape,
+      inputSchema: automationIdSchema,
     },
     wrapToolHandler('deleteAutomation', async ({ automation_id }: DeleteAutomationArgs) => {
       await client.deleteAutomation(automation_id);

package/src/tools/homeassistant/entityAction.ts

@@ -2,7 +2,7 @@
  * entityAction tool - Simple entity actions (turn_on, turn_off, toggle)
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { entityActionSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -15,7 +15,7 @@ export function registerEntityActionTool(server: McpServer, client: HaClient): v
     'entityAction',
     {
       description: 'Perform a simple action on an entity (turn_on, turn_off, toggle). Automatically detects the domain.',
-      inputSchema: entityActionSchema.shape,
+      inputSchema: entityActionSchema,
     },
     wrapToolHandler('entityAction', async ({ entity_id, action }: EntityActionArgs) => {
       const domain = entity_id.split('.')[0];

package/src/tools/homeassistant/entityGuard.ts

@@ -7,7 +7,7 @@
  * LLM client would believe a typo'd light was switched on.
  */
 
-import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { CallToolResult } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toToolResult } from '../common.js';
 

package/src/tools/homeassistant/getAllSensors.ts

@@ -3,7 +3,7 @@
  * Returns paginated, lightweight entities by default to reduce response size.
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toLightweight } from '../../types/index.js';
 import { haPaginationSchema, toToolResult, wrapToolHandler, Permission, paginateArray } from '../common.js';
@@ -13,7 +13,7 @@ export function registerGetAllSensorsTool(server: McpServer, client: HaClient):
     'getAllSensors',
     {
       description: 'Get all sensor states from Home Assistant (sensor.* and binary_sensor.* entities). Returns paginated lightweight entities by default (50 per page). Use includeAttributes=true for full entity data.',
-      inputSchema: haPaginationSchema.shape,
+      inputSchema: haPaginationSchema,
     },
     wrapToolHandler('getAllSensors', async (args) => {
       const { page, pageSize, includeAttributes } = args;

package/src/tools/homeassistant/getAutomationTrace.ts

@@ -2,7 +2,7 @@
  * getAutomationTrace tool - Get automation execution history
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { entityIdSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -14,7 +14,7 @@ export function registerGetAutomationTraceTool(server: McpServer, client: HaClie
     'getAutomationTrace',
     {
       description: 'Get the execution trace (history) of an automation. Shows when it was triggered and what actions were executed.',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('getAutomationTrace', async ({ entity_id }: EntityIdArgs) => {
       const trace = await client.getAutomationTrace(entity_id);

package/src/tools/homeassistant/getDomainSummary.ts

@@ -2,7 +2,7 @@
  * getDomainSummary tool - Get summary of entities in a domain
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { domainSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 
@@ -22,7 +22,7 @@ export function registerGetDomainSummaryTool(server: McpServer, client: HaClient
     'getDomainSummary',
     {
       description: 'Get a summary of entities in a domain, including counts and state breakdown.',
-      inputSchema: domainSchema.shape,
+      inputSchema: domainSchema,
     },
     createGetDomainSummaryHandler(client)
   );

package/src/tools/homeassistant/getEntitiesByDomain.ts

@@ -4,7 +4,7 @@
  */
 
 import { z } from 'zod';
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toLightweight } from '../../types/index.js';
 import { toToolResult, wrapToolHandler, Permission, paginateArray } from '../common.js';
@@ -21,7 +21,7 @@ export function registerGetEntitiesByDomainTool(server: McpServer, client: HaCli
     'getEntitiesByDomain',
     {
       description: 'Get all entities for a specific domain (e.g., all lights, all sensors). Returns paginated lightweight entities by default (50 per page). Use includeAttributes=true for full entity data.',
-      inputSchema: getEntitiesByDomainSchema.shape,
+      inputSchema: getEntitiesByDomainSchema,
     },
     wrapToolHandler('getEntitiesByDomain', async (args) => {
       const { domain, page, pageSize, includeAttributes } = args;

package/src/tools/homeassistant/getHistory.ts

@@ -2,7 +2,7 @@
  * getHistory tool - Get historical data for an entity
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { historySchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -14,7 +14,7 @@ export function registerGetHistoryTool(server: McpServer, client: HaClient): voi
     'getHistory',
     {
       description: 'Get historical data for an entity.',
-      inputSchema: historySchema.shape,
+      inputSchema: historySchema,
     },
     wrapToolHandler('getHistory', async ({ entity_id, hours = 24 }: HistoryArgs) => {
       const history = await client.getHistory(entity_id, hours);

package/src/tools/homeassistant/getState.ts

@@ -2,7 +2,7 @@
  * getState tool - Get state of a specific entity
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { entityIdSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 
@@ -11,7 +11,7 @@ export function registerGetStateTool(server: McpServer, client: HaClient): void
     'getState',
     {
       description: 'Get the state of a specific entity by entity_id.',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('getState', async ({ entity_id }: { entity_id: string }) => {
       const state = await client.getState(entity_id);

package/src/tools/homeassistant/getStates.ts

@@ -3,7 +3,7 @@
  * Returns paginated, lightweight entities by default to reduce response size.
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toLightweight } from '../../types/index.js';
 import { haPaginationSchema, toToolResult, wrapToolHandler, Permission, paginateArray } from '../common.js';
@@ -13,7 +13,7 @@ export function registerGetStatesTool(server: McpServer, client: HaClient): void
     'getStates',
     {
       description: 'Get all entity states from Home Assistant. Returns paginated lightweight entities by default (50 per page). Use includeAttributes=true for full entity data.',
-      inputSchema: haPaginationSchema.shape,
+      inputSchema: haPaginationSchema,
     },
     wrapToolHandler('getStates', async (args) => {
       const { page, pageSize, includeAttributes } = args;

package/src/tools/homeassistant/getVersion.ts

@@ -2,7 +2,7 @@
  * getVersion tool - Get Home Assistant version info
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { emptySchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 
@@ -11,7 +11,7 @@ export function registerGetVersionTool(server: McpServer, client: HaClient): voi
     'getVersion',
     {
       description: 'Get Home Assistant version and configuration information.',
-      inputSchema: emptySchema.shape,
+      inputSchema: emptySchema,
     },
     wrapToolHandler('getVersion', async () => {
       const version = await client.getVersion();

package/src/tools/homeassistant/index.ts

@@ -2,7 +2,7 @@
  * Home Assistant tools index - registers all HA MCP tools
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { logger } from '../../utils/logger.js';
 

package/src/tools/homeassistant/listAutomations.ts

@@ -2,7 +2,7 @@
  * listAutomations tool - List all automations
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { automationFilterSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -28,7 +28,7 @@ export function registerListAutomationsTool(server: McpServer, client: HaClient)
     'listAutomations',
     {
       description: 'List all Home Assistant automations with their status and last triggered time.',
-      inputSchema: automationFilterSchema.shape,
+      inputSchema: automationFilterSchema,
     },
     createListAutomationsHandler(client)
   );

package/src/tools/homeassistant/listEntities.ts

@@ -4,7 +4,7 @@
  */
 
 import { z } from 'zod';
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toLightweight } from '../../types/index.js';
 import { toToolResult, wrapToolHandler, Permission } from '../common.js';
@@ -24,7 +24,7 @@ export function registerListEntitiesTool(server: McpServer, client: HaClient): v
     'listEntities',
     {
       description: 'List entities with optional filtering by domain, state, or search query. Returns lightweight entities by default (limit 50). Use includeAttributes=true for full entity data.',
-      inputSchema: listEntitiesSchema.shape,
+      inputSchema: listEntitiesSchema,
     },
     wrapToolHandler('listEntities', async (args: ListEntitiesArgs) => {
       const { includeAttributes, ...filterArgs } = args;

package/src/tools/homeassistant/listPersons.ts

@@ -2,7 +2,7 @@
  * listPersons tool - List all person entities (household members)
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { emptySchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 
@@ -20,7 +20,7 @@ Use this tool when the user asks:
 - "List family members"
 - "Is anyone home?"
 - "Where is Dad/Mom/etc?"`,
-      inputSchema: emptySchema.shape,
+      inputSchema: emptySchema,
     },
     wrapToolHandler('listPersons', async () => {
       const entities = await client.getEntitiesByDomain('person');

package/src/tools/homeassistant/sceneAndScript.ts

@@ -2,7 +2,7 @@
  * Scene and Script tools - Activate scenes and run scripts
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { entityIdSchema, runScriptSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import { entityNotFoundResult } from './entityGuard.js';
@@ -16,7 +16,7 @@ export function registerActivateSceneTool(server: McpServer, client: HaClient):
     'activateScene',
     {
       description: 'Activate a Home Assistant scene.',
-      inputSchema: entityIdSchema.shape,
+      inputSchema: entityIdSchema,
     },
     wrapToolHandler('activateScene', async ({ entity_id }: EntityIdArgs) => {
       const missing = await entityNotFoundResult(client, entity_id);
@@ -36,7 +36,7 @@ export function registerRunScriptTool(server: McpServer, client: HaClient): void
     'runScript',
     {
       description: 'Run a Home Assistant script with optional variables.',
-      inputSchema: runScriptSchema.shape,
+      inputSchema: runScriptSchema,
     },
     wrapToolHandler('runScript', async ({ entity_id, variables }: RunScriptArgs) => {
       const missing = await entityNotFoundResult(client, entity_id);

package/src/tools/homeassistant/searchEntities.ts

@@ -4,7 +4,7 @@
  */
 
 import { z } from 'zod';
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { toLightweight } from '../../types/index.js';
 import { toToolResult, wrapToolHandler, Permission, paginateArray } from '../common.js';
@@ -23,7 +23,7 @@ export function registerSearchEntitiesTool(server: McpServer, client: HaClient):
       description: `Search for entities by name or entity_id. Returns paginated lightweight entities by default (50 per page). Use includeAttributes=true for full entity data.
 
 Note: For queries about people, family members, or "who's home?", use the listPersons tool instead.`,
-      inputSchema: searchEntitiesSchema.shape,
+      inputSchema: searchEntitiesSchema,
     },
     wrapToolHandler('searchEntities', async (args) => {
       const { query, page, pageSize, includeAttributes } = args;

package/src/tools/homeassistant/sendNotification.ts

@@ -3,7 +3,7 @@
  * Supports HA Mobile App notifications with actions, images, sounds, and more
  */
 
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { HaClient } from '../../haClient/index.js';
 import { sendNotificationSchema, listNotificationTargetsSchema, toToolResult, wrapToolHandler, Permission } from '../common.js';
 import type { z } from 'zod';
@@ -83,7 +83,7 @@ Examples:
 - Simple: { message: "Hello!", target: "mobile_app_phone" }
 - With actions: { message: "Doorbell", target: "mobile_app_phone", actions: [{ action: "OPEN", title: "Open Door" }] }
 - With image: { message: "Camera alert", target: "mobile_app_phone", image: "/api/camera_proxy/camera.front" }`,
-      inputSchema: sendNotificationSchema.shape,
+      inputSchema: sendNotificationSchema,
     },
     wrapToolHandler('sendNotification', async (args: SendNotificationArgs) => {
       const serviceData: Record<string, unknown> = { message: args.message };
@@ -121,7 +121,7 @@ export function registerListNotificationTargetsTool(server: McpServer, client: H
     'listNotificationTargets',
     {
       description: 'List available notification targets (mobile apps and other notify services). Use this to discover which devices can receive notifications.',
-      inputSchema: listNotificationTargetsSchema.shape,
+      inputSchema: listNotificationTargetsSchema,
     },
     wrapToolHandler('listNotificationTargets', async () => {
       // Get all entities and find mobile_app device trackers to infer notify services