From 187cb9fc3b140f64dd08b607603e4263c07dd48c Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Wed, 9 Apr 2025 14:41:02 +0200
Subject: [PATCH] DROID-3553 Protocol | Integrate 0.40.9 (#2268)

---
 gradle/libs.versions.toml              |  2 +-
 protocol/src/main/proto/commands.proto | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a8b4736a7..c5707701de 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-middlewareVersion = "v0.40.8"
+middlewareVersion = "v0.40.9"
 kotlinVersion = '2.0.21'
 kspVersion = "2.0.21-1.0.25"
 
diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto
index 675d539705..9c7120761c 100644
--- a/protocol/src/main/proto/commands.proto
+++ b/protocol/src/main/proto/commands.proto
@@ -1292,6 +1292,7 @@ message Rpc {
             message Response {
                 Error error = 1;
                 string spaceId = 2;
+                string startingObjectId = 3;
 
                 message Error {
                     Code code = 1;
@@ -3111,6 +3112,7 @@ message Rpc {
             message Response {
                 Error error = 1;
                 ResponseEvent event = 2;
+                string startingObjectId = 3;
 
                 message Error {
                     Code code = 1;
@@ -3484,6 +3486,27 @@ message Rpc {
                 }
             }
         }
+
+        message ResolveLayoutConflicts {
+            message Request {
+                string typeObjectId = 1;
+            }
+
+            message Response {
+                Error error = 1;
+
+                message Error {
+                    Code code = 1;
+                    string description = 2;
+
+                    enum Code {
+                        NULL = 0;
+                        UNKNOWN_ERROR = 1;
+                        BAD_INPUT = 2;
+                    }
+                }
+            }
+        }
     }
 
     message Relation {