rustuya-local 0.1.0.dev2__tar.gz → 0.1.0.dev4__tar.gz

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/CHANGELOG.md

@@ -8,6 +8,23 @@ stable release.
 
 ## [Unreleased]
 
+## [0.1.0.dev4] — 2026-10-11
+
+### Fixed
+- Fetch dev4 builtin rule updates from its development branch; master does not yet contain the new rules directory.
+
+### Changed
+- Label official rule updates as builtin rules in the HA panel and manager settings, and clarify that bundled rules remain available when online updates are off.
+
+## [0.1.0.dev3] — 2026-10-11
+
+### Changed
+- Require tuya2ildevice 0.4.0.dev4 in the package and Home Assistant integration.
+- Load bundled official rules from `rules/builtin/`, exclude the manifest from rule layers, and apply user files after official rules regardless of filename.
+- Fetch the complete official pack into `rules/builtin/` inside the overrides directory and watch it for live reloads.
+- Retire unedited files owned by the old flat override pack while preserving user edits.
+- Include the official rule layers and manifest in the manager drop-in archive.
+
 ## [0.1.0.dev2] — 2026-10-11
 
 ### Fixed

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rustuya-local
-Version: 0.1.0.dev2
+Version: 0.1.0.dev4
 Summary: Local Tuya control: rustuya-bridge -> tuya2ildevice -> IL (ildevice). HA-independent core.
 Project-URL: Homepage, https://github.com/3735943886/rustuya-local
 Project-URL: Repository, https://github.com/3735943886/rustuya-local
@@ -10,7 +10,7 @@ License-File: LICENSE
 Requires-Python: >=3.13
 Requires-Dist: paho-mqtt>=2.0
 Requires-Dist: pyrustuyabridge>=0.4
-Requires-Dist: tuya2ildevice>=0.4.0.dev3
+Requires-Dist: tuya2ildevice>=0.4.0.dev4
 Provides-Extra: fullstack
 Requires-Dist: tuyamock; extra == 'fullstack'
 Provides-Extra: manager
@@ -66,7 +66,7 @@ source are cleared (other sources on the prefix are left alone), so IL consumers
 
 The shared Rust core interprets one device and has no MQTT or rule-file loading API.
 `rustuya_local.host.Hub` owns the device registry and maps `TuyaDriver` outputs to IL MQTT wire data;
-`host.rules` discovers and loads the bundled pack and user layers, passing decoded rules to Rust for composition.
+`host.rules` discovers and loads the bundled builtin rules and user layers, passing decoded rules to Rust for composition.
 The service preloads native code and rules in a worker thread before starting devices.
 Timers, retained-message policy, bridge `get` requests, presence and settings persistence remain in this host.
 MQTT and in-process transport tests exercise the same adapter and the bidirectional Rust driver.
@@ -102,11 +102,14 @@ config; integration: `<config>/rustuya_converters`; manager plugin: its data dir
   `{"overrides": {"product_id": {"cover": {"invert_position": true}}}}`.
 - Converters are JSON programs under `converters.declarative`; Python code plugins are not loaded.
 
-See tuya2ildevice's README ("User overrides") for the format. A curated set ships in tuya2ildevice, and fixes published
-between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/pack)) are copied
-into the directory at start and daily, as `00_pack_*` files that your own files refine. Turn that off with `"pack":
-false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
-put there, and leaves a file alone once you edit it.
+See tuya2ildevice's README ("User overrides") for the format. Official builtin rules, including `00-default.json`,
+ship with tuya2ildevice and update when that package is upgraded. They are applied before your own rule files.
+
+Online updates fetch the latest [builtin rules](https://github.com/3735943886/tuya2ildevice/tree/feat/rust-rule-engine/rules/builtin)
+into `rules/builtin/` inside the overrides directory at start and daily. In the Rustuya panel, use *Update builtin rules*
+to fetch them now or *Automatically update builtin rules* to control automatic updates. The daemon uses `"pack": false`
+to disable online updates; the manager plugin has the same option in its settings. Installed builtin rules remain
+available when online updates are off. Updates only replace or remove files they downloaded, preserving user edits.
 
 ### Cover settings
 
@@ -127,7 +130,7 @@ device settings are enabled, unless an override selects another source. A settin
 the setting is saved as the device's block in `zz_settings.json` in the converters directory and applied at once, so it
 survives a restart and can be edited there too. Without a converters directory (a daemon with no
 `custom_converters`) the switches are not offered; `"options": {"device_settings": false}` turns them off.
-A block with the same `cover` keys in your own file or the pack sets a model's starting point; the saved settings win.
+A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point; the saved settings win.
 Older `cover.infer_motion` and `converters.cover_motion` blocks are upgraded on loading to `cover.state_source`
 (`inferred`, or `none` for `infer_motion: false`) and `cover.settle`; see [migration notes](docs/MIGRATING.md).
 
@@ -137,10 +140,10 @@ bridge's devices against the cloud list as rustuya-manager does (missing, bridge
 turn off; sub-devices under their gateway; each device's bridge connection, live while the panel is open) with add /
 update / remove. *Register manually* adds Wi-Fi devices or sub-devices without a cloud login, using the same
 fields as rustuya-manager. Devices absent from the cloud list appear under *Bridge only*; their removal is not
-preselected in bulk sync. The panel lists the converter files with the pack's
-marked, edits and deletes them (drop JSON rule files on it to copy them in), runs the pack sync on demand, has the
+preselected in bulk sync. The panel lists, edits and deletes user converter files (drop JSON rule files on it to copy them in),
+updates builtin rules on demand, and has the
 *Options* (remote control of locks, alarms and garage doors; data points Home Assistant core would not classify; the
-override pack), and the *Settings* setup leaves at their defaults: the bridge topic root, the IL prefix and source, the device file, and
+automatic builtin rule updates), and the *Settings* setup leaves at their defaults: the bridge topic root, the IL prefix and source, the device file, and
 the embedded bridge's state file and log level. Saving restarts the integration; moving the IL prefix or source first
 clears what the old one left on the broker. *Hide panel* in its toolbar turns it off again. The integration and the panel follow Home Assistant's
 language: Korean, or English.
@@ -148,7 +151,7 @@ language: Korean, or English.
 ## rustuya-manager plugin
 
 Installed next to rustuya-manager, as a pip package (`pip install rustuya-local` in the manager's environment) or as
-the drop-in zip each release carries (`rustuya_local-<version>-dropin.zip`, tuya2ildevice binding, native library and rule pack vendored inside, built by
+the drop-in zip each release carries (`rustuya_local-<version>-dropin.zip`, tuya2ildevice binding, native library and builtin rules vendored inside, built by
 `scripts/build_dropin.py`; unpack it into the manager's plugin directory, or install it from the manager's plugin
 catalog once listed there), it appears as a **Tuya (IL)** tab and runs the service under the manager: the manager's broker and bridge root, the manager's device
 list (followed). Its data dir (`rustuya-local/` next to the manager's plugins) holds `settings.json` (`il`,

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/README.md

@@ -40,7 +40,7 @@ source are cleared (other sources on the prefix are left alone), so IL consumers
 
 The shared Rust core interprets one device and has no MQTT or rule-file loading API.
 `rustuya_local.host.Hub` owns the device registry and maps `TuyaDriver` outputs to IL MQTT wire data;
-`host.rules` discovers and loads the bundled pack and user layers, passing decoded rules to Rust for composition.
+`host.rules` discovers and loads the bundled builtin rules and user layers, passing decoded rules to Rust for composition.
 The service preloads native code and rules in a worker thread before starting devices.
 Timers, retained-message policy, bridge `get` requests, presence and settings persistence remain in this host.
 MQTT and in-process transport tests exercise the same adapter and the bidirectional Rust driver.
@@ -76,11 +76,14 @@ config; integration: `<config>/rustuya_converters`; manager plugin: its data dir
   `{"overrides": {"product_id": {"cover": {"invert_position": true}}}}`.
 - Converters are JSON programs under `converters.declarative`; Python code plugins are not loaded.
 
-See tuya2ildevice's README ("User overrides") for the format. A curated set ships in tuya2ildevice, and fixes published
-between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/pack)) are copied
-into the directory at start and daily, as `00_pack_*` files that your own files refine. Turn that off with `"pack":
-false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
-put there, and leaves a file alone once you edit it.
+See tuya2ildevice's README ("User overrides") for the format. Official builtin rules, including `00-default.json`,
+ship with tuya2ildevice and update when that package is upgraded. They are applied before your own rule files.
+
+Online updates fetch the latest [builtin rules](https://github.com/3735943886/tuya2ildevice/tree/feat/rust-rule-engine/rules/builtin)
+into `rules/builtin/` inside the overrides directory at start and daily. In the Rustuya panel, use *Update builtin rules*
+to fetch them now or *Automatically update builtin rules* to control automatic updates. The daemon uses `"pack": false`
+to disable online updates; the manager plugin has the same option in its settings. Installed builtin rules remain
+available when online updates are off. Updates only replace or remove files they downloaded, preserving user edits.
 
 ### Cover settings
 
@@ -101,7 +104,7 @@ device settings are enabled, unless an override selects another source. A settin
 the setting is saved as the device's block in `zz_settings.json` in the converters directory and applied at once, so it
 survives a restart and can be edited there too. Without a converters directory (a daemon with no
 `custom_converters`) the switches are not offered; `"options": {"device_settings": false}` turns them off.
-A block with the same `cover` keys in your own file or the pack sets a model's starting point; the saved settings win.
+A block with the same `cover` keys in your own file or the builtin rules sets a model's starting point; the saved settings win.
 Older `cover.infer_motion` and `converters.cover_motion` blocks are upgraded on loading to `cover.state_source`
 (`inferred`, or `none` for `infer_motion: false`) and `cover.settle`; see [migration notes](docs/MIGRATING.md).
 
@@ -111,10 +114,10 @@ bridge's devices against the cloud list as rustuya-manager does (missing, bridge
 turn off; sub-devices under their gateway; each device's bridge connection, live while the panel is open) with add /
 update / remove. *Register manually* adds Wi-Fi devices or sub-devices without a cloud login, using the same
 fields as rustuya-manager. Devices absent from the cloud list appear under *Bridge only*; their removal is not
-preselected in bulk sync. The panel lists the converter files with the pack's
-marked, edits and deletes them (drop JSON rule files on it to copy them in), runs the pack sync on demand, has the
+preselected in bulk sync. The panel lists, edits and deletes user converter files (drop JSON rule files on it to copy them in),
+updates builtin rules on demand, and has the
 *Options* (remote control of locks, alarms and garage doors; data points Home Assistant core would not classify; the
-override pack), and the *Settings* setup leaves at their defaults: the bridge topic root, the IL prefix and source, the device file, and
+automatic builtin rule updates), and the *Settings* setup leaves at their defaults: the bridge topic root, the IL prefix and source, the device file, and
 the embedded bridge's state file and log level. Saving restarts the integration; moving the IL prefix or source first
 clears what the old one left on the broker. *Hide panel* in its toolbar turns it off again. The integration and the panel follow Home Assistant's
 language: Korean, or English.
@@ -122,7 +125,7 @@ language: Korean, or English.
 ## rustuya-manager plugin
 
 Installed next to rustuya-manager, as a pip package (`pip install rustuya-local` in the manager's environment) or as
-the drop-in zip each release carries (`rustuya_local-<version>-dropin.zip`, tuya2ildevice binding, native library and rule pack vendored inside, built by
+the drop-in zip each release carries (`rustuya_local-<version>-dropin.zip`, tuya2ildevice binding, native library and builtin rules vendored inside, built by
 `scripts/build_dropin.py`; unpack it into the manager's plugin directory, or install it from the manager's plugin
 catalog once listed there), it appears as a **Tuya (IL)** tab and runs the service under the manager: the manager's broker and bridge root, the manager's device
 list (followed). Its data dir (`rustuya-local/` next to the manager's plugins) holds `settings.json` (`il`,

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/custom_components/rustuya/manifest.json

@@ -9,12 +9,12 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/3735943886/rustuya-local/issues",
   "requirements": [
-    "tuya2ildevice>=0.4.0.dev3",
+    "tuya2ildevice>=0.4.0.dev4",
     "paho-mqtt>=2.0",
     "rustuya-manager>=0.2.2",
     "pyrustuyabridge>=0.4",
-    "rustuya-local>=0.1.0.dev2"
+    "rustuya-local>=0.1.0.dev4"
   ],
   "single_config_entry": true,
-  "version": "0.1.0.dev2"
+  "version": "0.1.0.dev4"
 }

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/custom_components/rustuya/strings.json

@@ -138,7 +138,7 @@
       "wizard_failed": "Fetching from Tuya Cloud failed: {error}",
       "no_devices": "There are no devices in the cloud list or on the bridge.",
       "manager_busy": "Another Tuya Cloud fetch or device sync window is still open. Close it and try again.",
-      "panel_shown": "The Rustuya panel was added to the sidebar: [open it]({url}). Its Options hold remote control of locks, alarms and garage doors, unused data points and the override pack.",
+      "panel_shown": "The Rustuya panel was added to the sidebar: [open it]({url}). Its Options hold remote control of locks, alarms and garage doors, unused data points and automatic builtin rule updates.",
       "panel_open": "[Open the Rustuya panel]({url})."
     },
     "error": {

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/custom_components/rustuya/translations/en.json

@@ -138,7 +138,7 @@
       "wizard_failed": "Fetching from Tuya Cloud failed: {error}",
       "no_devices": "There are no devices in the cloud list or on the bridge.",
       "manager_busy": "Another Tuya Cloud fetch or device sync window is still open. Close it and try again.",
-      "panel_shown": "The Rustuya panel was added to the sidebar: [open it]({url}). Its Options hold remote control of locks, alarms and garage doors, unused data points and the override pack.",
+      "panel_shown": "The Rustuya panel was added to the sidebar: [open it]({url}). Its Options hold remote control of locks, alarms and garage doors, unused data points and automatic builtin rule updates.",
       "panel_open": "[Open the Rustuya panel]({url})."
     },
     "error": {

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/custom_components/rustuya/translations/ko.json

@@ -138,7 +138,7 @@
       "wizard_failed": "Tuya Cloud에서 가져오지 못했습니다: {error}",
       "no_devices": "클라우드 목록에도 브리지에도 기기가 없습니다.",
       "manager_busy": "다른 Tuya Cloud 가져오기 또는 기기 동기화 창이 아직 열려 있습니다. 그 창을 닫고 다시 시도하세요.",
-      "panel_shown": "사이드바에 Rustuya 패널이 추가되었습니다: [열기]({url}). 패널의 Options에서 잠금장치·경보·차고문 원격 제어, 분류되지 않는 데이터 포인트, 오버라이드 팩을 설정합니다.",
+      "panel_shown": "사이드바에 Rustuya 패널이 추가되었습니다: [열기]({url}). 패널의 Options에서 잠금장치·경보·차고문 원격 제어, 분류되지 않는 데이터 포인트, Builtin 규칙 자동 업데이트를 설정합니다.",
       "panel_open": "[Rustuya 패널 열기]({url})"
     },
     "error": {

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/custom_components/rustuya/www/rustuya-panel.js

@@ -183,17 +183,17 @@ const I18N = {
     opt_allow_hazardous_hint: "Off: their state is shown, but IL and rustuya.send_command refuse writes to them.",
     opt_expose_unused: "Expose data points Home Assistant core would not classify",
     opt_expose_unused_hint: "Every data point the cloud schema lists, not only the ones a standard entity uses.",
-    opt_pack: "Download fixes for non-standard devices published between releases",
-    opt_pack_hint: "The override pack: copied into the converters directory at start and daily.",
+    opt_pack: "Automatically update builtin rules",
+    opt_pack_hint: "Check for official rule updates at start and daily.",
     save_restart: "Save and restart", options_title: "Options", options_intro: "Saving restarts the integration.",
     options_unreadable: "Cannot read the options: {error}", nothing_changed: "Nothing changed",
     saving_restarting: "Saving; Rustuya is restarting…", not_saved: "Not saved: {error}",
     settings_title: "Settings",
     settings_intro: "Set up with their defaults. Saving restarts the integration; moving the IL prefix or source clears what the old one left on the broker, so IL consumers drop those devices and see them again under the new one.",
     settings_unreadable: "Cannot read the settings: {error}", confirm_settings: "Save {names} and restart Rustuya?",
-    sync_now: "Sync now", hide_title: "Remove this panel from the sidebar; the integration's Configure adds it back",
-    hide: "Hide panel", pack_title: "Override pack",
-    pack_intro: "Fixes for non-standard devices, published between releases and copied into the converters directory.",
+    sync_now: "Update builtin rules", hide_title: "Remove this panel from the sidebar; the integration's Configure adds it back",
+    hide: "Hide panel", pack_title: "Builtin rules",
+    pack_intro: "Official rules included with tuya2ildevice. Fetch the latest rules without updating the integration.",
     converters_title: "Custom converters",
     converters_intro: "Rule files (*.json: override blocks and declarative converters) in rustuya_converters/. Saved files apply within seconds. See tuya2ildevice's README, \"User overrides\". Drop files here to copy them in.",
     new_file: "New file", save: "Save", delete: "Delete",
@@ -204,15 +204,15 @@ const I18N = {
     confirm_hide_unsaved: "Unsaved changes in {names} will be lost. Remove the Rustuya panel from the sidebar anyway?",
     and: " and ", not_hidden: "Not hidden: {error}", files_unreadable: "Cannot list the files: {error}",
     no_files: "No files yet. Built-in fixes apply without any.",
-    pack_syncing: "Syncing…", pack_off: "Off. Turn it on in Options below.", pack_never: "Not synced yet.",
+    pack_syncing: "Updating…", pack_off: "Online updates are off. Using the installed rules.", pack_never: "Using bundled rules; no online update yet.",
     pack_added: "added", pack_updated: "updated", pack_removed: "removed", pack_kept: "kept",
-    pack_failed: "; failed: {list}", pack_error: "Not synced ({error}), {when}", pack_synced: "Synced {when}",
+    pack_failed: "; failed: {list}", pack_error: "Update failed ({error}), {when}", pack_synced: "Updated {when}",
     origin_note_pack: "From the override pack: the next sync updates it. Saving an edit makes it yours.",
     origin_note_pack_edited: "An edited pack file: the pack no longer updates it. Delete it to get the pack's copy back at the next sync.",
     name_first: "Name the file first (*.json)",
     confirm_edit_pack: "{name} comes from the override pack. Once edited it is yours: the pack no longer updates or removes it.",
     saved: "Saved {name}", confirm_delete: "Delete {name}?", deleted: "Deleted {name}", not_deleted: "Not deleted: {error}",
-    pack_is_off: "The pack is off", cannot_sync: "Cannot sync: {error}", pack_changed: "The pack changed the converter files",
+    pack_is_off: "Builtin rule updates are off", cannot_sync: "Cannot update: {error}", pack_changed: "Builtin rules updated",
   },
   ko: {
     origin_pack: "팩", origin_pack_edited: "팩, 수정됨",
@@ -252,17 +252,17 @@ const I18N = {
     opt_allow_hazardous_hint: "끄면 상태는 보이지만 IL과 rustuya.send_command가 쓰기를 거부합니다.",
     opt_expose_unused: "Home Assistant core가 분류하지 않는 데이터 포인트도 노출",
     opt_expose_unused_hint: "표준 엔티티가 쓰는 것만이 아니라 클라우드 스키마의 모든 데이터 포인트.",
-    opt_pack: "릴리즈 사이에 나온 비표준 기기 수정 다운로드",
-    opt_pack_hint: "오버라이드 팩: 시작할 때와 매일 컨버터 디렉터리에 복사됩니다.",
+    opt_pack: "Builtin 규칙 자동 업데이트",
+    opt_pack_hint: "시작할 때와 매일 공식 규칙 업데이트를 확인합니다.",
     save_restart: "저장하고 재시작", options_title: "옵션", options_intro: "저장하면 통합구성요소가 재시작됩니다.",
     options_unreadable: "옵션을 읽을 수 없습니다: {error}", nothing_changed: "바뀐 것이 없습니다",
     saving_restarting: "저장하는 중. Rustuya를 재시작합니다…", not_saved: "저장하지 못했습니다: {error}",
     settings_title: "설정",
     settings_intro: "설정 과정에서 기본값으로 정해진 값들입니다. 저장하면 통합구성요소가 재시작됩니다. IL prefix나 source를 옮기면 예전 값으로 브로커에 남은 것을 지워서, IL 소비자가 그 기기를 지우고 새 값으로 다시 보게 됩니다.",
     settings_unreadable: "설정을 읽을 수 없습니다: {error}", confirm_settings: "{names}을(를) 저장하고 Rustuya를 재시작할까요?",
-    sync_now: "지금 동기화", hide_title: "사이드바에서 이 패널을 없앱니다. 통합구성요소의 구성(Configure)에서 다시 추가할 수 있습니다",
-    hide: "패널 숨기기", pack_title: "오버라이드 팩",
-    pack_intro: "릴리즈 사이에 나온 비표준 기기 수정으로, 컨버터 디렉터리에 복사됩니다.",
+    sync_now: "Builtin 규칙 업데이트", hide_title: "사이드바에서 이 패널을 없앱니다. 통합구성요소의 구성(Configure)에서 다시 추가할 수 있습니다",
+    hide: "패널 숨기기", pack_title: "Builtin 규칙",
+    pack_intro: "tuya2ildevice에 포함된 공식 규칙입니다. 통합구성요소 업데이트 없이 최신 규칙을 가져옵니다.",
     converters_title: "커스텀 컨버터",
     converters_intro: "rustuya_converters/ 안의 규칙 파일(*.json: 오버라이드 블록과 선언형 컨버터). 저장한 파일은 몇 초 안에 적용됩니다. tuya2ildevice README의 \"User overrides\"를 참고하세요. 여기에 파일을 끌어다 놓으면 복사됩니다.",
     new_file: "새 파일", save: "저장", delete: "삭제",
@@ -273,15 +273,15 @@ const I18N = {
     confirm_hide_unsaved: "{names}의 저장하지 않은 변경이 사라집니다. 그래도 사이드바에서 Rustuya 패널을 없앨까요?",
     and: ", ", not_hidden: "숨기지 못했습니다: {error}", files_unreadable: "파일 목록을 읽을 수 없습니다: {error}",
     no_files: "아직 파일이 없습니다. 기본 수정은 파일 없이도 적용됩니다.",
-    pack_syncing: "동기화하는 중…", pack_off: "꺼져 있습니다. 아래 옵션에서 켜세요.", pack_never: "아직 동기화하지 않았습니다.",
+    pack_syncing: "업데이트하는 중…", pack_off: "온라인 업데이트가 꺼져 있습니다. 설치된 규칙을 사용합니다.", pack_never: "패키지에 포함된 규칙 사용 중; 아직 온라인 업데이트하지 않았습니다.",
     pack_added: "추가", pack_updated: "갱신", pack_removed: "삭제", pack_kept: "유지",
-    pack_failed: "; 실패: {list}", pack_error: "동기화하지 못함 ({error}), {when}", pack_synced: "{when}에 동기화함",
+    pack_failed: "; 실패: {list}", pack_error: "업데이트 실패 ({error}), {when}", pack_synced: "{when}에 업데이트함",
     origin_note_pack: "오버라이드 팩의 파일입니다. 다음 동기화 때 갱신됩니다. 수정해서 저장하면 내 파일이 됩니다.",
     origin_note_pack_edited: "수정한 팩 파일입니다. 팩이 더 이상 갱신하지 않습니다. 지우면 다음 동기화 때 팩의 파일이 다시 들어옵니다.",
     name_first: "먼저 파일 이름을 정하세요 (*.json)",
     confirm_edit_pack: "{name}은(는) 오버라이드 팩의 파일입니다. 수정하면 내 파일이 되어 팩이 더 이상 갱신하거나 지우지 않습니다.",
     saved: "{name} 저장함", confirm_delete: "{name}을(를) 삭제할까요?", deleted: "{name} 삭제함", not_deleted: "삭제하지 못했습니다: {error}",
-    pack_is_off: "팩이 꺼져 있습니다", cannot_sync: "동기화할 수 없습니다: {error}", pack_changed: "팩이 컨버터 파일을 바꿨습니다",
+    pack_is_off: "Builtin 규칙 업데이트가 꺼져 있습니다", cannot_sync: "업데이트할 수 없습니다: {error}", pack_changed: "Builtin 규칙이 업데이트되었습니다",
   },
 };
 

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/docs/MIGRATING.md

@@ -69,8 +69,8 @@ rustuya-manager plugin. It is retired. Its replacement is two pieces:
    - `converters.cover_motion` and a cover's `infer_motion` are read as the cover's `state_source` (`inferred`, or
      `none` for `infer_motion: false`), and a `cover_motion` `settle` as the cover's `settle`; its other keys are
      dropped with a warning. `zz_settings.json` is rewritten in the new form the next time a setting is saved.
-   - Leave the old pack (`00_default.json`, `00_curtain.py`, `.rustuya_pack.json`) out. Fixes arrive as `00_pack_*`
-     files by themselves.
+   - Leave the old pack (`00_default.json`, `00_curtain.py`, `.rustuya_pack.json`) out. Official rules ship with tuya2ildevice; online updates arrive under
+     `rules/builtin/` automatically. User files are applied after all official rules.
 
    Changes to the directory are picked up while running, no restart needed.
 

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rustuya-local"
-version = "0.1.0.dev2"
+version = "0.1.0.dev4"
 description = "Local Tuya control: rustuya-bridge -> tuya2ildevice -> IL (ildevice). HA-independent core."
 readme = "README.md"
 requires-python = ">=3.13"
 license = "MIT"
-dependencies = ["tuya2ildevice>=0.4.0.dev3", "pyrustuyabridge>=0.4", "paho-mqtt>=2.0"]
+dependencies = ["tuya2ildevice>=0.4.0.dev4", "pyrustuyabridge>=0.4", "paho-mqtt>=2.0"]
 # rustuya-manager (custom_components/rustuya's config flow) is optional at the package level (the HA manifest
 # pulls it in); declared here too so the venv used for this repo's tests has it. pyrustuyabridge is a base dependency
 # now (not just for the embedded bridge): rustuya-local's own bridge_client uses it to interpret rustuya-bridge's

rustuya_local-0.1.0.dev4/release-notes.md

@@ -0,0 +1,5 @@
+### Fixed
+- Fetch dev4 builtin rule updates from its development branch; master does not yet contain the new rules directory.
+
+### Changed
+- Label official rule updates as builtin rules in the HA panel and manager settings, and clarify that bundled rules remain available when online updates are off.

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/scripts/build_dropin.py

@@ -58,7 +58,10 @@ def _members() -> list[tuple[str, Path]]:
             members = dict(out)
             members.setdefault(f"{prefix}/{native.name}", native)
             for layer in rule_files(rule_paths()[:1]):          # the rule layers a wheel bundles, nothing else
-                members.setdefault(f"{prefix}/rules/{layer.name}", layer)
+                members.setdefault(f"{prefix}/rules/builtin/{layer.name}", layer)
+            manifest = rule_paths()[0] / 'manifest.json'
+            if manifest.is_file():
+                members.setdefault(f"{prefix}/rules/builtin/manifest.json", manifest)
             out = list(members.items())
     return sorted(out)
 

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/src/rustuya_local/host/overrides.py

@@ -95,12 +95,12 @@ class OverrideWatcher:
 
     def _stat(self) -> Any:
         stamp = []
-        for p in rule_files([self.path]):
+        for p in rule_files([self.path, self.path / 'rules' / 'builtin']):
             try:
                 st = p.stat()
             except OSError:
                 continue
-            stamp.append((p.name, st.st_mtime_ns, st.st_size))
+            stamp.append((str(p), st.st_mtime_ns, st.st_size))
         return tuple(stamp)
 
     def check(self) -> bool:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/src/rustuya_local/host/pack.py

@@ -1,8 +1,8 @@
-"""The override pack: fixes for non-standard devices published on tuya2ildevice's `master` (`rules/pack/`) and copied into
+"""The override pack: fixes for non-standard devices published on tuya2ildevice's `feat/rust-rule-engine` branch (`rules/builtin/`) and copied into
 the host's rule directory, so a fix reaches users without a release. `OverrideWatcher` then loads the copied files
 like the user's own. The files are rule layers (JSON); fetching them is the host's, the engine only merges them.
 
-`pack/manifest.json` lists the files with their SHA-256 (built by `scripts/build_pack.py`):
+`builtin/manifest.json` lists the files with their SHA-256 (built by `scripts/build_pack.py`):
 
     {"version": 1, "files": [{"name": "00_pack_abc.json", "sha256": "...", "requires": 1, "until": 3}]}
 
@@ -38,7 +38,7 @@ from .overrides import SETTINGS_FILE
 _LOGGER = logging.getLogger(__name__)
 
 LEVEL = 4                                         # 2: `cover` settings; 3: `delta`; 4: rule-layer files (tuya2ildevice 0.4)
-BASE_URL = "https://raw.githubusercontent.com/3735943886/tuya2ildevice/master/rules/pack/"
+BASE_URL = "https://raw.githubusercontent.com/3735943886/tuya2ildevice/feat/rust-rule-engine/rules/builtin/"
 MANIFEST = "manifest.json"
 LEDGER = ".tuya2ildevice_pack.json"
 MAX_BYTES = 1024 * 1024
@@ -129,7 +129,7 @@ def _wanted(doc: dict[str, Any]) -> dict[str, str]:
             continue
         if entry.get("requires", 0) > LEVEL or entry.get("until", LEVEL + 1) <= LEVEL:
             continue
-        if name == SETTINGS_FILE:                 # the host's own settings: never the pack's
+        if name in (SETTINGS_FILE, MANIFEST):                 # the host's own settings: never the pack's
             _LOGGER.warning("pack: %s is the host's settings file, not taken from the pack", name)
             continue
         out[name] = sha.lower()

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/src/rustuya_local/host/rules.py

@@ -64,8 +64,8 @@ def _upgrade_layer(data, where):
 
 def rule_paths(paths=(), *, bundled_path=None):
     package = Path(tuya2ildevice.__file__).resolve().parent
-    bundled = package / 'rules'
-    checkout = package.parents[1] / 'rules'
+    bundled = package / 'rules' / 'builtin'
+    checkout = package.parents[1] / 'rules' / 'builtin'
     location = bundled_path or (bundled if bundled.is_dir() else checkout)
     return [Path(location), *map(Path, paths)]
 
@@ -73,14 +73,16 @@ def rule_paths(paths=(), *, bundled_path=None):
 def rule_files(locations):
     files = []
     for location in map(Path, locations):
-        if location.is_file():
+        if location.is_file() and location.name != 'manifest.json':
             files.append(location)
         elif location.is_dir():
-            files.extend(p for p in location.iterdir() if p.is_file() and p.suffix == '.json' and p.name[0] not in '._')
+            files.extend(p for p in location.iterdir()
+                         if p.is_file() and p.suffix == '.json' and p.name[0] not in '._'
+                         and p.name != 'manifest.json')
     return sorted(files, key=lambda p: os.fsencode(p.name))
 
 
-def merge_rule_files(locations, *, tolerant=False):
+def merge_rule_files(locations, *, tolerant=False, base=None):
     layers, warnings = [], []
     files = rule_files(locations)
     for path in files:
@@ -91,7 +93,7 @@ def merge_rule_files(locations, *, tolerant=False):
             if not tolerant:
                 raise ValueError(f'{path}: {error}') from error
             warnings.append(f'{path.name}: {error}')
-    result = merge_rules(layers, tolerant=tolerant)
+    result = merge_rules(layers, base=base, tolerant=tolerant)
     names = {str(p): p.name for p in files}
     for warning in result['warnings']:
         source, _, message = warning.partition(': ')
@@ -99,12 +101,23 @@ def merge_rule_files(locations, *, tolerant=False):
     return {**result, 'warnings': warnings}
 
 
+def _load_rules(paths=(), *, bundled_path=None, tolerant=False):
+    locations = rule_paths(paths, bundled_path=bundled_path)
+    official = merge_rule_files(locations[:1])
+    # Downloaded official rules refine the bundled pack; user files always run last.
+    downloaded = [Path(p) / 'rules' / 'builtin' for p in paths if Path(p).is_dir()]
+    official = merge_rule_files(downloaded, base=official['rules'], tolerant=tolerant)
+    result = merge_rule_files(locations[1:], base=official['rules'], tolerant=tolerant)
+    result['warnings'] = official['warnings'] + result['warnings']
+    return result
+
+
 def load_rules(paths=(), *, bundled_path=None):
-    return merge_rule_files(rule_paths(paths, bundled_path=bundled_path))['rules']
+    return _load_rules(paths, bundled_path=bundled_path)['rules']
 
 
 def load_rules_tolerant(paths=(), *, bundled_path=None):
-    return merge_rule_files(rule_paths(paths, bundled_path=bundled_path), tolerant=True)
+    return _load_rules(paths, bundled_path=bundled_path, tolerant=True)
 
 
 @functools.cache

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/src/rustuya_local/manager_plugin/static/index.js

@@ -56,8 +56,8 @@ function paintStatus(box, data) {
   const p = data.pack;
   if (p) {
     const when = new Date(p.at * 1000).toLocaleString();
-    const text = p.error ? `Override pack: not synced (${p.error}), ${when}`
-      : `Override pack: synced ${when}` + PACK_CHANGES
+    const text = p.error ? `Builtin rules: update failed (${p.error}), ${when}`
+      : `Builtin rules: updated ${when}` + PACK_CHANGES
         .filter((k) => p[k] && p[k].length).map((k) => `; ${k} ${p[k].join(", ")}`).join("");
     box.append(el("p", { class: `text-sm mt-2 ${p.error || (p.failed && p.failed.length) ? "text-amber-600" : "text-gray-500"}` }, text));
     for (const f of p.failed || []) box.append(el("p", { class: "text-sm text-amber-600" }, f));
@@ -70,7 +70,7 @@ const OPTIONS = [
   ["use_quirks", "Apply the built-in fixes for known non-standard devices"],
   ["expose_unused", "Show dps no entity uses, as plain properties"],
   ["allow_hazardous", "Allow controlling hazardous covers (garage doors, gates)"],
-  ["pack", "Download fixes for non-standard devices published between releases (into custom converters)"],
+  ["pack", "Automatically update builtin rules at start and daily"],
 ];
 
 async function settingsBox(ctx) {

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/src/rustuya_local/service.py

@@ -16,7 +16,7 @@ integration, the rustuya-manager plugin or a daemon) serves them, since every de
 `online` that nobody answers for (a Last Will lost with the broker, or a producer on tuya2ildevice < 0.3.5) does not
 stop the start.
 
-With `pack` on, the override pack (tuya2ildevice's `rules/pack/`) is copied into the overrides directory in the background at
+With `pack` on, the override pack (tuya2ildevice's `rules/builtin/`) is copied into the overrides directory in the background at
 start and every `pack_interval` seconds; the directory watcher loads what it brings.
 
 A device's settings (a cover's direction toggles, tuya2ildevice's `device_settings`) are IL properties like any other;
@@ -249,7 +249,12 @@ class Service:
         while True:
             self._pack_now.clear()
             try:
-                result = await run_in_thread(pack.sync, directory, base_url=url)
+                # Retire unedited files owned by the old flat pack, preserving user files.
+                retired = await run_in_thread(pack.sync, directory, manifest={'files': []})
+                result = await run_in_thread(pack.sync, directory / 'rules' / 'builtin', base_url=url)
+                result.removed.extend(retired.removed)
+                result.kept.extend(retired.kept)
+                result.failed.extend(retired.failed)
                 self.pack_status = {"at": time.time(), **result.as_dict()}
             except pack.PackError as e:
                 _LOGGER.warning("override pack: %s", e)

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/tests/e2e/test_service.py

@@ -201,7 +201,14 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
     monkeypatch.setattr(bc.BridgeClient, "start", lambda self, timeout=0.05: orig(self, timeout))
     served, conv = tmp_path / "served", tmp_path / "conv"
     served.mkdir()
-    fix = json.dumps({"lamp1": {"label": "Packed"}})
+    conv.mkdir()
+    (conv / '00_pack_old.json').write_text('{}')
+    (conv / '00_pack_edited.json').write_text('{"overrides": {}}')
+    (conv / '.tuya2ildevice_pack.json').write_text(json.dumps({'files': {
+        '00_pack_old.json': hashlib.sha256(b'{}').hexdigest(),
+        '00_pack_edited.json': hashlib.sha256(b'{}').hexdigest(),
+    }}))
+    fix = json.dumps({"overrides": {"lamp1": {"device": {"label": "Packed"}}}})
     (served / "00_pack_lamp.json").write_text(fix)
     (served / "manifest.json").write_text(json.dumps({"version": 1, "files": [
         {"name": "00_pack_lamp.json", "sha256": hashlib.sha256(fix.encode()).hexdigest()}]}))
@@ -212,8 +219,10 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
         if service.pack_status:
             break
         await asyncio.sleep(0.02)
-    assert service.pack_status["added"] == ["00_pack_lamp.json"] and (conv / "00_pack_lamp.json").is_file()
-    (conv / "00_pack_lamp.json").unlink()
+    assert service.pack_status["added"] == ["00_pack_lamp.json"] and (conv / "rules" / "builtin" / "00_pack_lamp.json").is_file()
+    assert not (conv / '00_pack_old.json').exists()
+    assert (conv / '00_pack_edited.json').read_text() == '{"overrides": {}}'
+    (conv / "rules" / "builtin" / "00_pack_lamp.json").unlink()
     first, service.pack_status = service.pack_status, None
     assert service.sync_pack_now()                                      # not a day later: now
     for _ in range(100):
@@ -230,7 +239,7 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
         if service.pack_status:
             break
         await asyncio.sleep(0.02)
-    assert "error" in service.pack_status and (conv / "00_pack_lamp.json").is_file()
+    assert "error" in service.pack_status and (conv / "rules" / "builtin" / "00_pack_lamp.json").is_file()
     await service.stop()
 
 
@@ -333,9 +342,11 @@ async def test_stop_waits_for_an_override_pack_write_in_progress(tmp_path, monke
     entered = asyncio.Event()
     release = threading.Event()
     loop = asyncio.get_running_loop()
-    path = tmp_path / 'conv' / '00_pack_test.json'
+    path = tmp_path / 'conv' / 'rules' / 'builtin' / '00_pack_test.json'
 
-    def blocked_sync(directory, *, base_url):
+    def blocked_sync(directory, *, base_url=pack.BASE_URL, manifest=None):
+        if manifest is not None:
+            return pack.SyncResult()
         loop.call_soon_threadsafe(entered.set)
         if not release.wait(5):
             raise TimeoutError('test did not release pack sync')
@@ -346,7 +357,7 @@ async def test_stop_waits_for_an_override_pack_write_in_progress(tmp_path, monke
     monkeypatch.setattr(pack, 'sync', blocked_sync)
     t = Transports()
     await t.bridge.publish('rustuya/bridge/config', '{}', 1, True)
-    service = _service(t, tmp_path, overrides_path=path.parent, pack=True)
+    service = _service(t, tmp_path, overrides_path=tmp_path / 'conv', pack=True)
     await service.start()
     stopping = None
     try:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/tests/unit/test_dropin.py

@@ -21,7 +21,7 @@ def test_one_package_with_tuya2ildevice_inside(tmp_path):
     for needed in ("rustuya_local/__init__.py", "rustuya_local/manager_plugin/static/index.js",
                    "rustuya_local/_vendor/tuya2ildevice/__init__.py", "rustuya_local/_vendor/tuya2ildevice/native.py"):
         assert needed in names
-    assert "rustuya_local/_vendor/tuya2ildevice/rules/00-default.json" in names
+    assert "rustuya_local/_vendor/tuya2ildevice/rules/builtin/00-default.json" in names
     assert any(n.startswith("rustuya_local/_vendor/tuya2ildevice/") and n.endswith((".so", ".dll", ".dylib"))
                for n in names)
     assert not any("__pycache__" in n or n.startswith("rustuya_local/_vendor/paho") for n in names)

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/tests/unit/test_pack.py

@@ -10,7 +10,7 @@ import pytest
 from rustuya_local.host import load_overrides, pack
 from rustuya_local.host.pack import LEDGER, PackError, read_ledger, sync
 
-PUBLISHED = Path(__file__).resolve().parents[3] / "tuya2ildevice" / "rules" / "pack"       # the sibling checkout
+PUBLISHED = Path(__file__).resolve().parents[3] / "tuya2ildevice" / "rules" / "builtin"       # the sibling checkout
 
 
 def sha(text: str) -> str:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev4}/tests/unit/test_rule_files.py

@@ -53,7 +53,7 @@ def test_watcher_reloads_global_rules_and_restores_defaults_after_removal(tmp_pa
 
 
 
-def test_host_uses_global_filename_order_for_rule_layers(tmp_path):
+def test_host_applies_user_layers_after_bundled_rules(tmp_path):
     write(tmp_path / '000_before_base.json', {'maps': {'switch_on': {'probe': True}}})
     write(tmp_path / '10_after_base.json', {'overrides': {'p': {'device': {'label': 'user'}}}})
     loaded = load_overrides(tmp_path)
@@ -168,3 +168,29 @@ def test_failed_adoption_releases_the_candidate_and_keeps_the_existing_drivers(m
         assert candidate not in _pack_users and not unregister_rules(candidate)
     finally:
         hub.close()
+
+
+def test_official_manifest_is_not_a_rule_and_user_files_run_last(tmp_path):
+    builtin = tmp_path / 'rules' / 'builtin'
+    builtin.mkdir(parents=True)
+    write(builtin / 'manifest.json', {'version': 1, 'files': []})
+    write(builtin / '99_official.json', {'overrides': {'p': {'device': {'label': 'official'}}}})
+    write(tmp_path / '000_user.json', {'overrides': {'p': {'device': {'label': 'user'}}}})
+    loaded = load_overrides(tmp_path)
+    assert not loaded.warnings
+    assert TuyaDriver(DEVICE, rules=loaded.rules).descriptor['label'] == 'user'
+
+
+def test_watcher_follows_downloaded_official_rules(tmp_path):
+    builtin = tmp_path / 'rules' / 'builtin'
+    builtin.mkdir(parents=True)
+    watcher = OverrideWatcher(tmp_path, None)
+    assert watcher.check()
+    path = builtin / '10_official.json'
+    write(path, {'overrides': {'p': {'device': {'label': 'downloaded'}}}})
+    assert watcher.check()
+    assert watcher.load().overrides['p']['device']['label'] == 'downloaded'
+    assert not watcher.check()
+    path.unlink()
+    assert watcher.check()
+    assert watcher.load().overrides.get('p', {}).get('device', {}).get('label') != 'downloaded'

rustuya_local-0.1.0.dev2/release-notes.md

@@ -1,11 +0,0 @@
-### Fixed
-- Serialize device setting saves and override reloads so simultaneous commands preserve every device's settings,
-  including when a save is cancelled during file work.
-- Release a Hub's native rule pack on service shutdown, failed construction, and failed rule replacement; retain
-  shared packs until their last owner releases them.
-- Remove Runner reconnect callbacks and subscriptions on shutdown or failed startup, and await background cleanup.
-- Retry transient override-loading failures and read watched device files off the event loop.
-
-### Changed
-- Share atomic file replacement across settings, converter files and the override pack, using unique temporary files.
-- Refresh the roadmap and document the cover motion-source selector and position-source settings.