@mhome/core-protocol 1.33.0 → 1.35.0

package/README.md

@@ -5,6 +5,13 @@ provider runtimes. Public `/app/*` contracts belong to
 `mhome-app-facade-api`; this crate owns internal MWS, authentication, LLM,
 Messaging normalization, Node runtime, and Storage contracts.
 
+The additive [`client_identity`](contract/client-identity.md) contract separates
+User and Space Client identity, installation ID and enrollment ID. Runtime ingress
+has not yet cut over to this contract; operation authorization remains separate.
+The additive [`space_access`](contract/space-access.md) contract defines the
+READ/WRITE/MANAGE hierarchy and its pure User/Space Client decision. It does not
+change runtime admission until adapters and operation classifications adopt it.
+
 MWS uses standard WebSocket Ping/Pong control frames for connection liveness.
 There are no application `pi`/`po` messages or auth `heartbeatInterval` field.
 The transport owns heartbeat timing and reports authenticated local connection

package/fixtures/camera-plugin-management.conformance.json

@@ -14,7 +14,9 @@
       "name": "watch set request",
       "value": {
         "deviceId": "camera-1",
-        "enabled": true
+        "settings": {
+          "watchMode": "auto"
+        }
       }
     },
     {
@@ -48,14 +50,19 @@
             "source": "onvif"
           }
         ],
-        "watchStates": [
+        "sources": [],
+        "cameraSettings": [
           {
-            "ok": true,
             "deviceId": "camera-1",
-            "enabled": false
+            "revision": 1,
+            "settings": {
+              "watchMode": "off",
+              "objectDetectionMode": "off",
+              "personDetectionMode": "off",
+              "recordMode": "off"
+            }
           }
-        ],
-        "sources": []
+        ]
       }
     },
     {
@@ -77,9 +84,14 @@
     {
       "name": "watch response",
       "value": {
-        "ok": true,
         "deviceId": "camera-1",
-        "enabled": true
+        "revision": 1,
+        "settings": {
+          "watchMode": "off",
+          "objectDetectionMode": "off",
+          "personDetectionMode": "off",
+          "recordMode": "off"
+        }
       }
     },
     {
@@ -109,7 +121,7 @@
         ],
         "devices": [],
         "onlineStates": [],
-        "watchStates": []
+        "cameraSettings": []
       }
     }
   ],
@@ -136,8 +148,8 @@
           }
         ],
         "onlineStates": [],
-        "watchStates": [],
-        "sources": []
+        "sources": [],
+        "cameraSettings": []
       }
     },
     {
@@ -156,6 +168,22 @@
         ],
         "onlineStates": []
       }
+    },
+    {
+      "name": "empty patch",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {}
+      }
+    },
+    {
+      "name": "invalid mode",
+      "value": {
+        "deviceId": "camera-1",
+        "settings": {
+          "watchMode": "on"
+        }
+      }
     }
   ]
 }

package/manifest/core.v1.json

@@ -1,6 +1,6 @@
 {
   "manifest": "mhome.core.v1",
-  "contractVersion": "1.33.0",
+  "contractVersion": "1.35.0",
   "protocols": {
     "agentGateway": {
       "submitTarget": "/agent/submit",
@@ -28,9 +28,9 @@
         "deviceList": "device/list",
         "managementSnapshot": "management/snapshot",
         "deviceRemove": "device/remove",
-        "watchStatus": "watch/status",
-        "watchSet": "watch/set",
-        "sourceRemove": "source/remove"
+        "sourceRemove": "source/remove",
+        "deviceSettingsGet": "device/settings/get",
+        "deviceSettingsUpdate": "device/settings/update"
       },
       "flows": {
         "deviceAdd": "device.add"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mhome/core-protocol",
-  "version": "1.33.0",
+  "version": "1.35.0",
   "description": "Build-time protocol artifacts for mhome.core",
   "license": "MIT",
   "repository": {

package/protocol.json

@@ -1,6 +1,6 @@
 {
   "protocol": "mhome.core",
-  "contractVersion": "1.33.0",
+  "contractVersion": "1.35.0",
   "manifest": "manifest/core.v1.json",
   "schemas": {
     "hostManagementRequest": "schema/host-management-request.v1.schema.json",

package/schema/camera-plugin-management.v1.schema.json

@@ -10,7 +10,7 @@
       "$ref": "#/$defs/deviceIdRequest"
     },
     {
-      "$ref": "#/$defs/watchSetRequest"
+      "$ref": "#/$defs/deviceSettingsUpdateRequest"
     },
     {
       "$ref": "#/$defs/managementSnapshot"
@@ -22,7 +22,7 @@
       "$ref": "#/$defs/deviceMutationResponse"
     },
     {
-      "$ref": "#/$defs/watchControlResponse"
+      "$ref": "#/$defs/deviceSettingsResponse"
     },
     {
       "$ref": "#/$defs/errorResponse"
@@ -49,23 +49,6 @@
       },
       "additionalProperties": false
     },
-    "watchSetRequest": {
-      "type": "object",
-      "required": [
-        "deviceId",
-        "enabled"
-      ],
-      "properties": {
-        "deviceId": {
-          "type": "string",
-          "minLength": 1
-        },
-        "enabled": {
-          "type": "boolean"
-        }
-      },
-      "additionalProperties": false
-    },
     "providerCatalogItem": {
       "type": "object",
       "required": [
@@ -183,34 +166,13 @@
       },
       "additionalProperties": false
     },
-    "watchControlResponse": {
-      "type": "object",
-      "required": [
-        "ok",
-        "deviceId",
-        "enabled"
-      ],
-      "properties": {
-        "ok": {
-          "type": "boolean"
-        },
-        "deviceId": {
-          "type": "string",
-          "minLength": 1
-        },
-        "enabled": {
-          "type": "boolean"
-        }
-      },
-      "additionalProperties": false
-    },
     "managementSnapshot": {
       "type": "object",
       "required": [
         "providers",
         "devices",
         "onlineStates",
-        "watchStates",
+        "cameraSettings",
         "sources"
       ],
       "properties": {
@@ -232,16 +194,16 @@
             "$ref": "#/$defs/onlineStateObservation"
           }
         },
-        "watchStates": {
+        "sources": {
           "type": "array",
           "items": {
-            "$ref": "#/$defs/watchControlResponse"
+            "$ref": "#/$defs/homeAssistantSource"
           }
         },
-        "sources": {
+        "cameraSettings": {
           "type": "array",
           "items": {
-            "$ref": "#/$defs/homeAssistantSource"
+            "$ref": "#/$defs/deviceSettingsResponse"
           }
         }
       },
@@ -359,6 +321,112 @@
         }
       },
       "additionalProperties": false
+    },
+    "cameraSettings": {
+      "type": "object",
+      "properties": {
+        "watchMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "objectDetectionMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "personDetectionMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "recordMode": {
+          "enum": [
+            "off",
+            "event"
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "watchMode",
+        "objectDetectionMode",
+        "personDetectionMode",
+        "recordMode"
+      ]
+    },
+    "cameraSettingsPatch": {
+      "type": "object",
+      "properties": {
+        "watchMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "objectDetectionMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "personDetectionMode": {
+          "enum": [
+            "off",
+            "auto"
+          ]
+        },
+        "recordMode": {
+          "enum": [
+            "off",
+            "event"
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "minProperties": 1
+    },
+    "deviceSettingsUpdateRequest": {
+      "type": "object",
+      "required": [
+        "deviceId",
+        "settings"
+      ],
+      "properties": {
+        "deviceId": {
+          "type": "string",
+          "minLength": 1
+        },
+        "settings": {
+          "$ref": "#/$defs/cameraSettingsPatch"
+        }
+      },
+      "additionalProperties": false
+    },
+    "deviceSettingsResponse": {
+      "type": "object",
+      "required": [
+        "deviceId",
+        "revision",
+        "settings"
+      ],
+      "properties": {
+        "deviceId": {
+          "type": "string",
+          "minLength": 1
+        },
+        "revision": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "settings": {
+          "$ref": "#/$defs/cameraSettings"
+        }
+      },
+      "additionalProperties": false
     }
   }
 }