chore: reset addon-repo to upstream master + PRs homeassistant-ai#854, homeassistant-ai#857, dev66

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: kingpanther13

homeassistant-addon-dev/Dockerfile

@@ -28,7 +28,7 @@ WORKDIR /app
 
 # Copy the virtual environment and startup script from builder
 COPY --from=builder /app/.venv /app/.venv
-COPY homeassistant-addon/start.py /
+COPY start.py /
 
 # Activate virtual environment via PATH
 ENV PATH="/app/.venv/bin:$PATH"

homeassistant-addon-dev/config.yaml

@@ -1,8 +1,8 @@
-name: "Home Assistant MCP Server (Dev)"
+name: "Fork-Dev"
 description: "Development channel - AI assistant integration via MCP (unstable)"
-version: "dev"
+version: "dev66"
 slug: "ha_mcp_dev"
-url: "https://github.com/homeassistant-ai/ha-mcp"
+url: "https://github.com/kingpanther13/ha-mcp-fork"
 stage: experimental
 arch:
   - aarch64
@@ -14,33 +14,26 @@ hassio_api: true
 hassio_role: default
 homeassistant_api: true
 host_network: true
-image: "ghcr.io/homeassistant-ai/ha-mcp-addon-dev-{arch}"
 options:
   backup_hint: "normal"
   enable_skills: true
   enable_skills_as_tools: false
   enable_tool_search: false
-<<<<<<< HEAD
   enable_yaml_config_editing: false
   enable_code_mode: false
-=======
   disabled_tools: "ha_config_set_yaml"
   pinned_tools: ""
   tool_search_max_results: 5
->>>>>>> pr-857
 schema:
   backup_hint: list(strong|normal|weak|auto)
   secret_path: str?
   enable_skills: bool?
   enable_skills_as_tools: bool?
   enable_tool_search: bool?
-<<<<<<< HEAD
   enable_yaml_config_editing: bool?
   enable_code_mode: bool?
-=======
   disabled_tools: str?
   pinned_tools: str?
   tool_search_max_results: int?
->>>>>>> pr-857
 ports:
   9583/tcp: 9583

homeassistant-addon-dev/pyproject.toml

@@ -0,0 +1,225 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ha-mcp"
+version = "7.2.0"
+description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
+readme = "README.md"
+requires-python = ">=3.13,<3.14"
+license = {text = "MIT"}
+authors = [
+    {name = "Julien", email = "github@qc-h.net"}
+]
+keywords = ["mcp", "home-assistant", "ai", "automation", "smart-home"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Home Automation",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+dependencies = [
+    "fastmcp==3.2.0",
+    "httpx[socks]==0.28.1",
+    "pydantic==2.12.5",
+    "python-dotenv==1.2.2",
+    "truststore==0.10.4",
+    "websockets==16.0",
+    "cryptography==46.0.6",
+    "pydantic-monty==0.0.9",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/homeassistant-ai/ha-mcp"
+"Bug Tracker" = "https://github.com/homeassistant-ai/ha-mcp/issues"
+"Repository" = "https://github.com/homeassistant-ai/ha-mcp"
+
+[project.scripts]
+ha-mcp = "ha_mcp.__main__:main"
+ha-mcp-smoke-test = "ha_mcp.smoke_test:main"
+hamcp-test-env = "tests.test_env_manager:main"
+ha-mcp-web = "ha_mcp.__main__:main_web"
+ha-mcp-sse = "ha_mcp.__main__:main_sse"
+ha-mcp-oauth = "ha_mcp.__main__:main_oauth"
+
+[tool.setuptools]
+package-dir = {"" = "src", "tests" = "tests"}
+packages = { find = { where = ["src", "."], include = ["ha_mcp*", "tests"] } }
+
+[tool.setuptools.package-data]
+ha_mcp = ["py.typed", "_pypi_marker", "resources/skills-vendor/**/*"]
+
+[tool.mypy]
+python_version = "3.13"
+mypy_path = "src"
+# /tmp keeps the cache on Linux tmpfs — avoids the slow Windows FS in WSL2.
+# Windows-native contributors can remove this line or override with MYPY_CACHE_DIR.
+cache_dir = "/tmp/.mypy_cache"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+show_error_codes = true
+namespace_packages = true
+explicit_package_bases = true
+
+[[tool.mypy.overrides]]
+module = [
+    "fastmcp.*",
+    "jq",
+    "pydantic_monty",
+    "pydantic_monty.*",
+]
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = [
+    "homeassistant.*",
+    "aiohttp",
+    "voluptuous",
+    "jsonschema",
+]
+ignore_missing_imports = true
+
+
+[tool.ruff]
+target-version = "py313"
+line-length = 88
+extend-exclude = ["tests/initial_test_state"]
+
+[tool.ruff.lint]
+select = [
+    "E",     # pycodestyle errors
+    "W",     # pycodestyle warnings
+    "F",     # pyflakes
+    "I",     # isort
+    "B",     # flake8-bugbear
+    "C4",    # flake8-comprehensions
+    "UP",    # pyupgrade
+    "RUF",   # ruff-specific rules
+    "PIE",   # misc lints
+    "PERF",  # performance anti-patterns
+    "ASYNC", # async best practices
+    "A",     # builtin shadowing
+    "LOG",   # logging best practices
+    "SIM",   # simplify
+]
+ignore = [
+    "E501",    # line too long — formatter handles this
+    "B008",    # function calls in defaults — FastMCP pattern
+    "C901",    # complexity — too many to fix now
+    "SIM102",  # collapsible-if — sometimes less readable
+    "SIM108",  # ternary — sometimes less readable
+    "SIM105",  # contextlib.suppress — style preference
+    "ASYNC109",# timeout params are standard in HA API patterns
+    "RUF001",  # ambiguous unicode — HA entity names use degree symbols etc
+    "RUF003",  # ambiguous unicode in comments
+    "RUF010",  # explicit f-string type conversion — str(x) is clearer than !s
+    "F841",    # unused variable — too many to fix now
+    "RUF059",  # unused unpacked variable
+    "SIM118",  # in-dict-keys — style preference
+    "PIE810",  # multiple-starts-ends-with — style preference
+    "RUF005",  # collection-literal-concatenation
+    "RUF022",  # unsorted-dunder-all
+    "RUF013",  # implicit-optional
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401"]
+"tests/**/*" = ["E501", "B011"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py", "*_test.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = [
+    "--strict-markers",
+    "--strict-config",
+    "--verbose",
+    "--tb=short",
+]
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+    "integration: marks tests as integration tests",
+    "unit: marks tests as unit tests",
+    "automation: automation lifecycle tests",
+    "calendar: calendar event management tests",
+    "device: device control tests",
+    "script: script orchestration tests",
+    "helper: helper integration tests",
+    "convenience: convenience tools tests (scene, weather, energy, docs)",
+    "error_handling: error handling and edge case tests",
+    "cleanup: tests that create entities needing cleanup",
+    "performance: performance measurement and regression tests",
+]
+asyncio_mode = "auto"
+
+[dependency-groups]
+dev = [
+    "build>=1.2.2",
+    "docker>=7.1.0",
+    "mypy>=1.17.0",
+    "openai>=1.0.0",
+    "psutil>=7.0.0",
+    "pytest>=8.4.2",
+    "pytest-asyncio>=1.1.0",
+    "pytest-cov>=5.0.0",
+    "pytest-xdist>=3.8.0",
+    "requests>=2.25.0",
+    "lefthook>=1.10.0",
+    "ruff>=0.12.12",
+    "testcontainers>=4.13.0",
+    "ast-grep-cli>=0.42.0",
+]
+
+# Semantic versioning configuration
+[tool.semantic_release]
+version_toml = ["pyproject.toml:project.version"]
+version_variables = [
+    "src/ha_mcp/__init__.py:__version__",
+]
+build_command = """
+pip install uv && uv lock
+git add uv.lock
+"""
+dist_path = "dist/"
+upload_to_PyPI = true
+upload_to_release = true
+remove_dist = false
+
+# Commit message parsing
+commit_parser = "angular"
+commit_parser_options = { major_tags = ["BREAKING", "!"], minor_tags = ["feat"], patch_tags = ["fix", "perf", "refactor"] }
+
+# Changelog configuration
+[tool.semantic_release.changelog]
+template_dir = "templates"
+exclude_commit_patterns = [
+    "^.*\\(site\\).*$",           # Commits with (site) scope
+    '''chore\(addon\): [Ss]ync changelog.*''',  # Changelog sync commits
+]
+
+[tool.semantic_release.changelog.default_templates]
+changelog_file = "CHANGELOG.md"
+
+# Version scheme
+major_on_zero = true
+allow_zero_version = false
+
+# Branch and tag configuration
+branch = "master"
+
+# Publish configuration (v10 syntax)
+[tool.semantic_release.publish]
+# GitHub release is created by build-binary.yml workflow to include binaries
+upload_to_vcs_release = false

homeassistant-addon-dev/src/ha_mcp/__init__.py

@@ -0,0 +1,51 @@
+"""
+Home Assistant MCP Server
+
+A Model Context Protocol server that provides complete control over Home Assistant
+through REST API and WebSocket integration with 20+ enhanced tools.
+"""
+
+__version__ = "7.2.0"
+__author__ = "Julien"
+__license__ = "MIT"
+
+from .auth import HomeAssistantOAuthProvider
+from .client.rest_client import HomeAssistantClient
+from .config import Settings
+from .errors import (
+    ErrorCode,
+    create_auth_error,
+    create_config_error,
+    create_connection_error,
+    create_entity_not_found_error,
+    create_error_response,
+    create_resource_not_found_error,
+    create_service_error,
+    create_timeout_error,
+    create_validation_error,
+    get_error_code,
+    get_error_message,
+    is_error_response,
+)
+from .server import HomeAssistantSmartMCPServer
+
+__all__ = [
+    "Settings",
+    "HomeAssistantClient",
+    "HomeAssistantSmartMCPServer",
+    "HomeAssistantOAuthProvider",
+    # Error handling exports
+    "ErrorCode",
+    "create_error_response",
+    "create_connection_error",
+    "create_auth_error",
+    "create_entity_not_found_error",
+    "create_service_error",
+    "create_validation_error",
+    "create_config_error",
+    "create_timeout_error",
+    "create_resource_not_found_error",
+    "is_error_response",
+    "get_error_code",
+    "get_error_message",
+]