Merge remote-tracking branch 'upstream/master' into feat/issue-863-stdio-settings

# Conflicts:
#	src/ha_mcp/tools/tools_search.py
#	tests/src/unit/test_overview_system_info.py

Author: kingpanther13

.github/workflows/pr.yml

@@ -44,6 +44,9 @@ jobs:
     timeout-minutes: 5
 
     steps:
+    - name: Install git for changed-files diff
+      run: apt-get update -qq && apt-get install -y -qq git >/dev/null 2>&1
+
     - uses: actions/checkout@v6
 
     - name: Install dependencies
@@ -52,6 +55,33 @@ jobs:
     - name: Run ruff check
       run: uv run ruff check src/ tests/ homeassistant-addon/ homeassistant-addon-webhook-proxy/ scripts/
 
+    - name: Run ruff format check on changed Python files
+      run: |
+        # actions/checkout@v6 sets safe.directory in a temp HOME that this
+        # step doesn't inherit; re-add it here so git operations succeed
+        # when the checkout dir is owned by a different UID than the
+        # container's root.
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+        # Changed-files-only gate per the maintainer call on issue #1318:
+        # new edits must be formatted; pre-existing format-debt on
+        # untouched files stays grandfathered. Avoids the disruption of a
+        # repo-wide sweep while still preventing fresh debt from landing.
+        if [ -z "${GITHUB_BASE_REF}" ]; then
+          echo "No PR base ref (workflow_dispatch); skipping format check."
+          exit 0
+        fi
+        git fetch --depth=1 origin "${GITHUB_BASE_REF}"
+        base_sha=$(git rev-parse "origin/${GITHUB_BASE_REF}")
+        changed_py=$(git diff --name-only --diff-filter=ACMR "${base_sha}" -- '*.py')
+        if [ -z "$changed_py" ]; then
+          echo "No Python files changed; skipping ruff format check."
+          exit 0
+        fi
+        count=$(echo "$changed_py" | wc -l)
+        echo "Checking ruff format on $count changed Python files:"
+        echo "$changed_py" | sed 's/^/  /'
+        echo "$changed_py" | xargs uv run ruff format --check
+
   ast-grep:
     name: AST Lint
     runs-on: ubuntu-latest

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "src/ha_mcp/resources/skills-vendor"]
 	path = src/ha_mcp/resources/skills-vendor
 	url = https://github.com/homeassistant-ai/skills.git
+	branch = main

CONTRIBUTING.md

@@ -32,7 +32,7 @@ uv run mypy src/                   # Type check
 uv run ast-grep scan               # AST lint (error handling patterns)
 ```
 
-On every commit, hooks run `ruff check --fix` (lint), `ast-grep scan` (AST lint), `mypy` (type check), and unit tests in parallel via [lefthook](https://github.com/evilmartians/lefthook). The **Ruff Lint** and **AST Lint** CI jobs also enforce this on pull requests.
+On every commit, hooks run `ruff check --fix` (lint), `ast-grep scan` (AST lint), `mypy` (type check), and unit tests in parallel via [lefthook](https://github.com/evilmartians/lefthook). The **Ruff Lint** and **AST Lint** CI jobs also enforce these on pull requests; **Ruff Lint** additionally runs `ruff format --check` on changed Python files.
 
 ## 🔄 Migrating from pre-commit to lefthook
 

README.md

@@ -8,7 +8,7 @@
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-88-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-89-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -151,12 +151,13 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (88 tools)</b></summary>
+<summary><b>Complete Tool List (89 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
 | **Add-ons** | `ha_get_addon`, `ha_manage_addon` |
 | **Areas & Floors** | `ha_config_list_areas`, `ha_config_list_floors`, `ha_list_floors_areas`, `ha_remove_area_or_floor`, `ha_set_area_or_floor` |
+| **Assist** | `ha_manage_pipeline` |
 | **Automations** | `ha_config_get_automation`, `ha_config_remove_automation`, `ha_config_set_automation` |
 | **Blueprints** | `ha_get_blueprint`, `ha_import_blueprint` |
 | **Calendar** | `ha_config_get_calendar_events`, `ha_config_remove_calendar_event`, `ha_config_set_calendar_event` |

homeassistant-addon-dev/config.yaml

@@ -1,6 +1,6 @@
 name: "Home Assistant MCP Server (Dev)"
 description: "Development channel - AI assistant integration via MCP (unstable)"
-version: "7.5.0.dev332"
+version: "7.5.0.dev339"
 slug: "ha_mcp_dev"
 url: "https://github.com/homeassistant-ai/ha-mcp"
 stage: experimental

homeassistant-addon/DOCS.md

@@ -4,7 +4,7 @@ AI assistant integration for Home Assistant via Model Context Protocol (MCP).
 
 ## About
 
-This add-on enables AI assistants (Claude, ChatGPT, etc.) to control your Home Assistant installation through the Model Context Protocol (MCP). It provides 88+ tools for device control, automation management, entity search, calendars, todo lists, dashboards, backup/restore, history/statistics, camera snapshots, and system queries.
+This add-on enables AI assistants (Claude, ChatGPT, etc.) to control your Home Assistant installation through the Model Context Protocol (MCP). It provides 89+ tools for device control, automation management, entity search, calendars, todo lists, dashboards, backup/restore, history/statistics, camera snapshots, and system queries.
 
 **Key Features:**
 - **Zero Configuration** - Automatically discovers Home Assistant connection
@@ -256,7 +256,7 @@ Requires add-on restart to take effect.
 
 **Default:** `false`
 
-Replaces the full tool catalog (~88 tools, ~46K tokens) with search-based discovery (~4 proxy tools, ~5K tokens). When enabled, tools are found via `ha_search_tools` and executed through categorized proxies (read/write/delete).
+Replaces the full tool catalog (~89 tools, ~46K tokens) with search-based discovery (~4 proxy tools, ~5K tokens). When enabled, tools are found via `ha_search_tools` and executed through categorized proxies (read/write/delete).
 
 > ⚠️ **Do NOT enable this if you use Claude in Sonnet or Opus modes.** Those models run their own built-in tool search / deferred tools, which conflicts with ha-mcp's — running both at once does not work. To use ha-mcp's tool search with Claude, disable Claude's built-in tool search first; otherwise leave this off.
 
@@ -366,7 +366,7 @@ If the add-on is slow or unresponsive:
 
 <!-- ADDON_TOOLS_START -->
 
-The add-on provides 88+ MCP tools for controlling Home Assistant:
+The add-on provides 89+ MCP tools for controlling Home Assistant:
 
 > **Note:** This list is regenerated from the `master` branch on every push, but the add-on image you have installed only updates on stable releases (biweekly, Wednesdays 10:00 UTC). A tool listed below may not yet be present in your installed runtime. If so, calling it returns an "unknown tool" error until the next stable release.
 
@@ -383,6 +383,9 @@ The add-on provides 88+ MCP tools for controlling Home Assistant:
 - `ha_remove_area_or_floor` — Remove a Home Assistant area or floor.
 - `ha_set_area_or_floor` — Create or update a Home Assistant area or floor.
 
+### Assist
+- `ha_manage_pipeline` — Manage Home Assistant Assist pipelines.
+
 ### Automations
 - `ha_config_get_automation` — Retrieve Home Assistant automation configuration.
 - `ha_config_remove_automation` — Delete a Home Assistant automation.
@@ -441,7 +444,7 @@ The add-on provides 88+ MCP tools for controlling Home Assistant:
 
 ### Helper Entities
 - `ha_config_list_helpers` — List all Home Assistant helpers of a specific type with their configurations.
-- `ha_config_set_helper` — Create or update Home Assistant helper entities (27 types, unified interface).
+- `ha_config_set_helper` — Create or update Home Assistant helper entities and config subentries
 - `ha_delete_helpers_integrations` — Delete a Home Assistant helper or integration config entry.
 
 ### History & Statistics

renovate.json

@@ -9,7 +9,8 @@
   ],
   "enabledManagers": [
     "custom.regex",
-    "dockerfile"
+    "dockerfile",
+    "git-submodules"
   ],
   "ignorePaths": [],
   "customManagers": [