ha-mcp-dev 7.6.0.dev619__tar.gz → 7.6.0.dev621__tar.gz

{ha_mcp_dev-7.6.0.dev619/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.6.0.dev621}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev619
+Version: 7.6.0.dev621
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -259,7 +259,7 @@ An MCP server can create automations, helpers, and dashboards, but it has no opi
 
 Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients (claude.ai, etc.), the same skills are reachable through the polymorphic `ha_get_skill_guide` tool — call it with no args to list bundled skills, with a `skill` arg to list its files, or with `skill` + `file` to read content. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
 
-`ha_get_skill_guide` is mandatory-pinned: the catalog always exposes it so tool-only clients never see a silently missing skill surface.
+`ha_get_skill_guide` is a mandatory tool: the catalog always exposes it (it can't be disabled) so tool-only clients never see a silently missing skill surface.
 
 Skills can still be installed manually for clients that prefer local skill files — see the [skills repo](https://github.com/homeassistant-ai/skills) for instructions.
 

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/README.md

@@ -229,7 +229,7 @@ An MCP server can create automations, helpers, and dashboards, but it has no opi
 
 Skills from `homeassistant-ai/skills` are bundled and served as [MCP resources](https://modelcontextprotocol.io/docs/concepts/resources) via `skill://` URIs. Any MCP client that supports resources can discover them automatically — no manual installation needed. For tool-only clients (claude.ai, etc.), the same skills are reachable through the polymorphic `ha_get_skill_guide` tool — call it with no args to list bundled skills, with a `skill` arg to list its files, or with `skill` + `file` to read content. Resources are not auto-injected into context — clients must explicitly request them, so idle context cost is just the metadata listing.
 
-`ha_get_skill_guide` is mandatory-pinned: the catalog always exposes it so tool-only clients never see a silently missing skill surface.
+`ha_get_skill_guide` is a mandatory tool: the catalog always exposes it (it can't be disabled) so tool-only clients never see a silently missing skill surface.
 
 Skills can still be installed manually for clients that prefer local skill files — see the [skills repo](https://github.com/homeassistant-ai/skills) for instructions.
 

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.6.0.dev619"
+version = "7.6.0.dev621"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_config_automations.py

@@ -44,7 +44,6 @@ from .helpers import (
 from .reference_validator import validate_config_references
 from .util_helpers import (
     apply_entity_category,
-    coerce_bool_param,
     coerce_to_list,
     fetch_entity_category,
     merge_validation_meta,
@@ -447,7 +446,7 @@ class AutomationConfigTools:
             ),
         ] = None,
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for automation to be queryable before returning. Default: True. Set to False for bulk operations.",
                 default=True,
@@ -829,7 +828,7 @@ class AutomationConfigTools:
         config_dict: dict[str, Any],
         identifier: str | None,
         effective_category: str | None,
-        wait: bool | str,
+        wait: bool,
         bp_warnings: list[str],
         validation_meta: dict[str, Any],
     ) -> dict[str, Any]:
@@ -846,11 +845,10 @@ class AutomationConfigTools:
             )
             result.pop("entity_not_verified", None)
 
-        wait_bool = coerce_bool_param(wait, "wait", default=True)
         entity_id = result.get("entity_id")
         if not entity_id and identifier and identifier.startswith("automation."):
             entity_id = identifier
-        if wait_bool and entity_id:
+        if wait and entity_id:
             action_word = "created" if identifier is None else "updated"
             try:
                 registered = await wait_for_entity_registered(self._client, entity_id)
@@ -1167,7 +1165,7 @@ class AutomationConfigTools:
             ),
         ],
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for automation to be fully removed before returning. Default: True.",
                 default=True,
@@ -1208,8 +1206,7 @@ class AutomationConfigTools:
             result = await self._client.delete_automation_config(identifier)
 
             # Wait for entity to be removed
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
-            if wait_bool and entity_id_for_wait:
+            if wait and entity_id_for_wait:
                 try:
                     removed = await wait_for_entity_removed(
                         self._client, entity_id_for_wait

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_config_helpers.py

@@ -33,7 +33,6 @@ from .tools_config_entry_flow import (
 )
 from .util_helpers import (
     apply_entity_category,
-    coerce_bool_param,
     parse_json_param,
     parse_string_list_param,
     wait_for_entity_registered,
@@ -1553,7 +1552,7 @@ async def _handle_flow_helper(
     area_id: str | None,
     labels: str | list[str] | None,
     category: str | None,
-    wait: bool | str,
+    wait: bool,
     action: str | None = None,
 ) -> dict[str, Any]:
     """Create or update a flow-based helper and apply registry updates to all entities.
@@ -1737,10 +1736,9 @@ async def _handle_flow_helper(
     # instances quickly; steady 500ms matches typical entity_registry/list latency
     # on larger remote setups without missing entities near the deadline.
     warnings: list[str] = list(pre_warnings)
-    wait_bool = coerce_bool_param(wait, "wait", default=True)
     entities: list[dict[str, Any]] = []
     if entry_id:
-        if action == "create" and wait_bool:
+        if action == "create" and wait:
             deadline = 5.0
             intervals = [0.2, 0.3]  # first two retries faster
             steady_interval = 0.5
@@ -2070,7 +2068,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             ),
         ] = None,
         show_advanced_options: Annotated[
-            bool | str,
+            bool,
             Field(
                 description=(
                     "When helper_type='config_subentry', ask Home Assistant "
@@ -2312,7 +2310,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             ),
         ] = None,
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for helper entity to be queryable before returning. Default: True. Set to False for bulk operations.",
                 default=True,
@@ -2484,11 +2482,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     subentry_type,
                     config_dict,
                     subentry_id=subentry_id,
-                    show_advanced_options=coerce_bool_param(
-                        show_advanced_options,
-                        "show_advanced_options",
-                        default=False,
-                    ),
+                    show_advanced_options=show_advanced_options,
                 )
 
             # Determine if this is a create or update — set early so the
@@ -2975,8 +2969,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     # branch under the update action below already skips the
                     # wait for this reason; mirror it here so create doesn't
                     # burn 10s per tag on every CI run.
-                    wait_bool = coerce_bool_param(wait, "wait", default=True)
-                    if wait_bool and entity_id and helper_type != "tag":
+                    if wait and entity_id and helper_type != "tag":
                         try:
                             registered = await wait_for_entity_registered(
                                 client, entity_id
@@ -3725,8 +3718,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                             warnings.extend(cat_result["warnings"])
 
                 # Wait for entity to reflect the update
-                wait_bool = coerce_bool_param(wait, "wait", default=True)
-                if wait_bool:
+                if wait:
                     try:
                         registered = await wait_for_entity_registered(client, entity_id)
                         if not registered:

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_config_scenes.py

@@ -39,7 +39,6 @@ from .helpers import (
 from .reference_validator import validate_config_references
 from .util_helpers import (
     apply_entity_category,
-    coerce_bool_param,
     fetch_entity_category,
     merge_validation_meta,
     parse_json_param,
@@ -472,7 +471,7 @@ class ConfigSceneTools:
             ),
         ] = None,
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description=(
                     "Wait for scene to be queryable before returning. Default: True. "
@@ -723,9 +722,8 @@ class ConfigSceneTools:
                 # post-upsert finalisation the full-config branch runs. Without
                 # these, ``wait`` and ``category`` are silently dropped on
                 # python_transform calls.
-                wait_bool = coerce_bool_param(wait, "wait", default=True)
                 entity_id = await self._resolve_scene_entity_id(resolved_id)
-                if wait_bool:
+                if wait:
                     try:
                         registered = await wait_for_entity_registered(
                             self._client, entity_id
@@ -841,8 +839,7 @@ class ConfigSceneTools:
             entity_id = await self._resolve_scene_entity_id(resolved_id)
 
             # Wait for scene to be queryable
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
-            if wait_bool:
+            if wait:
                 try:
                     registered = await wait_for_entity_registered(
                         self._client, entity_id
@@ -914,7 +911,7 @@ class ConfigSceneTools:
             str, Field(description="Scene identifier to delete (e.g., 'old_scene')")
         ],
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for scene to be fully removed before returning. Default: True.",
                 default=True,
@@ -970,8 +967,7 @@ class ConfigSceneTools:
 
             result = await self._client.delete_scene_config(resolved_id)
 
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
-            if wait_bool:
+            if wait:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_config_scripts.py

@@ -39,7 +39,6 @@ from .helpers import (
 from .reference_validator import validate_config_references
 from .util_helpers import (
     apply_entity_category,
-    coerce_bool_param,
     fetch_entity_category,
     merge_validation_meta,
     parse_json_param,
@@ -421,7 +420,7 @@ class ConfigScriptTools:
             ),
         ] = None,
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for script to be queryable before returning. Default: True. Set to False for bulk operations.",
                 default=True,
@@ -721,9 +720,8 @@ class ConfigScriptTools:
             result = await self._client.upsert_script_config(config_dict, script_id)
 
             # Wait for script to be queryable
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
             entity_id = f"script.{script_id}"
-            if wait_bool:
+            if wait:
                 try:
                     registered = await wait_for_entity_registered(
                         self._client, entity_id
@@ -806,7 +804,7 @@ class ConfigScriptTools:
             ),
         ],
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for script to be fully removed before returning. Default: True.",
                 default=True,
@@ -850,9 +848,8 @@ class ConfigScriptTools:
             result = await self._client.delete_script_config(script_id)
 
             # Wait for script to be removed
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
             entity_id = f"script.{script_id}"
-            if wait_bool:
+            if wait:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_entities.py

@@ -22,7 +22,7 @@ from .helpers import (
     validate_identifier_not_empty,
 )
 from .tools_voice_assistant import KNOWN_ASSISTANTS
-from .util_helpers import coerce_bool_param, parse_json_param, parse_string_list_param
+from .util_helpers import parse_json_param, parse_string_list_param
 
 logger = logging.getLogger(__name__)
 
@@ -83,8 +83,8 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         area_id: str | None,
         name: str | None,
         icon: str | None,
-        enabled: bool | str | None,
-        hidden: bool | str | None,
+        enabled: bool | None,
+        hidden: bool | None,
         parsed_aliases: list[str] | None,
         parsed_categories: dict[str, str | None] | None,
         parsed_labels: list[str] | None,
@@ -151,30 +151,12 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             )
 
         if enabled is not None:
-            try:
-                enabled_bool = coerce_bool_param(enabled, "enabled")
-            except ValueError as e:
-                raise_tool_error(
-                    create_error_response(
-                        ErrorCode.VALIDATION_INVALID_PARAMETER,
-                        str(e),
-                    )
-                )
-            message["disabled_by"] = None if enabled_bool else "user"
-            updates_made.append("enabled" if enabled_bool else "disabled")
+            message["disabled_by"] = None if enabled else "user"
+            updates_made.append("enabled" if enabled else "disabled")
 
         if hidden is not None:
-            try:
-                hidden_bool = coerce_bool_param(hidden, "hidden")
-            except ValueError as e:
-                raise_tool_error(
-                    create_error_response(
-                        ErrorCode.VALIDATION_INVALID_PARAMETER,
-                        str(e),
-                    )
-                )
-            message["hidden_by"] = "user" if hidden_bool else None
-            updates_made.append("hidden" if hidden_bool else "visible")
+            message["hidden_by"] = "user" if hidden else None
+            updates_made.append("hidden" if hidden else "visible")
 
         if parsed_aliases is not None:
             message["aliases"] = parsed_aliases
@@ -630,7 +612,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             ),
         ] = None,
         enabled: Annotated[
-            bool | str | None,
+            bool | None,
             Field(
                 description=(
                     "True to enable the entity, False to disable it. Single entity only. "
@@ -644,7 +626,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             ),
         ] = None,
         hidden: Annotated[
-            bool | str | None,
+            bool | None,
             Field(
                 description="True to hide the entity from UI, False to show it. Single entity only.",
                 default=None,
@@ -872,12 +854,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             # script.turn_off) which simply prevent them from running while
             # keeping them visible and manageable.
             if enabled is not None:
-                try:
-                    _enabled_check = coerce_bool_param(enabled, "enabled")
-                except ValueError:
-                    _enabled_check = None  # will be caught by _update_single_entity
-
-                if _enabled_check is False:
+                if enabled is False:
                     blocked = [
                         eid
                         for eid in entity_ids
@@ -1030,25 +1007,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         )
                     )
 
-                # Coerce values to bool
-                for asst, val in parsed_expose_to.items():
-                    try:
-                        coerced = coerce_bool_param(val, f"expose_to[{asst}]")
-                    except ValueError as e:
-                        raise_tool_error(
-                            create_error_response(
-                                ErrorCode.VALIDATION_INVALID_PARAMETER,
-                                str(e),
-                            )
-                        )
-                    if coerced is None:
-                        raise_tool_error(
-                            create_error_response(
-                                ErrorCode.VALIDATION_INVALID_PARAMETER,
-                                f"expose_to[{asst}] must be a boolean value",
-                            )
-                        )
-                    parsed_expose_to[asst] = coerced
+                # Values are already bool (enforced by the dict[str, bool] annotation)
 
             # Single entity case - use existing logic
             if not is_bulk:

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_filesystem.py

@@ -30,7 +30,7 @@ from .helpers import (
     raise_tool_error,
     register_tool_methods,
 )
-from .util_helpers import coerce_bool_param, coerce_int_param, unwrap_service_response
+from .util_helpers import unwrap_service_response
 
 logger = logging.getLogger(__name__)
 
@@ -453,9 +453,11 @@ class FilesystemTools:
             ),
         ],
         tail_lines: Annotated[
-            int | str | None,
+            int | None,
             Field(
                 default=None,
+                ge=1,
+                le=10000,
                 description=(
                     "For log files, return only the last N lines. "
                     "Recommended for home-assistant.log to avoid large responses. "
@@ -501,22 +503,13 @@ class FilesystemTools:
         ```
         """
         try:
-            # Coerce tail_lines parameter
-            tail_lines_int = coerce_int_param(
-                tail_lines,
-                "tail_lines",
-                default=None,
-                min_value=1,
-                max_value=10000,
-            )
-
             # Check if custom component is available
             await _assert_mcp_tools_available(self._client)
 
             # Build service data
             service_data: dict[str, Any] = {"path": path}
-            if tail_lines_int is not None:
-                service_data["tail_lines"] = tail_lines_int
+            if tail_lines is not None:
+                service_data["tail_lines"] = tail_lines
 
             # Call the custom component service
             result = await call_mcp_tools_service(
@@ -575,7 +568,7 @@ class FilesystemTools:
             ),
         ],
         overwrite: Annotated[
-            bool | str,
+            bool,
             Field(
                 default=False,
                 description=(
@@ -585,7 +578,7 @@ class FilesystemTools:
             ),
         ] = False,
         create_dirs: Annotated[
-            bool | str,
+            bool,
             Field(
                 default=True,
                 description=(
@@ -637,12 +630,6 @@ class FilesystemTools:
         ```
         """
         try:
-            # Coerce boolean parameters
-            overwrite_bool = coerce_bool_param(overwrite, "overwrite", default=False)
-            create_dirs_bool = coerce_bool_param(
-                create_dirs, "create_dirs", default=True
-            )
-
             # Check if custom component is available
             await _assert_mcp_tools_available(self._client)
 
@@ -650,8 +637,8 @@ class FilesystemTools:
             service_data: dict[str, Any] = {
                 "path": path,
                 "content": content,
-                "overwrite": overwrite_bool,
-                "create_dirs": create_dirs_bool,
+                "overwrite": overwrite,
+                "create_dirs": create_dirs,
             }
 
             # Call the custom component service
@@ -705,7 +692,7 @@ class FilesystemTools:
             ),
         ],
         confirm: Annotated[
-            bool | str,
+            bool,
             Field(
                 default=False,
                 description=(
@@ -747,10 +734,7 @@ class FilesystemTools:
         ```
         """
         try:
-            # Coerce boolean parameter
-            confirm_bool = coerce_bool_param(confirm, "confirm", default=False)
-
-            if not confirm_bool:
+            if not confirm:
                 raise_tool_error(
                     create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_groups.py

@@ -26,7 +26,6 @@ from .helpers import (
     validate_identifier_not_empty,
 )
 from .util_helpers import (
-    coerce_bool_param,
     wait_for_entity_registered,
     wait_for_entity_removed,
 )
@@ -264,7 +263,7 @@ class GroupTools:
             ),
         ] = None,
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for group to be queryable before returning. Default: True. Set to False for bulk operations.",
                 default=True,
@@ -340,10 +339,8 @@ class GroupTools:
                 and remove_entities is None
             )
 
-            # Verify entity is queryable after creation/update
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
             result: dict[str, Any] = {}
-            if wait_bool:
+            if wait:
                 action_word = "created" if is_create else "updated"
                 try:
                     registered = await wait_for_entity_registered(
@@ -403,7 +400,7 @@ class GroupTools:
             ),
         ],
         wait: Annotated[
-            bool | str,
+            bool,
             Field(
                 description="Wait for group to be fully removed before returning. Default: True.",
                 default=True,
@@ -462,10 +459,8 @@ class GroupTools:
 
             entity_id = f"group.{object_id}"
 
-            # Verify entity is removed
-            wait_bool = coerce_bool_param(wait, "wait", default=True)
             result: dict[str, Any] = {}
-            if wait_bool:
+            if wait:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:

{ha_mcp_dev-7.6.0.dev619 → ha_mcp_dev-7.6.0.dev621}/src/ha_mcp/tools/tools_hacs.py

@@ -26,7 +26,7 @@ from .helpers import (
     safe_progress,
     validate_identifier_not_empty,
 )
-from .util_helpers import add_timezone_metadata, coerce_bool_param, coerce_int_param
+from .util_helpers import add_timezone_metadata
 
 logger = logging.getLogger(__name__)
 
@@ -122,23 +122,26 @@ class HacsTools:
             ),
         ] = None,
         installed_only: Annotated[
-            bool | str,
+            bool,
             Field(
                 default=False,
                 description="Only return installed repositories (default: False)",
             ),
         ] = False,
         max_results: Annotated[
-            int | str,
+            int,
             Field(
                 default=10,
+                ge=1,
+                le=100,
                 description="Maximum number of results to return (default: 10, max: 100)",
             ),
         ] = 10,
         offset: Annotated[
-            int | str,
+            int,
             Field(
                 default=0,
+                ge=0,
                 description="Number of results to skip for pagination (default: 0)",
             ),
         ] = 0,
@@ -169,28 +172,10 @@ class HacsTools:
             offset: Number of results to skip for pagination (default: 0)
         """
         try:
-            # Coerce parameters
-            installed_only_bool = coerce_bool_param(
-                installed_only, "installed_only", default=False
-            )
-            max_results_int = coerce_int_param(
-                max_results,
-                "max_results",
-                default=10,
-                min_value=1,
-                max_value=100,
-            )
-            offset_int = coerce_int_param(
-                offset,
-                "offset",
-                default=0,
-                min_value=0,
-            )
-
             await safe_info(
                 ctx,
                 f"ha_hacs_search starting: query={query!r} "
-                f"category={category} installed_only={installed_only_bool}",
+                f"category={category} installed_only={installed_only}",
             )
             await safe_progress(
                 ctx,
@@ -242,9 +227,7 @@ class HacsTools:
                 total=3,
                 message=f"filtering {len(all_repositories)} repositories",
             )
-            matches = _filter_and_score_repos(
-                all_repositories, query, installed_only_bool
-            )
+            matches = _filter_and_score_repos(all_repositories, query, installed_only)
             await safe_progress(
                 ctx,
                 progress=3,
@@ -252,8 +235,8 @@ class HacsTools:
                 message=f"matched {len(matches)} repositories",
             )
 
-            limited_matches = matches[offset_int : offset_int + max_results_int]
-            has_more = (offset_int + len(limited_matches)) < len(matches)
+            limited_matches = matches[offset : offset + max_results]
+            has_more = (offset + len(limited_matches)) < len(matches)
 
             return await add_timezone_metadata(
                 self._client,
@@ -261,13 +244,13 @@ class HacsTools:
                     "success": True,
                     "query": query if query.strip() else None,
                     "category_filter": category,
-                    "installed_only": installed_only_bool,
+                    "installed_only": installed_only,
                     "total_matches": len(matches),
-                    "offset": offset_int,
-                    "limit": max_results_int,
+                    "offset": offset,
+                    "limit": max_results,
                     "count": len(limited_matches),
                     "has_more": has_more,
-                    "next_offset": offset_int + max_results_int if has_more else None,
+                    "next_offset": offset + max_results if has_more else None,
                     "results": limited_matches,
                 },
             )