GO-3938 Merge main

2025-06-08 05:47:07 +09:00 · 2025-04-17 17:09:46 +03:00 · 2025-04-17 17:09:46 +03:00 · 0c8992e42c
commit 0c8992e42c
parent 079e7242d4 87a102ef23
108 changed files with 8865 additions and 5433 deletions
--- a/docs/proto.md
+++ b/docs/proto.md
@ -1137,6 +1137,10 @@
    - [Rpc.ObjectType.Relation.Remove.Request](#anytype-Rpc-ObjectType-Relation-Remove-Request)
    - [Rpc.ObjectType.Relation.Remove.Response](#anytype-Rpc-ObjectType-Relation-Remove-Response)
    - [Rpc.ObjectType.Relation.Remove.Response.Error](#anytype-Rpc-ObjectType-Relation-Remove-Response-Error)
+    - [Rpc.ObjectType.ResolveLayoutConflicts](#anytype-Rpc-ObjectType-ResolveLayoutConflicts)
+    - [Rpc.ObjectType.ResolveLayoutConflicts.Request](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Request)
+    - [Rpc.ObjectType.ResolveLayoutConflicts.Response](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response)
+    - [Rpc.ObjectType.ResolveLayoutConflicts.Response.Error](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error)
    - [Rpc.Process](#anytype-Rpc-Process)
    - [Rpc.Process.Cancel](#anytype-Rpc-Process-Cancel)
    - [Rpc.Process.Cancel.Request](#anytype-Rpc-Process-Cancel-Request)
@ -1480,6 +1484,7 @@
    - [Rpc.Chat.SubscribeLastMessages.Response.Error.Code](#anytype-Rpc-Chat-SubscribeLastMessages-Response-Error-Code)
    - [Rpc.Chat.SubscribeToMessagePreviews.Response.Error.Code](#anytype-Rpc-Chat-SubscribeToMessagePreviews-Response-Error-Code)
    - [Rpc.Chat.ToggleMessageReaction.Response.Error.Code](#anytype-Rpc-Chat-ToggleMessageReaction-Response-Error-Code)
+    - [Rpc.Chat.Unread.ReadType](#anytype-Rpc-Chat-Unread-ReadType)
    - [Rpc.Chat.Unread.Response.Error.Code](#anytype-Rpc-Chat-Unread-Response-Error-Code)
    - [Rpc.Chat.Unsubscribe.Response.Error.Code](#anytype-Rpc-Chat-Unsubscribe-Response-Error-Code)
    - [Rpc.Chat.UnsubscribeFromMessagePreviews.Response.Error.Code](#anytype-Rpc-Chat-UnsubscribeFromMessagePreviews-Response-Error-Code)
@ -1614,6 +1619,7 @@
    - [Rpc.ObjectType.Recommended.RelationsSet.Response.Error.Code](#anytype-Rpc-ObjectType-Recommended-RelationsSet-Response-Error-Code)
    - [Rpc.ObjectType.Relation.Add.Response.Error.Code](#anytype-Rpc-ObjectType-Relation-Add-Response-Error-Code)
    - [Rpc.ObjectType.Relation.Remove.Response.Error.Code](#anytype-Rpc-ObjectType-Relation-Remove-Response-Error-Code)
+    - [Rpc.ObjectType.ResolveLayoutConflicts.Response.Error.Code](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error-Code)
    - [Rpc.Process.Cancel.Response.Error.Code](#anytype-Rpc-Process-Cancel-Response-Error-Code)
    - [Rpc.Process.Subscribe.Response.Error.Code](#anytype-Rpc-Process-Subscribe-Response-Error-Code)
    - [Rpc.Process.Unsubscribe.Response.Error.Code](#anytype-Rpc-Process-Unsubscribe-Response-Error-Code)
@ -1810,8 +1816,9 @@
    - [Event.Chat.Add](#anytype-Event-Chat-Add)
    - [Event.Chat.Delete](#anytype-Event-Chat-Delete)
    - [Event.Chat.Update](#anytype-Event-Chat-Update)
+    - [Event.Chat.UpdateMentionReadStatus](#anytype-Event-Chat-UpdateMentionReadStatus)
+    - [Event.Chat.UpdateMessageReadStatus](#anytype-Event-Chat-UpdateMessageReadStatus)
    - [Event.Chat.UpdateReactions](#anytype-Event-Chat-UpdateReactions)
-    - [Event.Chat.UpdateReadStatus](#anytype-Event-Chat-UpdateReadStatus)
    - [Event.Chat.UpdateState](#anytype-Event-Chat-UpdateState)
    - [Event.File](#anytype-Event-File)
    - [Event.File.LimitReached](#anytype-Event-File-LimitReached)
@ -2213,6 +2220,7 @@
 | ObjectTypeRecommendedRelationsSet | [Rpc.ObjectType.Recommended.RelationsSet.Request](#anytype-Rpc-ObjectType-Recommended-RelationsSet-Request) | [Rpc.ObjectType.Recommended.RelationsSet.Response](#anytype-Rpc-ObjectType-Recommended-RelationsSet-Response) |  |
 | ObjectTypeRecommendedFeaturedRelationsSet | [Rpc.ObjectType.Recommended.FeaturedRelationsSet.Request](#anytype-Rpc-ObjectType-Recommended-FeaturedRelationsSet-Request) | [Rpc.ObjectType.Recommended.FeaturedRelationsSet.Response](#anytype-Rpc-ObjectType-Recommended-FeaturedRelationsSet-Response) |  |
 | ObjectTypeListConflictingRelations | [Rpc.ObjectType.ListConflictingRelations.Request](#anytype-Rpc-ObjectType-ListConflictingRelations-Request) | [Rpc.ObjectType.ListConflictingRelations.Response](#anytype-Rpc-ObjectType-ListConflictingRelations-Response) |  |
+| ObjectTypeResolveLayoutConflicts | [Rpc.ObjectType.ResolveLayoutConflicts.Request](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Request) | [Rpc.ObjectType.ResolveLayoutConflicts.Response](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response) |  |
 | HistoryShowVersion | [Rpc.History.ShowVersion.Request](#anytype-Rpc-History-ShowVersion-Request) | [Rpc.History.ShowVersion.Response](#anytype-Rpc-History-ShowVersion-Response) |  |
 | HistoryGetVersions | [Rpc.History.GetVersions.Request](#anytype-Rpc-History-GetVersions-Request) | [Rpc.History.GetVersions.Response](#anytype-Rpc-History-GetVersions-Response) |  |
 | HistorySetVersion | [Rpc.History.SetVersion.Request](#anytype-Rpc-History-SetVersion-Request) | [Rpc.History.SetVersion.Response](#anytype-Rpc-History-SetVersion-Response) |  |
@ -10856,7 +10864,7 @@ Get marks list in the selected range in text block.
 | chatObjectId | [string](#string) |  | id of the chat object |
 | afterOrderId | [string](#string) |  | read from this orderId; if empty - read from the beginning of the chat |
 | beforeOrderId | [string](#string) |  | read til this orderId |
-| lastDbTimestamp | [int64](#int64) |  | dbTimestamp from the last processed ChatState event(or GetMessages). Used to prevent race conditions |
+| lastStateId | [string](#string) |  | stateId from the last processed ChatState event(or GetMessages). Used to prevent race conditions |



@ -11084,7 +11092,8 @@ Get marks list in the selected range in text block.

 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| chatObjectId | [string](#string) |  | id of the chat object |
+| type | [Rpc.Chat.Unread.ReadType](#anytype-Rpc-Chat-Unread-ReadType) |  |  |
+| chatObjectId | [string](#string) |  |  |
 | afterOrderId | [string](#string) |  |  |


@ -16177,6 +16186,7 @@ DEPRECATED, GO-1926 |
 | ----- | ---- | ----- | ----------- |
 | error | [Rpc.Object.ImportUseCase.Response.Error](#anytype-Rpc-Object-ImportUseCase-Response-Error) |  |  |
 | event | [ResponseEvent](#anytype-ResponseEvent) |  |  |
+| startingObjectId | [string](#string) |  |  |



@ -18915,6 +18925,62 @@ Available undo/redo operations



+<a name="anytype-Rpc-ObjectType-ResolveLayoutConflicts"></a>
+
+### Rpc.ObjectType.ResolveLayoutConflicts
+
+
+
+
+
+
+
+<a name="anytype-Rpc-ObjectType-ResolveLayoutConflicts-Request"></a>
+
+### Rpc.ObjectType.ResolveLayoutConflicts.Request
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| typeObjectId | [string](#string) |  |  |
+
+
+
+
+
+
+<a name="anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response"></a>
+
+### Rpc.ObjectType.ResolveLayoutConflicts.Response
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| error | [Rpc.ObjectType.ResolveLayoutConflicts.Response.Error](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error) |  |  |
+
+
+
+
+
+
+<a name="anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error"></a>
+
+### Rpc.ObjectType.ResolveLayoutConflicts.Response.Error
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| code | [Rpc.ObjectType.ResolveLayoutConflicts.Response.Error.Code](#anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error-Code) |  |  |
+| description | [string](#string) |  |  |
+
+
+
+
+
+
 <a name="anytype-Rpc-Process"></a>

 ### Rpc.Process
@ -21265,6 +21331,7 @@ Middleware-to-front-end response, that can contain a NULL error or a non-NULL er
 | ----- | ---- | ----- | ----------- |
 | error | [Rpc.Workspace.Create.Response.Error](#anytype-Rpc-Workspace-Create-Response-Error) |  |  |
 | spaceId | [string](#string) |  |  |
+| startingObjectId | [string](#string) |  |  |



@ -23662,8 +23729,8 @@ Middleware-to-front-end response, that can contain a NULL error or a non-NULL er

 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| messages | 0 |  |
-| replies | 1 |  |
+| Messages | 0 |  |
+| Mentions | 1 |  |



@ -23720,6 +23787,18 @@ Middleware-to-front-end response, that can contain a NULL error or a non-NULL er



+<a name="anytype-Rpc-Chat-Unread-ReadType"></a>
+
+### Rpc.Chat.Unread.ReadType
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| Messages | 0 |  |
+| Mentions | 1 |  |
+
+
+
 <a name="anytype-Rpc-Chat-Unread-Response-Error-Code"></a>

 ### Rpc.Chat.Unread.Response.Error.Code
@ -25574,6 +25653,19 @@ Middleware-to-front-end response, that can contain a NULL error or a non-NULL er



+<a name="anytype-Rpc-ObjectType-ResolveLayoutConflicts-Response-Error-Code"></a>
+
+### Rpc.ObjectType.ResolveLayoutConflicts.Response.Error.Code
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| NULL | 0 |  |
+| UNKNOWN_ERROR | 1 |  |
+| BAD_INPUT | 2 |  |
+
+
+
 <a name="anytype-Rpc-Process-Cancel-Response-Error-Code"></a>

 ### Rpc.Process.Cancel.Response.Error.Code
@ -28562,7 +28654,6 @@ Precondition: user A opened a block
 | ----- | ---- | ----- | ----------- |
 | id | [string](#string) |  |  |
 | subIds | [string](#string) | repeated |  |
-| state | [model.ChatState](#anytype-model-ChatState) |  | Chat state. dbState should be persisted after rendered |



@ -28586,6 +28677,40 @@ Precondition: user A opened a block



+<a name="anytype-Event-Chat-UpdateMentionReadStatus"></a>
+
+### Event.Chat.UpdateMentionReadStatus
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| ids | [string](#string) | repeated |  |
+| isRead | [bool](#bool) |  |  |
+| subIds | [string](#string) | repeated |  |
+
+
+
+
+
+
+<a name="anytype-Event-Chat-UpdateMessageReadStatus"></a>
+
+### Event.Chat.UpdateMessageReadStatus
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| ids | [string](#string) | repeated |  |
+| isRead | [bool](#bool) |  |  |
+| subIds | [string](#string) | repeated |  |
+
+
+
+
+
+
 <a name="anytype-Event-Chat-UpdateReactions"></a>

 ### Event.Chat.UpdateReactions
@ -28603,23 +28728,6 @@ Precondition: user A opened a block



-<a name="anytype-Event-Chat-UpdateReadStatus"></a>
-
-### Event.Chat.UpdateReadStatus
-
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| ids | [string](#string) | repeated |  |
-| isRead | [bool](#bool) |  |  |
-| subIds | [string](#string) | repeated |  |
-
-
-
-
-
-
 <a name="anytype-Event-Chat-UpdateState"></a>

 ### Event.Chat.UpdateState
@ -28844,7 +28952,8 @@ Precondition: user A opened a block
 | chatAdd | [Event.Chat.Add](#anytype-Event-Chat-Add) |  |  |
 | chatUpdate | [Event.Chat.Update](#anytype-Event-Chat-Update) |  |  |
 | chatUpdateReactions | [Event.Chat.UpdateReactions](#anytype-Event-Chat-UpdateReactions) |  |  |
-| chatUpdateReadStatus | [Event.Chat.UpdateReadStatus](#anytype-Event-Chat-UpdateReadStatus) |  | received to update per-message read status (if needed to highlight the unread messages in the UI) |
+| chatUpdateMessageReadStatus | [Event.Chat.UpdateMessageReadStatus](#anytype-Event-Chat-UpdateMessageReadStatus) |  | received to update per-message read status (if needed to highlight the unread messages in the UI) |
+| chatUpdateMentionReadStatus | [Event.Chat.UpdateMentionReadStatus](#anytype-Event-Chat-UpdateMentionReadStatus) |  | received to update per-message mention read status (if needed to highlight the unread mentions in the UI) |
 | chatDelete | [Event.Chat.Delete](#anytype-Event-Chat-Delete) |  |  |
 | chatStateUpdate | [Event.Chat.UpdateState](#anytype-Event-Chat-UpdateState) |  | in case new unread messages received or chat state changed (e.g. message read on another device) |

@ -29814,6 +29923,7 @@ Precondition: user A and user B opened the same block
 | spaceDashboardId | [string](#string) |  |  |
 | profileId | [string](#string) |  |  |
 | analyticsId | [string](#string) |  |  |
+| startingPage | [string](#string) |  |  |



@ -29995,6 +30105,7 @@ Precondition: user A and user B opened the same block
 | marketplaceForceReindexCounter | [int32](#int32) |  |  |
 | reindexDeletedObjects | [int32](#int32) |  |  |
 | reindexParticipants | [int32](#int32) |  |  |
+| reindexChats | [int32](#int32) |  |  |



@ -30734,16 +30845,17 @@ Used to decode block meta only, without the content itself
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | id | [string](#string) |  | Unique message identifier |
-| orderId | [string](#string) |  | Used for subscriptions |
+| orderId | [string](#string) |  | Lexicographical id for message in order of tree traversal |
 | creator | [string](#string) |  | Identifier for the message creator |
 | createdAt | [int64](#int64) |  |  |
 | modifiedAt | [int64](#int64) |  |  |
-| addedAt | [int64](#int64) |  | Message received and added to db at |
+| stateId | [string](#string) |  | stateId is ever-increasing id (BSON ObjectId) for this message. Unlike orderId, this ID is ordered by the time messages are added. For example, it&#39;s useful to prevent accidental reading of messages from the past when a ChatReadMessages request is sent: a message from the past may appear, but the client is still unaware of it |
 | replyToMessageId | [string](#string) |  | Identifier for the message being replied to |
 | message | [ChatMessage.MessageContent](#anytype-model-ChatMessage-MessageContent) |  | Message content |
 | attachments | [ChatMessage.Attachment](#anytype-model-ChatMessage-Attachment) | repeated | Attachments slice |
 | reactions | [ChatMessage.Reactions](#anytype-model-ChatMessage-Reactions) |  | Reactions to the message |
 | read | [bool](#bool) |  | Message read status |
+| mentionRead | [bool](#bool) |  |  |



@ -30839,7 +30951,7 @@ Used to decode block meta only, without the content itself
 | ----- | ---- | ----- | ----------- |
 | messages | [ChatState.UnreadState](#anytype-model-ChatState-UnreadState) |  | unread messages |
 | mentions | [ChatState.UnreadState](#anytype-model-ChatState-UnreadState) |  | unread mentions |
-| dbTimestamp | [int64](#int64) |  | reflects the state of the chat db at the moment of sending response/event that includes this state |
+| lastStateId | [string](#string) |  | reflects the state of the chat db at the moment of sending response/event that includes this state |