Merge main into beta to resolve conflicts

[bharvey88]

Summary

• Merges main into beta to resolve merge conflicts on PR Release 26.3.2.1 - New sensors, ESPHome modernisation, and bug fixes #78
• Keeps all beta changes (ESPHome modernisation, new sensors, actions API)
• Preserves main's num_leds: 1 fix and rmt_symbols: 48

Files resolved

• Integrations/ESPHome/Core.yaml — kept beta + patched LED count from main
• Integrations/ESPHome/MSR-1_BLE.yaml — kept beta (already includes logger from main)

Summary by CodeRabbit

• Chores
  • Updated CI/CD automation: workflow actions and build input selection adjusted to streamline builds and repository checkout.
  • Updated automation assignment settings.
  • Optimized device integration: LED configuration reduced and timing adjusted for improved behavior, and logging configuration moved earlier for more consistent startup diagnostics.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: b467ea99-8724-4851-8504-a4cdf6f58899

📥 Commits

Reviewing files that changed from the base of the PR and between ebfd77b and 4006638.

📒 Files selected for processing (1)

• Integrations/ESPHome/MSR-1_BLE.yaml

🚧 Files skipped from review as they are similar to previous changes (1)

• Integrations/ESPHome/MSR-1_BLE.yaml

---

Walkthrough

Updates to GitHub workflow files (action versions, inputs, and auto-assign assignee) and small changes to ESPHome YAMLs (LED strip configuration and logger block relocation).

Changes

Cohort / File(s)	Summary
GitHub Workflows .github/workflows/autoassign.yml, .github/workflows/build.yml, .github/workflows/ci.yml	Bumped pozil/auto-assign-issue from v1→v2 and changed assignee to bharvey88; changed firmware-names input from "_Factory:firmware"→"1_Factory:firmware"; upgraded actions/checkout from v4.2.2→v6.0.2.
ESPHome — Core Integrations/ESPHome/Core.yaml	Changed rgb_light num_leds from 3→1 and added rmt_symbols: 48.
ESPHome — MSR-1_BLE Integrations/ESPHome/MSR-1_BLE.yaml	Moved/added a top-level logger: block near esphome.min_version and removed the previous later logger: occurrence (logger now appears at the new location).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

• fix: add missing logger to MSR-1 and MSR-1_BLE #77: Adds/moves the top-level logger: entry in Integrations/ESPHome/MSR-1_BLE.yaml, directly related to the logger relocation in this PR.

Suggested labels

bugfix

Suggested reviewers

• TrevorSchirmer

Poem

🐰✨ I hopped through pipelines, small and neat,
Bumped versions, nudged a firmware beat,
One LED now glows where three once played,
The logger hopped to where configs are laid,
A tiny rabbit’s fix — quick, bright, and sweet.

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title accurately describes the primary purpose: merging main into beta to resolve conflicts, which is confirmed by the PR objectives and all file changes.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch fix/merge-main-into-beta

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

Integrations/ESPHome/MSR-1_BLE.yaml (1)

23-29: ⚠️ Potential issue | 🟡 Minor

Duplicate logger: block — remove one.

This file now has two top-level logger: keys (lines 23 and 29). YAML mappings must have unique keys; ESPHome/PyYAML will either reject this or silently keep only one, and it diverges from the single-logger: pattern used in MSR-1.yaml and MSR-1_Factory.yaml. Per the PR description, the beta branch already included the logger from main, so the newly added block at line 23 appears to be an unintended merge artifact.

🔧 Proposed fix

   min_version: 2025.2.0

-logger:
-
 dashboard_import:
   package_import_url: github://ApolloAutomation/MSR-1/Integrations/ESPHome/MSR-1_BLE.yaml
   import_full_config: false

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@Integrations/ESPHome/MSR-1_BLE.yaml` around lines 23 - 29, Remove the
duplicate top-level "logger:" block that was introduced as a merge artifact so
there is only one logger mapping in the YAML; locate the two occurrences of the
top-level logger key near the "dashboard_import" section and delete the
unintended/extra "logger:" entry (keeping the single logger block consistent
with the pattern used in MSR-1.yaml and MSR-1_Factory.yaml).

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Outside diff comments:
In `@Integrations/ESPHome/MSR-1_BLE.yaml`:
- Around line 23-29: Remove the duplicate top-level "logger:" block that was
introduced as a merge artifact so there is only one logger mapping in the YAML;
locate the two occurrences of the top-level logger key near the
"dashboard_import" section and delete the unintended/extra "logger:" entry
(keeping the single logger block consistent with the pattern used in MSR-1.yaml
and MSR-1_Factory.yaml).

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 32a1e025-622a-4ca6-9244-46d9187df37a

📥 Commits

Reviewing files that changed from the base of the PR and between d52f0fe and ebfd77b.

📒 Files selected for processing (5)

• .github/workflows/autoassign.yml
• .github/workflows/build.yml
• .github/workflows/ci.yml
• Integrations/ESPHome/Core.yaml
• Integrations/ESPHome/MSR-1_BLE.yaml