From ada47f9c4a69393bbd35d5e14c58dbabea14ba9d Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Fri, 3 Jul 2026 21:41:57 +0100
Subject: [PATCH 01/27] add pr summary workflow

---
 .github/workflows/opencode.yml   | 38 ---------------------
 .github/workflows/pr-summary.yml | 57 ++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/opencode.yml
 create mode 100644 .github/workflows/pr-summary.yml

diff --git a/.github/workflows/opencode.yml b/.github/workflows/opencode.yml
deleted file mode 100644
index 5193aa14..00000000
--- a/.github/workflows/opencode.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: opencode
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-
-jobs:
-  opencode:
-    runs-on: ubuntu-latest
-
-    if: |
-      contains(github.event.comment.body, ' /oc') ||
-      startsWith(github.event.comment.body, '/oc') ||
-      contains(github.event.comment.body, ' /opencode') ||
-      startsWith(github.event.comment.body, '/opencode')
-
-    timeout-minutes: 10
-
-    permissions:
-      id-token: write
-      contents: read
-      pull-requests: read
-      issues: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      - name: Run opencode
-        uses: anomalyco/opencode/github@latest
-        env:
-          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
-        with:
-          model: opencode-go/deepseek-v4-flash
diff --git a/.github/workflows/pr-summary.yml b/.github/workflows/pr-summary.yml
new file mode 100644
index 00000000..79a181c9
--- /dev/null
+++ b/.github/workflows/pr-summary.yml
@@ -0,0 +1,57 @@
+name: Summarise
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  summarise:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - name: Get opencode version
+        id: version
+        run: |
+          VERSION=$(curl -sf https://api.github.com/repos/anomalyco/opencode/releases/latest | grep -o '"tag_name": *"[^"]*"' | cut -d'"' -f4)
+          echo "version=${VERSION:-latest}" >> "$GITHUB_OUTPUT"
+
+      - name: Cache opencode
+        id: cache
+        uses: actions/cache@v5
+        with:
+          path: ~/.opencode/bin
+          key: opencode-${{ runner.os }}-${{ runner.arch }}-${{ steps.version.outputs.version }}
+
+      - name: Install opencode
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: curl -fsSL https://opencode.ai/install | bash
+
+      - name: Generate and apply summary
+        env:
+          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          MODEL: opencode-go/deepseek-v4-flash
+        run: |
+          set -euo pipefail
+          export PATH="$HOME/.opencode/bin:$PATH"
+          PROMPT="$(cat <<'EOF'
+          Summarise the changes in this pull request at a high level.
+          1-5 paragraphs. Each paragraph must start with a bolded theme title of a few words on its own line (e.g. **Authentication overhaul**), followed by one bullet point for each individual point within that theme.
+          Separate paragraphs with a blank line.
+          Focus on substantive changes. Skip tests, fixtures, formatting and wiring unless they are the point of the PR.
+          Describe what changed and why, not how it works internally.
+          No preamble, no restating the title, no judgements.
+          EOF
+          )"
+          BODY="$(gh pr diff "$PR_NUMBER" | opencode run --model "$MODEL" "$PROMPT")"
+          gh pr edit "$PR_NUMBER" --body "$BODY"

From 306c144b9bcf9ab363af76ef7905327a02d4a9c6 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Fri, 3 Jul 2026 21:42:37 +0100
Subject: [PATCH 02/27] remove the deprecated GetStat() function

---
 Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs
index 6856f38c..a58ba34a 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/StatsAPI.cs	
@@ -18,12 +18,6 @@ public async Task<Stat[]> GetStats()
             return res.stats;
         }
 
-        [Obsolete("Use Find(string internalName) instead.")]
-        public async Task<Stat> GetStat(string internalName)
-        {
-            return await Find(internalName);
-        }
-
         public async Task<Stat> Find(string internalName)
         {
             var uri = new Uri($"{baseUrl}/{internalName}");

From 7bbf077b02f7e9c31cde5e15b263164b90501d72 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Fri, 3 Jul 2026 21:56:36 +0100
Subject: [PATCH 03/27] remove the deprecated GetChannels(int page) signature

---
 Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index a6391583..54a08a4c 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -147,12 +147,6 @@ public async Task<ChannelsIndexResponse> GetChannels(GetChannelsOptions options
             return res;
         }
 
-        [Obsolete("Use GetChannels(GetChannelsOptions options) instead.")]
-        public async Task<ChannelsIndexResponse> GetChannels(int page)
-        {
-            return await GetChannels(new GetChannelsOptions { page = page });
-        }
-
         public async Task<Channel[]> GetSubscribedChannels(GetSubscribedChannelsOptions options = null)
         {
             Talo.IdentityCheck();

From dda54281f2768d1d9aeff7feceb1fc88ff7002f1 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:25:25 +0100
Subject: [PATCH 04/27] remove the deprecated CreatePrivate function

---
 .../Talo/Runtime/APIs/ChannelsAPI.cs                | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index 54a08a4c..3f183f77 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -212,19 +212,6 @@ public async Task<Channel> Create(string name, bool autoCleanup = false, params
             return await SendCreateChannelRequest(options);
         }
 
-        [Obsolete("Use Create(CreateChannelOptions options) instead.")]
-        public async Task<Channel> CreatePrivate(string name, bool autoCleanup = false, params (string, string)[] propTuples)
-        {
-            var options = new CreateChannelOptions
-            {
-                name = name,
-                autoCleanup = autoCleanup,
-                props = propTuples,
-                isPrivate = true
-            };
-            return await SendCreateChannelRequest(options);
-        }
-
         public async Task<Channel> Join(int channelId)
         {
             Talo.IdentityCheck();

From bfa8250d85717b50be90357b92a6bed638e1e2bc Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:30:46 +0100
Subject: [PATCH 05/27] remove the deprecated Create overload for channels

---
 .../Talo/Runtime/APIs/ChannelsAPI.cs                | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index 3f183f77..07ed6662 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -199,19 +199,6 @@ public async Task<Channel> Create(CreateChannelOptions options)
             return await SendCreateChannelRequest(options);
         }
 
-        [Obsolete("Use Create(CreateChannelOptions options) instead.")]
-        public async Task<Channel> Create(string name, bool autoCleanup = false, params (string, string)[] propTuples)
-        {
-            var options = new CreateChannelOptions
-            {
-                name = name,
-                autoCleanup = autoCleanup,
-                props = propTuples,
-                isPrivate = false
-            };
-            return await SendCreateChannelRequest(options);
-        }
-
         public async Task<Channel> Join(int channelId)
         {
             Talo.IdentityCheck();

From f95e8cab977c9b56006a699f97b5a78540ebbe2a Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:35:31 +0100
Subject: [PATCH 06/27] remove the deprecated GetEntriesForCurrentPlayer()
 functions

---
 .../Talo/Runtime/APIs/LeaderboardsAPI.cs      | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
index 9420c4c1..3541f0eb 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
@@ -85,17 +85,6 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, Ge
             return res;
         }
 
-        [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) with the aliasId or playerId option instead.")]
-        public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, GetEntriesOptions options = null)
-        {
-            Talo.IdentityCheck();
-
-            options ??= new GetEntriesOptions();
-            options.aliasId = Talo.CurrentAlias.id;
-
-            return await GetEntries(internalName, options);
-        }
-
         [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) instead.")]
         public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page, int aliasId = -1, bool includeArchived = false)
         {
@@ -107,19 +96,6 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, in
             });
         }
 
-        [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) with the aliasId or playerId option instead.")]
-        public async Task<LeaderboardEntriesResponse> GetEntriesForCurrentPlayer(string internalName, int page, bool includeArchived = false)
-        {
-            Talo.IdentityCheck();
-
-            return await GetEntries(internalName, new GetEntriesOptions
-            {
-                page = page,
-                aliasId = Talo.CurrentAlias.id,
-                includeArchived = includeArchived
-            }); 
-        }
-
         public async Task<(LeaderboardEntry, bool)> AddEntry(string internalName, float score, params (string, string)[] propTuples)
         {
             Talo.IdentityCheck();

From 832b60b38300c5223aaab44799a68544f2c7790a Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:45:05 +0100
Subject: [PATCH 07/27] remove the deprecated GetCacheEntriesForCurrentPlayer()
 function

---
 .../Talo/Runtime/APIs/LeaderboardsAPI.cs                  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
index 3541f0eb..eb3380d1 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
@@ -60,14 +60,6 @@ public List<LeaderboardEntry> GetCachedEntries(string internalName, GetCachedEnt
             );
         }
 
-        [Obsolete("Use GetCachedEntries(string internalName, GetCachedEntriesOptions options) with the aliasId or playerId option instead.")]
-        public List<LeaderboardEntry> GetCachedEntriesForCurrentPlayer(string internalName)
-        {
-            Talo.IdentityCheck();
-
-            return _entriesManager.GetEntries(internalName).FindAll(e => e.playerAlias.id == Talo.CurrentAlias.id);
-        }
-
         public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, GetEntriesOptions options = null)
         {
             options ??= new GetEntriesOptions();

From 4ccb0575e8ffabd9b2a51d1b491b2aa44fd0104a Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 11:49:13 +0100
Subject: [PATCH 08/27] remove the deprecated GetEntries overload

---
 .../Talo/Runtime/APIs/LeaderboardsAPI.cs              | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
index eb3380d1..39703076 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
@@ -77,17 +77,6 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, Ge
             return res;
         }
 
-        [Obsolete("Use GetEntries(string internalName, GetEntriesOptions options) instead.")]
-        public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, int page, int aliasId = -1, bool includeArchived = false)
-        {
-            return await GetEntries(internalName, new GetEntriesOptions
-            {
-                page = page,
-                aliasId = aliasId,
-                includeArchived = includeArchived
-            });
-        }
-
         public async Task<(LeaderboardEntry, bool)> AddEntry(string internalName, float score, params (string, string)[] propTuples)
         {
             Talo.IdentityCheck();

From b0828b7871e8b1233118be09ad24e42caf773177 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 12:55:40 +0100
Subject: [PATCH 09/27] replace ChannelStoragePropError with RejectedProp

---
 .../Talo/Runtime/APIs/ChannelsAPI.cs                   |  2 +-
 .../Responses/ChannelStoragePropsSetResponse.cs        | 10 +---------
 .../Scripts/ChannelStorageDemoUIController.cs          |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index 07ed6662..196d3b42 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -87,7 +87,7 @@ public class ChannelsAPI : BaseAPI
         public event Action<Channel> OnChannelDeleted;
         public event Action<Channel, string[]> OnChannelUpdated;
         public event Action<RejectedProp[]> OnChannelPropsRejected;
-        public event Action<Channel, ChannelStoragePropError[]> OnChannelStoragePropsFailedToSet;
+        public event Action<Channel, RejectedProp[]> OnChannelStoragePropsFailedToSet;
         public event Action<Channel, ChannelStorageProp[], ChannelStorageProp[]> OnChannelStoragePropsUpdated;
 
         private readonly ChannelStorageManager _storageManager = new ();
diff --git a/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsSetResponse.cs b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsSetResponse.cs
index 25eaa6d2..e814a3d5 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsSetResponse.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Responses/ChannelStoragePropsSetResponse.cs	
@@ -2,18 +2,10 @@
 
 namespace TaloGameServices
 {
-    [Serializable]
-    public class ChannelStoragePropError
-    {
-        public string key;
-        public string error;
-        public string message;
-    }
-
     [Serializable]
     public class ChannelStoragePropsSetResponse
     {
         public Channel channel;
-        public ChannelStoragePropError[] failedProps;
+        public RejectedProp[] failedProps;
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs
index abe713d9..914db7c7 100644
--- a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
@@ -139,7 +139,7 @@ private async void OnChannelStoragePropsUpdated(Channel channel, ChannelStorageP
             }
         }
 
-        private void OnChannelStoragePropsFailedToSet(Channel channel, ChannelStoragePropError[] errors)
+        private void OnChannelStoragePropsFailedToSet(Channel channel, RejectedProp[] errors)
         {
             foreach (var prop in errors)
             {

From 7015d86723c07e62e9cf72b56e51604e01185541 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 13:14:50 +0100
Subject: [PATCH 10/27] return player alias from OnIdentified event

---
 .../Talo/Runtime/APIs/PlayersAPI.cs           | 30 ++++++++-----------
 .../Scripts/GameUIController.cs               |  4 +--
 .../Scripts/GlobalUIController.cs             |  2 +-
 .../Scripts/Players/IdentifyPlayer.cs         |  4 +--
 .../SavesDemo/Scripts/GlobalUIController.cs   |  4 +--
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
index 89c50074..b6bbc2a1 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
@@ -16,7 +16,7 @@ public enum DebouncedOperation
             Update
         }
 
-        public event Action<Player> OnIdentified;
+        public event Action<PlayerAlias> OnIdentified;
         public event Action OnIdentificationStarted;
         public event Action OnIdentificationFailed;
         public event Action OnIdentityCleared;
@@ -43,10 +43,10 @@ private async void OnConnectionRestored()
 
         public void InvokeIdentifiedEvent()
         {
-            OnIdentified?.Invoke(Talo.CurrentPlayer);
+            OnIdentified?.Invoke(Talo.CurrentAlias);
         }
 
-        private async Task<Player> HandleIdentifySuccess(PlayerAlias alias, string socketToken = "")
+        private async Task<PlayerAlias> HandleIdentifySuccess(PlayerAlias alias, string socketToken = "")
         {
             if (!Talo.IsOffline() && Talo.Socket.IsIdentified())
             {
@@ -61,10 +61,10 @@ private async Task<Player> HandleIdentifySuccess(PlayerAlias alias, string socke
 
             InvokeIdentifiedEvent();
 
-            return alias.player;
+            return alias;
         }
 
-        public async Task<Player> Identify(string service, string identifier)
+        public async Task<PlayerAlias> Identify(string service, string identifier)
         {
             OnIdentificationStarted?.Invoke();
 
@@ -92,27 +92,24 @@ public async Task<Player> Identify(string service, string identifier)
             }
         }
 
-        public async Task<Player> IdentifySteam(string ticket, string identityClient = "")
+        public async Task<PlayerAlias> IdentifySteam(string ticket, string identityClient = "")
         {
             if (string.IsNullOrEmpty(identityClient))
             {
-                await Identify("steam", ticket);
+                return await Identify("steam", ticket);
             }
             else
             {
-                await Identify("steam", $"{identityClient}:{ticket}");
+                return await Identify("steam", $"{identityClient}:{ticket}");
             }
-
-            return Talo.CurrentPlayer;
         }
 
-        public async Task<Player> IdentifyGooglePlayGames(string authCode)
+        public async Task<PlayerAlias> IdentifyGooglePlayGames(string authCode)
         {
-            await Identify("google_play_games", authCode);
-            return Talo.CurrentPlayer;
+            return await Identify("google_play_games", authCode);
         }
 
-        public async Task<Player> IdentifyGameCenter(
+        public async Task<PlayerAlias> IdentifyGameCenter(
             string publicKeyUrl,
             byte[] signature,
             byte[] salt,
@@ -132,8 +129,7 @@ string playerId
 
             var identifier = Uri.EscapeDataString(JsonUtility.ToJson(payload));
 
-            await Identify("game_center", identifier);
-            return Talo.CurrentPlayer;
+            return await Identify("game_center", identifier);
         }
 
         protected override async Task ExecuteDebouncedOperation(DebouncedOperation operation)
@@ -203,7 +199,7 @@ public async Task<Player> Find(string playerId)
             return res.player;
         }
 
-        private async Task<Player> IdentifyOffline(string service, string identifier)
+        private async Task<PlayerAlias> IdentifyOffline(string service, string identifier)
         {
             PlayerAlias offlineAlias;
             try
diff --git a/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs
index 09f6eb1f..8d70daa2 100644
--- a/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GameUIController.cs	
@@ -19,9 +19,9 @@ private void OnDisable()
             Talo.Players.OnIdentified -= OnIdentified;
         }
 
-        private void OnIdentified(Player player)
+        private void OnIdentified(PlayerAlias alias)
         {
-            root.Q<Label>("title").text = $"Hi, {Talo.CurrentAlias.identifier}";
+            root.Q<Label>("title").text = $"Hi, {alias.identifier}";
         }
 
         private async void OnLogoutClick()
diff --git a/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs
index 8a531144..9490f49e 100644
--- a/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/AuthenticationDemo/Scripts/GlobalUIController.cs	
@@ -22,7 +22,7 @@ private void OnDisable()
             Talo.Players.OnIdentified -= OnIdentified;
         }
 
-        private void OnIdentified(Player player)
+        private void OnIdentified(PlayerAlias alias)
         {
             GoToGame();
         }
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs
index de4b46ae..8ad51996 100644
--- a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/IdentifyPlayer.cs	
@@ -38,12 +38,12 @@ private async Task Identify()
             }
         }
 
-        private void OnIdentified(Player player)
+        private void OnIdentified(PlayerAlias alias)
         {
             var panel = GameObject.Find("APIs");
             if (panel != null)
             {
-                ResponseMessage.SetText($"Identified ({Talo.CurrentAlias.displayName})!");
+                ResponseMessage.SetText($"Identified ({alias.displayName})!");
                 panel.GetComponent<Image>().color = new Color(120 / 255f, 230 / 255f, 160 / 255f);
             }
         }
diff --git a/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs
index 6ca88da7..cebef74f 100644
--- a/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GlobalUIController.cs	
@@ -16,7 +16,7 @@ private void Awake()
 
             if (Talo.CurrentAlias != null)
             {
-                OnIdentified(Talo.CurrentPlayer);
+                OnIdentified(Talo.CurrentAlias);
             }
         }
 
@@ -32,7 +32,7 @@ private void OnDisable()
             Talo.Saves.OnSaveChosen -= OnSaveChosen;
         }
 
-        private async void OnIdentified(Player player)
+        private async void OnIdentified(PlayerAlias alias)
         {
             await Talo.Saves.GetSaves();
             SetDocumentVisibility(loginUI, DisplayStyle.None);

From b008629dfa2259f95c62752d4ee4c834cebd39d9 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 13:57:11 +0100
Subject: [PATCH 11/27] include error code in OnIdentificationFailed event

---
 .../Talo/Runtime/APIs/BaseAPI.cs              |  9 ++-
 .../Talo/Runtime/APIs/PlayersAPI.cs           | 20 +++---
 .../Talo/Runtime/Utils/IdentifyException.cs   | 62 +++++++++++++++++++
 .../Runtime/Utils/IdentifyException.cs.meta   |  2 +
 4 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs
 create mode 100644 Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs
index 7470e078..6d367940 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs	
@@ -145,7 +145,14 @@ protected async Task<string> Call(
                             return await Call(uri, method, content, headers, continuity);
                         }
 
-                        throw new PlayerAuthException(errorCode, new Exception(message));
+                        if (uri.AbsolutePath.Contains("/v1/players/auth/"))
+                        {
+                            throw new PlayerAuthException(errorCode, new Exception(message));
+                        }
+                        else
+                        {
+                            throw new RequestException(www.responseCode, new Exception(message), www.downloadHandler.text);
+                        }
                     }
                 }
             }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
index b6bbc2a1..4e14c7c0 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
@@ -18,7 +18,7 @@ public enum DebouncedOperation
 
         public event Action<PlayerAlias> OnIdentified;
         public event Action OnIdentificationStarted;
-        public event Action OnIdentificationFailed;
+        public event Action<IdentifyException> OnIdentificationFailed;
         public event Action OnIdentityCleared;
         public event Action<RejectedProp[]> OnPropsRejected;
 
@@ -75,21 +75,21 @@ public async Task<PlayerAlias> Identify(string service, string identifier)
 
             var uri = new Uri($"{baseUrl}/identify?service={service}&identifier={identifier}");
 
+            PlayersIdentifyResponse res;
             try
             {
                 var json = await Call(uri, "GET");
-
-                var res = JsonUtility.FromJson<PlayersIdentifyResponse>(json);
-                var alias = res.alias;
-                alias.WriteOfflineAlias();
-                return await HandleIdentifySuccess(alias, res.socketToken);
+                res = JsonUtility.FromJson<PlayersIdentifyResponse>(json);
             }
-            catch
+            catch (Exception ex)
             {
                 await Talo.PlayerAuth.SessionManager.ClearSession();
-                OnIdentificationFailed?.Invoke();
+                OnIdentificationFailed?.Invoke(IdentifyException.FromException(ex));
                 throw;
             }
+
+            res.alias.WriteOfflineAlias();
+            return await HandleIdentifySuccess(res.alias, res.socketToken);
         }
 
         public async Task<PlayerAlias> IdentifySteam(string ticket, string identityClient = "")
@@ -209,7 +209,7 @@ private async Task<PlayerAlias> IdentifyOffline(string service, string identifie
             catch
             {
                 PlayerAlias.DeleteOfflineAlias();
-                OnIdentificationFailed?.Invoke();
+                OnIdentificationFailed?.Invoke(new IdentifyException());
                 throw new Exception("Failed to parse offline player alias");
             }
 
@@ -218,7 +218,7 @@ private async Task<PlayerAlias> IdentifyOffline(string service, string identifie
                 return await HandleIdentifySuccess(offlineAlias);
             }
 
-            OnIdentificationFailed?.Invoke();
+            OnIdentificationFailed?.Invoke(new IdentifyException());
             throw new Exception("No offline player alias found");
         }
 
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs
new file mode 100644
index 00000000..3e019d57
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs	
@@ -0,0 +1,62 @@
+using System;
+using UnityEngine;
+
+namespace TaloGameServices
+{
+    public enum IdentifyErrorCode
+    {
+        UNKNOWN_ERROR,
+        IDENTIFIER_PROFANITY,
+        IDENTIFIER_TAKEN
+    }
+
+    public class IdentifyException : Exception
+    {
+        public IdentifyErrorCode ErrorCode { get; }
+
+        public IdentifyException(IdentifyErrorCode code = IdentifyErrorCode.UNKNOWN_ERROR)
+            : base(code.ToString())
+        {
+            ErrorCode = code;
+        }
+
+        public IdentifyException(IdentifyErrorCode code, Exception inner)
+            : base(code.ToString(), inner)
+        {
+            ErrorCode = code;
+        }
+
+        public static IdentifyException FromException(Exception ex)
+        {
+            if (ex is RequestException re && !string.IsNullOrEmpty(re.responseBody))
+            {
+                return FromResponse(re.responseBody);
+            }
+
+            return new IdentifyException();
+        }
+
+        private static IdentifyException FromResponse(string body)
+        {
+            if (string.IsNullOrEmpty(body))
+            {
+                return new IdentifyException();
+            }
+
+            try
+            {
+                var parsed = JsonUtility.FromJson<ErrorResponse>(body);
+                if (parsed != null && !string.IsNullOrEmpty(parsed.errorCode) &&
+                    Enum.TryParse(parsed.errorCode, out IdentifyErrorCode code))
+                {
+                    return new IdentifyException(code);
+                }
+            }
+            catch
+            {
+            }
+
+            return new IdentifyException();
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta
new file mode 100644
index 00000000..bd2ff2d3
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a6ca927edafd34429a5ae1699cca53b5
\ No newline at end of file

From 7db6eefc3719870611e4c19f0cad7f8969d838e7 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 14:11:29 +0100
Subject: [PATCH 12/27] make exceptions slightly more consistent

---
 .../Runtime/Utils/ContinuityReplayException.cs  |  2 +-
 .../Talo/Runtime/Utils/PlayerAuthException.cs   | 17 +++++++++++++----
 .../Talo/Runtime/Utils/SocketException.cs       | 17 +++++++++++++----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs
index 3ba32991..b646d20d 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs	
@@ -5,7 +5,7 @@ namespace TaloGameServices
 {
     public class ContinuityReplayException : Exception
     {
-        private List<Exception> _exceptions;
+        private readonly List<Exception> _exceptions;
         public List<Exception> Exceptions => _exceptions;
 
         public ContinuityReplayException(List<Exception> exceptions)
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs
index e2f94628..ce58ae66 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs	
@@ -23,26 +23,35 @@ public enum PlayerAuthErrorCode {
 
     public class PlayerAuthException : Exception
     {
-        public PlayerAuthErrorCode ErrorCode => GetErrorCode();
+        public PlayerAuthErrorCode ErrorCode { get; }
 
         public PlayerAuthException()
         {
+            ErrorCode = PlayerAuthErrorCode.API_ERROR;
         }
 
         public PlayerAuthException(string errorCode)
             : base(errorCode)
         {
+            ErrorCode = ParseErrorCode(errorCode);
         }
 
         public PlayerAuthException(string errorCode, Exception inner)
             : base(errorCode, inner)
         {
+            ErrorCode = ParseErrorCode(errorCode);
         }
 
-        private PlayerAuthErrorCode GetErrorCode()
+        private static PlayerAuthErrorCode ParseErrorCode(string errorCode)
         {
-            var errorCode = string.IsNullOrEmpty(Message) ? "API_ERROR" : Message;
-            return (PlayerAuthErrorCode)Enum.Parse(typeof(PlayerAuthErrorCode), errorCode);
+            if (string.IsNullOrEmpty(errorCode))
+            {
+                return PlayerAuthErrorCode.API_ERROR;
+            }
+
+            return Enum.TryParse(errorCode, out PlayerAuthErrorCode code)
+                ? code
+                : PlayerAuthErrorCode.API_ERROR;
         }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs
index 9268a3ec..af632b34 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs	
@@ -21,29 +21,38 @@ public class SocketException : Exception
         private readonly SocketError errorData;
 
         public string Req => errorData?.req ?? "unknown";
-        public SocketErrorCode ErrorCode => GetErrorCode();
+        public SocketErrorCode ErrorCode { get; }
         public string Cause => errorData?.cause ?? "";
 
         public SocketException()
         {
+            ErrorCode = SocketErrorCode.API_ERROR;
         }
 
         public SocketException(SocketError errorData)
             : base(errorData.message)
         {
             this.errorData = errorData;
+            ErrorCode = ParseErrorCode(errorData?.errorCode);
         }
 
         public SocketException(SocketError errorData, Exception inner)
             : base(errorData.message, inner)
         {
             this.errorData = errorData;
+            ErrorCode = ParseErrorCode(errorData?.errorCode);
         }
 
-        private SocketErrorCode GetErrorCode()
+        private static SocketErrorCode ParseErrorCode(string errorCode)
         {
-            var errorCode = string.IsNullOrEmpty(errorData?.errorCode) ? "API_ERROR" : errorData.errorCode;
-            return (SocketErrorCode)Enum.Parse(typeof(SocketErrorCode), errorCode);
+            if (string.IsNullOrEmpty(errorCode))
+            {
+                return SocketErrorCode.API_ERROR;
+            }
+        
+            return Enum.TryParse(errorCode, out SocketErrorCode code)
+                ? code
+                : SocketErrorCode.API_ERROR;
         }
     }
 }

From 4b21a7ccfc76b37043332b2b9062ee3b0d8be866 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Sat, 4 Jul 2026 14:13:03 +0100
Subject: [PATCH 13/27] move exceptions to their own folder

---
 Assets/Talo Game Services/Talo/Runtime/Exceptions.meta    | 8 ++++++++
 .../{Utils => Exceptions}/ContinuityReplayException.cs    | 0
 .../ContinuityReplayException.cs.meta                     | 0
 .../Runtime/{Utils => Exceptions}/IdentifyException.cs    | 0
 .../{Utils => Exceptions}/IdentifyException.cs.meta       | 0
 .../Runtime/{Utils => Exceptions}/PlayerAuthException.cs  | 0
 .../{Utils => Exceptions}/PlayerAuthException.cs.meta     | 0
 .../Runtime/{Utils => Exceptions}/RequestException.cs     | 0
 .../{Utils => Exceptions}/RequestException.cs.meta        | 0
 .../Talo/Runtime/{Utils => Exceptions}/SocketException.cs | 0
 .../Runtime/{Utils => Exceptions}/SocketException.cs.meta | 0
 unity.slnx                                                | 2 +-
 12 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 Assets/Talo Game Services/Talo/Runtime/Exceptions.meta
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/ContinuityReplayException.cs (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/ContinuityReplayException.cs.meta (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/IdentifyException.cs (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/IdentifyException.cs.meta (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/PlayerAuthException.cs (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/PlayerAuthException.cs.meta (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/RequestException.cs (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/RequestException.cs.meta (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/SocketException.cs (100%)
 rename Assets/Talo Game Services/Talo/Runtime/{Utils => Exceptions}/SocketException.cs.meta (100%)

diff --git a/Assets/Talo Game Services/Talo/Runtime/Exceptions.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions.meta
new file mode 100644
index 00000000..4d68c5a7
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Exceptions.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fe7598f29ba824a71a1983bf4801be12
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs b/Assets/Talo Game Services/Talo/Runtime/Exceptions/ContinuityReplayException.cs
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/ContinuityReplayException.cs
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions/ContinuityReplayException.cs.meta
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/ContinuityReplayException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/ContinuityReplayException.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs b/Assets/Talo Game Services/Talo/Runtime/Exceptions/IdentifyException.cs
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/IdentifyException.cs
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions/IdentifyException.cs.meta
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/IdentifyException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/IdentifyException.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs b/Assets/Talo Game Services/Talo/Runtime/Exceptions/PlayerAuthException.cs
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/PlayerAuthException.cs
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions/PlayerAuthException.cs.meta
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/PlayerAuthException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/PlayerAuthException.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs b/Assets/Talo Game Services/Talo/Runtime/Exceptions/RequestException.cs
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/RequestException.cs
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions/RequestException.cs.meta
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/RequestException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/RequestException.cs.meta
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs b/Assets/Talo Game Services/Talo/Runtime/Exceptions/SocketException.cs
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/SocketException.cs
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Exceptions/SocketException.cs.meta
similarity index 100%
rename from Assets/Talo Game Services/Talo/Runtime/Utils/SocketException.cs.meta
rename to Assets/Talo Game Services/Talo/Runtime/Exceptions/SocketException.cs.meta
diff --git a/unity.slnx b/unity.slnx
index fdbc512e..78ddfab3 100644
--- a/unity.slnx
+++ b/unity.slnx
@@ -1,7 +1,7 @@
 <Solution>
-  <Project Path="Talo.Runtime.csproj" />
   <Project Path="Assembly-CSharp.csproj" />
   <Project Path="asset-store-tools-editor.csproj" />
+  <Project Path="Talo.Runtime.csproj" />
   <Project Path="Talo.Tests.csproj" />
   <Project Path="MikeSchweitzer.WebSocket.csproj" />
   <Project Path="Assembly-CSharp-Editor.csproj" />

From 953f601e58cb325ef7b809178733cbaf34224a66 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Mon, 20 Jul 2026 23:40:20 +0100
Subject: [PATCH 14/27] json manipulation tests

---
 .../Talo Game Services/Talo/Tests/Prop.meta   |  8 +++++
 .../Talo/Tests/Prop/SanitiseJsonTest.cs       | 33 +++++++++++++++++++
 .../Talo/Tests/Prop/SanitiseJsonTest.cs.meta  |  2 ++
 .../Talo/Tests/SocketResponse.meta            |  8 +++++
 .../Tests/SocketResponse/GetJsonDataTest.cs   | 17 ++++++++++
 .../SocketResponse/GetJsonDataTest.cs.meta    |  2 ++
 6 files changed, 70 insertions(+)
 create mode 100644 Assets/Talo Game Services/Talo/Tests/Prop.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs
 create mode 100644 Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/SocketResponse.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs
 create mode 100644 Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs.meta

diff --git a/Assets/Talo Game Services/Talo/Tests/Prop.meta b/Assets/Talo Game Services/Talo/Tests/Prop.meta
new file mode 100644
index 00000000..cfcac54e
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/Prop.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 995caa0c857634f37b27a37a0f29d7b9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs b/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs
new file mode 100644
index 00000000..514f5f15
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs	
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+
+namespace TaloGameServices.Test
+{
+    internal class SanitiseJsonTest
+    {
+        [Test]
+        public void SanitiseJson_EmptyValue_ConvertsToNull()
+        {
+            var result = Prop.SanitiseJson("{\"key\":\"key1\",\"value\":\"\"}");
+
+            Assert.AreEqual("{\"key\":\"key1\",\"value\":null}", result);
+        }
+
+        [Test]
+        public void SanitiseJson_NonEmptyValue_LeftUnchanged()
+        {
+            var result = Prop.SanitiseJson("{\"key\":\"key1\",\"value\":\"hello\"}");
+
+            Assert.AreEqual("{\"key\":\"key1\",\"value\":\"hello\"}", result);
+        }
+
+        [Test]
+        public void SanitiseJson_MultipleProps_OnlyEmptyValuesConverted()
+        {
+            var input = "{\"key\":\"a\",\"value\":\"\"},{\"key\":\"b\",\"value\":\"x\"}";
+
+            var result = Prop.SanitiseJson(input);
+
+            Assert.AreEqual("{\"key\":\"a\",\"value\":null},{\"key\":\"b\",\"value\":\"x\"}", result);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs.meta
new file mode 100644
index 00000000..34dba07a
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/Prop/SanitiseJsonTest.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ca656ab35f7be4bbca0cabc6b1ea371f
\ No newline at end of file
diff --git a/Assets/Talo Game Services/Talo/Tests/SocketResponse.meta b/Assets/Talo Game Services/Talo/Tests/SocketResponse.meta
new file mode 100644
index 00000000..5771be61
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/SocketResponse.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7435509ca331f4fbc8e89cc9a4b1c989
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs b/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs
new file mode 100644
index 00000000..d407058b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs	
@@ -0,0 +1,17 @@
+using NUnit.Framework;
+
+namespace TaloGameServices.Test
+{
+    internal class GetJsonDataTest
+    {
+        [Test]
+        public void GetJsonData_ReturnsDataValueAsJsonString()
+        {
+            var response = new SocketResponse("{\"res\":\"v1.channels.message\",\"data\":{\"channel\":{\"id\":1,\"name\":\"test\"},\"message\":\"hello\"}}");
+
+            var data = response.GetJsonData();
+
+            Assert.AreEqual("{\"channel\":{\"id\":1,\"name\":\"test\"},\"message\":\"hello\"}", data);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs.meta
new file mode 100644
index 00000000..6b6eb3c9
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/SocketResponse/GetJsonDataTest.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 62e8196fb82d0462ea8110f4dc770e3f
\ No newline at end of file

From 86859e4f2b82715daaf818dba4e58b72ab2244db Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 21 Jul 2026 08:51:32 +0100
Subject: [PATCH 15/27] make channels.update use the update options pattern

---
 .../Talo/Runtime/APIs/ChannelsAPI.cs          |  39 +++---
 .../Requests/ChannelsUpdateOwnerRequest.cs    |  10 --
 .../ChannelsUpdateOwnerRequest.cs.meta        |   2 -
 .../Runtime/Requests/ChannelsUpdateRequest.cs |   9 --
 .../Requests/ChannelsUpdateRequest.cs.meta    |   2 -
 .../Talo/Runtime/Utils/JsonUtils.cs           |  50 ++++++++
 .../Talo/Runtime/Utils/JsonUtils.cs.meta      |   2 +
 .../Talo/Tests/JsonUtils.meta                 |   8 ++
 .../Talo/Tests/JsonUtils/BuildObjectTest.cs   | 111 ++++++++++++++++++
 .../Tests/JsonUtils/BuildObjectTest.cs.meta   |   2 +
 10 files changed, 198 insertions(+), 37 deletions(-)
 delete mode 100644 Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs
 delete mode 100644 Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta
 delete mode 100644 Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs
 delete mode 100644 Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta
 create mode 100644 Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs
 create mode 100644 Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/JsonUtils.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs
 create mode 100644 Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs.meta

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index 196d3b42..02668c37 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -67,9 +67,19 @@ public class CreateChannelOptions
     {
         public string name;
         public (string, string)[] props = Array.Empty<(string, string)>();
-        public bool autoCleanup = false;
-        public bool isPrivate = false;
-        public bool temporaryMembership = false;
+        public bool autoCleanup;
+        public bool isPrivate;
+        public bool temporaryMembership;
+    }
+
+    public class UpdateChannelOptions
+    {
+        public string name = "";
+        public int newOwnerAliasId = -1;
+        public (string, string)[] props = null;
+        public bool? autoCleanup = null;
+        public bool? isPrivate = null;
+        public bool? temporaryMembership = null;
     }
 
     public enum ChannelLeavingReason
@@ -218,23 +228,24 @@ public async Task Leave(int channelId)
             await Call(uri, "POST");
         }
 
-        public async Task<Channel> Update(int channelId, string name = "", int newOwnerAliasId = -1, params (string, string)[] propTuples)
+        public async Task<Channel> Update(int channelId, UpdateChannelOptions options = null)
         {
             Talo.IdentityCheck();
 
-            var props = propTuples.Select((propTuple) => new Prop(propTuple)).ToArray();
+            options ??= new UpdateChannelOptions();
 
             var uri = new Uri($"{baseUrl}/{channelId}");
 
-            var content = "";
-            if (newOwnerAliasId == -1)
-            {
-                content = JsonUtility.ToJson(new ChannelsUpdateRequest { name = name, props = props });
-            }
-            else
-            {
-                content = JsonUtility.ToJson(new ChannelsUpdateOwnerRequest { name = name, newOwnerAliasId = newOwnerAliasId, props = props });
-            }
+            var props = options.props?.Select((propTuple) => new Prop(propTuple)).ToArray();
+
+            var content = JsonUtils.BuildObject(
+                ("name", string.IsNullOrEmpty(options.name) ? null : options.name),
+                ("ownerAliasId", options.newOwnerAliasId == -1 ? null : options.newOwnerAliasId),
+                ("props", props),
+                ("autoCleanup", options.autoCleanup),
+                ("private", options.isPrivate),
+                ("temporaryMembership", options.temporaryMembership)
+            );
 
             try
             {
diff --git a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs
deleted file mode 100644
index 1cabea21..00000000
--- a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs	
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace TaloGameServices
-{
-    [System.Serializable]
-    public class ChannelsUpdateOwnerRequest
-    {
-        public string name;
-        public int newOwnerAliasId;
-        public Prop[] props;
-    }
-}
diff --git a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta
deleted file mode 100644
index 65852d30..00000000
--- a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateOwnerRequest.cs.meta	
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 6067ea0a81fd1455097a544ce372f3d4
\ No newline at end of file
diff --git a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs
deleted file mode 100644
index db03f51a..00000000
--- a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs	
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace TaloGameServices
-{
-    [System.Serializable]
-    public class ChannelsUpdateRequest
-    {
-        public string name;
-        public Prop[] props;
-    }
-}
diff --git a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta
deleted file mode 100644
index 82915b2f..00000000
--- a/Assets/Talo Game Services/Talo/Runtime/Requests/ChannelsUpdateRequest.cs.meta	
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: f39bcae3bbdcb47aca569d02e2f27c8e
\ No newline at end of file
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs
new file mode 100644
index 00000000..f8cca1a2
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs	
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using UnityEngine;
+
+namespace TaloGameServices
+{
+    public static class JsonUtils
+    {
+        public static string BuildObject(params (string key, object value)[] fields)
+        {
+            var parts = new List<string>();
+            foreach (var (key, value) in fields)
+            {
+                if (value == null)
+                {
+                    continue;
+                }
+                parts.Add($"\"{key}\":{SerializeValue(value)}");
+            }
+            return "{" + string.Join(",", parts) + "}";
+        }
+
+        private static string SerializeValue(object value)
+        {
+            if (value is Prop p) return SerializeProp(p);
+            if (value is Prop[] props) return "[" + string.Join(",", props.Select(SerializeProp)) + "]";
+            if (value is string s) return JsonEscape(s);
+            if (value is bool b) return b ? "true" : "false";
+            if (value is int i) return i.ToString();
+            if (value is long l) return l.ToString();
+            if (value is float f) return f.ToString(CultureInfo.InvariantCulture);
+            if (value is double d) return d.ToString(CultureInfo.InvariantCulture);
+            return JsonUtility.ToJson(value);
+        }
+
+        private static string SerializeProp(Prop p) => Prop.SanitiseJson(JsonUtility.ToJson(p));
+
+        [System.Serializable]
+        private class JsonString { public string v; }
+
+        private static string JsonEscape(string s)
+        {
+            // construct a json string and let JsonUtility handle the escaping
+            var json = JsonUtility.ToJson(new JsonString { v = s });
+            // strip {"v": prefix and trailing } from JsonUtility's {"v":"..."} output
+            return json.Substring(5, json.Length - 6);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs.meta b/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs.meta
new file mode 100644
index 00000000..e68ceea2
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/JsonUtils.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dafeaac7aede64f4abf3464c573221f5
\ No newline at end of file
diff --git a/Assets/Talo Game Services/Talo/Tests/JsonUtils.meta b/Assets/Talo Game Services/Talo/Tests/JsonUtils.meta
new file mode 100644
index 00000000..4049123f
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/JsonUtils.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cf383916212fe4ed284c5923d194cacb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs b/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs
new file mode 100644
index 00000000..06bcf01c
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs	
@@ -0,0 +1,111 @@
+using NUnit.Framework;
+
+namespace TaloGameServices.Test
+{
+    internal class BuildObjectTest
+    {
+        [Test]
+        public void BuildObject_NullFields_AreOmitted()
+        {
+            var json = JsonUtils.BuildObject(("name", null), ("score", 42));
+
+            Assert.AreEqual("{\"score\":42}", json);
+        }
+
+        [Test]
+        public void BuildObject_PropWithEmptyValue_SerializesAsNull()
+        {
+            var json = JsonUtils.BuildObject(("props", new Prop[] { new(("key1", "")) }));
+
+            Assert.AreEqual("{\"props\":[{\"key\":\"key1\",\"value\":null}]}", json);
+        }
+
+        [Test]
+        public void BuildObject_PropWithValue_SerializesAsString()
+        {
+            var json = JsonUtils.BuildObject(("props", new Prop[] { new(("key1", "hello")) }));
+
+            Assert.AreEqual("{\"props\":[{\"key\":\"key1\",\"value\":\"hello\"}]}", json);
+        }
+
+        [Test]
+        public void BuildObject_BoolValue_SerializesAsLiteral()
+        {
+            var json = JsonUtils.BuildObject(("enabled", true), ("disabled", false));
+
+            Assert.AreEqual("{\"enabled\":true,\"disabled\":false}", json);
+        }
+
+        [Test]
+        public void BuildObject_StringValue_SerializesAsQuotedString()
+        {
+            var json = JsonUtils.BuildObject(("name", "hello"));
+
+            Assert.AreEqual("{\"name\":\"hello\"}", json);
+        }
+
+        [Test]
+        public void BuildObject_IntValue_SerializesAsNumber()
+        {
+            var json = JsonUtils.BuildObject(("count", 42));
+
+            Assert.AreEqual("{\"count\":42}", json);
+        }
+
+        [Test]
+        public void BuildObject_LongValue_SerializesAsNumber()
+        {
+            var json = JsonUtils.BuildObject(("big", 9999999999L));
+
+            Assert.AreEqual("{\"big\":9999999999}", json);
+        }
+
+        [Test]
+        public void BuildObject_FloatValue_SerializesWithDotDecimal()
+        {
+            var json = JsonUtils.BuildObject(("rate", 1.5f));
+
+            Assert.AreEqual("{\"rate\":1.5}", json);
+        }
+
+        [Test]
+        public void BuildObject_DoubleValue_SerializesWithDotDecimal()
+        {
+            var json = JsonUtils.BuildObject(("rate", 2.5));
+
+            Assert.AreEqual("{\"rate\":2.5}", json);
+        }
+
+        [Test]
+        public void BuildObject_StringWithQuote_IsEscaped()
+        {
+            var json = JsonUtils.BuildObject(("name", "he said \"hi\""));
+
+            Assert.AreEqual("{\"name\":\"he said \\\"hi\\\"\"}", json);
+        }
+
+        [Test]
+        public void BuildObject_StringWithBackslash_IsEscaped()
+        {
+            var json = JsonUtils.BuildObject(("path", "a\\b"));
+
+            Assert.AreEqual("{\"path\":\"a\\\\b\"}", json);
+        }
+
+        [Test]
+        public void BuildObject_PropKeyWithQuote_IsEscaped()
+        {
+            var json = JsonUtils.BuildObject(("props", new Prop[] { new(("k\"y", "v")) }));
+
+            Assert.AreEqual("{\"props\":[{\"key\":\"k\\\"y\",\"value\":\"v\"}]}", json);
+        }
+
+        [Test]
+        public void BuildObject_PropValueWithBackslash_IsEscaped()
+        {
+            var json = JsonUtils.BuildObject(("props", new Prop[] { new(("k", "a\\b")) }));
+
+            Assert.AreEqual("{\"props\":[{\"key\":\"k\",\"value\":\"a\\\\b\"}]}", json);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs.meta
new file mode 100644
index 00000000..2c683104
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/JsonUtils/BuildObjectTest.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1778e5e9522d24e8e9077b3ae8bb66fe
\ No newline at end of file

From bfc3872691c32ad3738ad22505d279fbc24b7f0e Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 21 Jul 2026 22:08:50 +0100
Subject: [PATCH 16/27] lazy load offline path for player alias

---
 .../Talo/Runtime/Entities/PlayerAlias.cs           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs
index 8712e618..99decce3 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Entities/PlayerAlias.cs	
@@ -6,7 +6,9 @@ namespace TaloGameServices
     [System.Serializable]
     public class PlayerAlias
     {
-        private static readonly string offlineDataPath = Application.persistentDataPath + "/ta.bin";
+        private static string _offlineDataPath;
+        private static string OfflineDataPath =>
+            _offlineDataPath ??= Application.persistentDataPath + "/ta.bin";
 
         public int id;
         public string service, identifier, displayName;
@@ -26,12 +28,12 @@ public void WriteOfflineAlias()
             }
 
             var content = JsonUtility.ToJson(this);
-            Talo.Crypto.WriteFileContent(offlineDataPath, content);
+            Talo.Crypto.WriteFileContent(OfflineDataPath, content);
         }
 
         public static bool HasOfflineAlias()
         {
-            return Talo.Settings.cachePlayerOnIdentify && File.Exists(offlineDataPath);
+            return Talo.Settings.cachePlayerOnIdentify && File.Exists(OfflineDataPath);
         }
 
         public static PlayerAlias GetOfflineAlias()
@@ -41,16 +43,16 @@ public static PlayerAlias GetOfflineAlias()
                 return null;
             }
 
-            return JsonUtility.FromJson<PlayerAlias>(Talo.Crypto.ReadFileContent(offlineDataPath));
+            return JsonUtility.FromJson<PlayerAlias>(Talo.Crypto.ReadFileContent(OfflineDataPath));
         }
 
         public static void DeleteOfflineAlias()
         {
-            if (File.Exists(offlineDataPath))
+            if (File.Exists(OfflineDataPath))
             {
                 try
                 {
-                    File.Delete(offlineDataPath);
+                    File.Delete(OfflineDataPath);
                 }
                 catch (System.Exception ex)
                 {

From ba361a8fd1ed3f4377df0e206a4c2709d69a14ee Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 21 Jul 2026 22:10:47 +0100
Subject: [PATCH 17/27] remove redundant defaults for channel update options

---
 Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index 02668c37..ec6c9bf7 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -74,9 +74,9 @@ public class CreateChannelOptions
 
     public class UpdateChannelOptions
     {
-        public string name = "";
+        public string name;
         public int newOwnerAliasId = -1;
-        public (string, string)[] props = null;
+        public (string, string)[] props;
         public bool? autoCleanup = null;
         public bool? isPrivate = null;
         public bool? temporaryMembership = null;

From 97b03f0a20c2238a4a7c561fbf453a4221517b1c Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 21 Jul 2026 22:18:29 +0100
Subject: [PATCH 18/27] formatting for storage demo props

---
 .../Scripts/ChannelStorageDemoUIController.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs
index 914db7c7..97a998ae 100644
--- a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
@@ -60,9 +60,9 @@ private async Task SetupDemoChannel()
                 var createOptions = new CreateChannelOptions()
                 {
                     name = "Channel Storage Demo",
-                    props = new (string, string)[]
+                    props = new []
                     {
-                    ( "channel-storage-demo", "true" )
+                        ("channel-storage-demo", "true")
                     }
                 };
                 demoChannel = await Talo.Channels.Create(createOptions);

From cf0563a4689d7a4db892efd3e0aa29386377761c Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 4 Aug 2026 02:39:04 +0100
Subject: [PATCH 19/27] update pr summary model/condition

---
 .github/workflows/pr-summary.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-summary.yml b/.github/workflows/pr-summary.yml
index 79a181c9..74646170 100644
--- a/.github/workflows/pr-summary.yml
+++ b/.github/workflows/pr-summary.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   summarise:
+    if: ${{ !github.event.pull_request.body }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
@@ -40,7 +41,7 @@ jobs:
           OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
-          MODEL: opencode-go/deepseek-v4-flash
+          MODEL: opencode-go/mimo-v2.5-pro
         run: |
           set -euo pipefail
           export PATH="$HOME/.opencode/bin:$PATH"

From 927d4ff414fc26731619fe9c09229907115b407d Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 4 Aug 2026 20:43:23 +0100
Subject: [PATCH 20/27] update pr summary

---
 .github/workflows/pr-summary.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-summary.yml b/.github/workflows/pr-summary.yml
index 74646170..9cba9c3a 100644
--- a/.github/workflows/pr-summary.yml
+++ b/.github/workflows/pr-summary.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   summarise:
-    if: ${{ !github.event.pull_request.body }}
+    if: ${{ github.event.pull_request.author_association == 'MEMBER' }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
 

From c65b01042faed3a62bf40cb83c47c8d412c90d34 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 4 Aug 2026 02:03:32 +0100
Subject: [PATCH 21/27] allow player + save debounced updates to be handled
 synchronously

---
 AGENTS.md                                     |  10 +-
 .../Talo/Runtime/APIs/DebouncedAPI.cs         | 121 ++++++++--
 .../Talo/Runtime/APIs/PlayersAPI.cs           |  46 +++-
 .../Talo/Runtime/APIs/SavesAPI.cs             |  52 +++-
 .../Talo/Runtime/Entities/Player.cs           | 209 ++++++++--------
 .../Talo/Runtime/TaloManager.cs               |  19 +-
 .../Talo/Runtime/Utils/RequestMock.cs         |   4 +-
 .../Playground/Scripts/Players/SetProp.cs     |  33 +--
 .../SavesDemo/Scripts/GameUIController.cs     |  18 +-
 .../PlayersAPI/PlayerUpdatedEventTest.cs      | 225 ++++++++++++++++++
 .../PlayersAPI/PlayerUpdatedEventTest.cs.meta |   2 +
 .../Tests/SavesAPI/SaveUpdatedEventTest.cs    | 174 ++++++++++++++
 .../SavesAPI/SaveUpdatedEventTest.cs.meta     |   2 +
 CONTRIBUTING.md                               |   2 +-
 14 files changed, 747 insertions(+), 170 deletions(-)
 create mode 100644 Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs
 create mode 100644 Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs.meta
 create mode 100644 Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs
 create mode 100644 Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs.meta

diff --git a/AGENTS.md b/AGENTS.md
index 385b7252..e083762e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -45,18 +45,22 @@ The SDK supports offline operation via `TaloSettings.offlineMode`. When offline,
 Events are batched and flushed on application quit/pause/focus loss. On WebGL, events flush every `webGLEventFlushRate` seconds (default 30s) due to platform limitations.
 
 ### Debouncing
-Player updates and save updates are debounced to prevent excessive API calls during rapid property changes. APIs that need debouncing inherit from `DebouncedAPI<TOperation>` (a generic base class) and define a `DebouncedOperation` enum for type-safe operation keys. The base class uses a dictionary to track multiple debounced operations independently.
+Player updates and save updates are debounced to prevent excessive API calls during rapid property changes. APIs that need debouncing inherit from `DebouncedAPI<TOperation, TReturnData, TUpdateResult>` and define a `DebouncedOperation` enum for type-safe operation keys. The base class uses a dictionary to track multiple debounced operations independently.
 
 The debounce is **leading and trailing**: the first call fires immediately (leading), and if further calls arrive during the debounce window they are coalesced into a single trailing call executed after the window closes. The window is defined by `debounceTimerSeconds` (default: 1s) and resets on each subsequent call.
 
 To add debouncing to an API:
 1. Define a public `enum DebouncedOperation` with your debounced operations
-2. Inherit from `DebouncedAPI<YourAPI.DebouncedOperation>`
+2. Inherit from `DebouncedAPI<YourAPI.DebouncedOperation, TReturnData, TUpdateResult>`
 3. Call `Debounce(DebouncedOperation.YourOperation)` to queue an operation
 4. Implement `ExecuteDebouncedOperation(DebouncedOperation operation)` with a switch statement
 5. The base class's `ProcessPendingUpdates()` is called by `TaloManager.Update()` every frame
 
-Example: `PlayersAPI` defines `enum DebouncedOperation { Update }` and inherits from `DebouncedAPI<PlayersAPI.DebouncedOperation>`. When `Player.SetProp()` is called, it calls `Debounce(DebouncedOperation.Update)`. The first call fires immediately; subsequent calls within the debounce window result in a single trailing API call at the end of the window.
+Example: `PlayersAPI` defines `enum DebouncedOperation { Update }` and inherits from `DebouncedAPI<PlayersAPI.DebouncedOperation, RejectedProp[], PlayersAPI.PlayerUpdateResult>`. When `Player.SetProp()` is called, it calls `Debounce(DebouncedOperation.Update)`. The first call fires immediately; subsequent calls within the debounce window result in a single trailing API call at the end of the window.
+
+#### Debounced update completion signals
+
+`Player.SetProp(...)` returns `Task<PlayerUpdateResult>`, `Talo.Saves.UpdateCurrentSave()` returns `Task<SaveUpdateResult>`. All callers in the same debounce window share the same settle result. `FlushUpdates()` returns `FlushResult` (`NothingPending`, `Success`, `Failure`). `OnPlayerUpdated(bool)` / `OnSaveUpdated(bool, GameSave)` fire after each settle. `TaloManager.OnApplicationQuit()` flushes pending updates automatically.
 
 ## Key Configuration
 
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs
index 2bb5735d..c1607262 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs	
@@ -5,7 +5,19 @@
 
 namespace TaloGameServices
 {
-    public abstract class DebouncedAPI<TOperation> : BaseAPI where TOperation : Enum
+    public abstract class DebouncedAPIBase : BaseAPI
+    {
+        public enum FlushResult
+        {
+            NothingPending,
+            Success,
+            Failure
+        }
+
+        protected DebouncedAPIBase(string service) : base(service) { }
+    }
+
+    public abstract class DebouncedAPI<TOperation, TReturnData, TUpdateResult> : DebouncedAPIBase where TOperation : Enum
     {
         private class DebouncedOperation
         {
@@ -13,10 +25,14 @@ private class DebouncedOperation
             public bool windowOpen;
             public bool hasTrailingCallQueued;
             public bool isExecuting;
+            public Task<TReturnData> currentTask;
+            public List<TaskCompletionSource<TUpdateResult>> pendingTasks = new();
         }
 
         private readonly Dictionary<TOperation, DebouncedOperation> operations = new();
 
+        protected event Action<bool, TReturnData> OnOperationSettled;
+
         protected DebouncedAPI(string service) : base(service) { }
 
         private void OpenWindow(DebouncedOperation op)
@@ -25,7 +41,7 @@ private void OpenWindow(DebouncedOperation op)
             op.windowEndTime = Time.realtimeSinceStartup + Talo.Settings.debounceTimerSeconds;
         }
 
-        protected void Debounce(TOperation operation)
+        protected Task<TUpdateResult> Debounce(TOperation operation)
         {
             if (!operations.ContainsKey(operation))
             {
@@ -36,25 +52,60 @@ protected void Debounce(TOperation operation)
 
             if (!op.windowOpen && !op.isExecuting)
             {
-                // leading call: fire immediately and open the debounce window
                 op.hasTrailingCallQueued = false;
                 op.isExecuting = true;
                 OpenWindow(op);
 
-                ExecuteDebouncedOperation(operation).ContinueWith((t) => {
-                    op.isExecuting = false;
-                    if (t.IsFaulted)
-                    {
-                        Debug.LogError(t.Exception);
-                    }
-                }, TaskScheduler.FromCurrentSynchronizationContext());
+                var pending = new List<TaskCompletionSource<TUpdateResult>>(op.pendingTasks);
+                op.pendingTasks.Clear();
+
+                return SettleLeading(operation, op, pending);
             }
             else
             {
-                // window open or request in-flight: queue a trailing call and extend the window
+                var tcs = new TaskCompletionSource<TUpdateResult>();
+                op.pendingTasks.Add(tcs);
                 op.hasTrailingCallQueued = true;
                 OpenWindow(op);
+                return tcs.Task;
+            }
+        }
+
+        private async Task<TUpdateResult> SettleLeading(TOperation operation, DebouncedOperation op, List<TaskCompletionSource<TUpdateResult>> pending)
+        {
+            (_, var result) = await RunAndSettle(operation, op, pending);
+            return result;
+        }
+
+        private async Task<(bool success, TUpdateResult result)> RunAndSettle(TOperation operation, DebouncedOperation op, List<TaskCompletionSource<TUpdateResult>> pending)
+        {
+            op.currentTask = ExecuteDebouncedOperation(operation);
+
+            bool success;
+            TReturnData returnData;
+            try
+            {
+                returnData = await op.currentTask;
+                success = true;
+            }
+            catch (Exception)
+            {
+                returnData = default;
+                success = false;
+            }
+            finally
+            {
+                op.isExecuting = false;
             }
+
+            OnOperationSettled?.Invoke(success, returnData);
+
+            var result = BuildResult(success, returnData);
+            foreach (var tcs in pending)
+            {
+                tcs.SetResult(result);
+            }
+            return (success, result);
         }
 
         public async Task ProcessPendingUpdates()
@@ -93,18 +144,54 @@ public async Task ProcessPendingUpdates()
                 var op = operations[key];
                 op.hasTrailingCallQueued = false;
                 op.isExecuting = true;
-                try
+
+                var pending = new List<TaskCompletionSource<TUpdateResult>>(op.pendingTasks);
+                op.pendingTasks.Clear();
+
+                await RunAndSettle(key, op, pending);
+            }
+        }
+
+        public async Task<FlushResult> FlushUpdates()
+        {
+            var result = FlushResult.NothingPending;
+
+            var keys = new List<TOperation>(operations.Keys);
+            foreach (var key in keys)
+            {
+                var op = operations[key];
+
+                if (op.isExecuting)
                 {
-                    await ExecuteDebouncedOperation(key);
+                    await op.currentTask;
                 }
-                finally
+
+                while (op.hasTrailingCallQueued)
                 {
-                    op.isExecuting = false;
-                    op.windowOpen = false;
+                    op.hasTrailingCallQueued = false;
+                    op.isExecuting = true;
+
+                    var pending = new List<TaskCompletionSource<TUpdateResult>>(op.pendingTasks);
+                    op.pendingTasks.Clear();
+
+                    var (settleSuccess, _) = await RunAndSettle(key, op, pending);
+                    if (settleSuccess)
+                    {
+                        if (result == FlushResult.NothingPending) result = FlushResult.Success;
+                    }
+                    else
+                    {
+                        result = FlushResult.Failure;
+                    }
                 }
+
+                op.windowOpen = false;
             }
+
+            return result;
         }
 
-        protected abstract Task ExecuteDebouncedOperation(TOperation operation);
+        protected abstract Task<TReturnData> ExecuteDebouncedOperation(TOperation operation);
+        protected abstract TUpdateResult BuildResult(bool success, TReturnData returnData);
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
index 4e14c7c0..f2d739a7 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
@@ -9,7 +9,7 @@ public class MergeOptions
         public string postMergeIdentityService = "";
     }
 
-    public class PlayersAPI : DebouncedAPI<PlayersAPI.DebouncedOperation>
+    public class PlayersAPI : DebouncedAPI<PlayersAPI.DebouncedOperation, RejectedProp[], PlayersAPI.PlayerUpdateResult>
     {
         public enum DebouncedOperation
         {
@@ -21,10 +21,12 @@ public enum DebouncedOperation
         public event Action<IdentifyException> OnIdentificationFailed;
         public event Action OnIdentityCleared;
         public event Action<RejectedProp[]> OnPropsRejected;
+        public event Action<bool> OnPlayerUpdated;
 
         public PlayersAPI() : base("v1/players")
         {
             Talo.OnConnectionRestored += OnConnectionRestored;
+            OnOperationSettled += (success, _) => OnPlayerUpdated?.Invoke(success);
         }
 
         private async void OnConnectionRestored()
@@ -132,22 +134,36 @@ string playerId
             return await Identify("game_center", identifier);
         }
 
-        protected override async Task ExecuteDebouncedOperation(DebouncedOperation operation)
+        protected override async Task<RejectedProp[]> ExecuteDebouncedOperation(DebouncedOperation operation)
         {
-            switch (operation)
+            return operation switch
             {
-                case DebouncedOperation.Update:
-                    await Update();
-                    break;
+                DebouncedOperation.Update => await RunUpdate(),
+                _ => null,
+            };
+        }
+
+        protected override PlayerUpdateResult BuildResult(bool success, RejectedProp[] updateData)
+        {
+            if (!success)
+            {
+                return new PlayerUpdateResult(false);
             }
+            return new PlayerUpdateResult(true, updateData);
         }
 
-        public void DebounceUpdate()
+        public Task<PlayerUpdateResult> DebounceUpdate()
         {
-            Debounce(DebouncedOperation.Update);
+            return Debounce(DebouncedOperation.Update);
         }
 
         public async Task<Player> Update()
+        {
+            await RunUpdate();
+            return Talo.CurrentPlayer;
+        }
+
+        private async Task<RejectedProp[]> RunUpdate()
         {
             Talo.IdentityCheck();
 
@@ -164,7 +180,7 @@ public async Task<Player> Update()
                 OnPropsRejected?.Invoke(res.rejectedProps);
             }
 
-            return Talo.CurrentPlayer;
+            return res.rejectedProps ?? Array.Empty<RejectedProp>();
         }
 
         public async Task<Player> Merge(string playerId1, string playerId2, MergeOptions options = null)
@@ -258,5 +274,17 @@ public async Task<string> CreateSocketToken()
                 return "";
             }
         }
+
+        public class PlayerUpdateResult
+        {
+            public bool Success { get; }
+            public RejectedProp[] RejectedProps { get; }
+
+            public PlayerUpdateResult(bool success, RejectedProp[] rejectedProps = null)
+            {
+                Success = success;
+                RejectedProps = rejectedProps ?? Array.Empty<RejectedProp>();
+            }
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs
index 203c2101..06f5ef53 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs	
@@ -6,7 +6,7 @@
 
 namespace TaloGameServices
 {
-    public class SavesAPI : DebouncedAPI<SavesAPI.DebouncedOperation>
+    public class SavesAPI : DebouncedAPI<SavesAPI.DebouncedOperation, GameSave, SavesAPI.SaveUpdateResult>
     {
         public enum DebouncedOperation
         {
@@ -21,6 +21,7 @@ public enum DebouncedOperation
 
         public event Action<GameSave> OnSaveChosen;
         public event Action<GameSave> OnSaveUnloaded;
+        public event Action<bool, GameSave> OnSaveUpdated;
 
         public GameSave[] All
         {
@@ -38,7 +39,11 @@ public GameSave Current
         }
 
         public SavesAPI() : base("v1/game-saves")
-        { }
+        {
+            OnOperationSettled += (success, save) => {
+                OnSaveUpdated?.Invoke(success, success ? save : null);
+            };
+        }
 
         internal void Setup()
         {
@@ -191,7 +196,7 @@ public async Task<GameSave> CreateSave(string saveName, SaveContent content = nu
             return savesManager.CreateSave(save);
         }
 
-        protected override async Task ExecuteDebouncedOperation(DebouncedOperation operation)
+        protected override async Task<GameSave> ExecuteDebouncedOperation(DebouncedOperation operation)
         {
             switch (operation)
             {
@@ -199,18 +204,24 @@ protected override async Task ExecuteDebouncedOperation(DebouncedOperation opera
                     var currentSave = savesManager.CurrentSave;
                     if (currentSave != null)
                     {
-                        await UpdateSave(currentSave.id);
+                        return await UpdateSave(currentSave.id);
                     }
                     break;
             }
+            return null;
+        }
+
+        protected override SaveUpdateResult BuildResult(bool success, GameSave updateData)
+        {
+            return new SaveUpdateResult(success, success ? updateData : null);
         }
 
-        public void DebounceUpdate()
+        public Task<SaveUpdateResult> DebounceUpdate()
         {
-            Debounce(DebouncedOperation.Update);
+            return Debounce(DebouncedOperation.Update);
         }
 
-        public async Task<GameSave> UpdateCurrentSave(string newName = "")
+        public async Task<SaveUpdateResult> UpdateCurrentSave(string newName = "")
         {
             var currentSave = savesManager.CurrentSave;
             if (currentSave == null)
@@ -221,13 +232,16 @@ public async Task<GameSave> UpdateCurrentSave(string newName = "")
             // if the save is being renamed, sync it immediately
             if (!string.IsNullOrEmpty(newName))
             {
-                return await UpdateSave(currentSave.id, newName);
+                var save = await UpdateSave(currentSave.id, newName);
+                var success = save != null;
+                var result = new SaveUpdateResult(success, save);
+                OnSaveUpdated?.Invoke(success, save);
+                return result;
             }
 
             // else, update the save locally and queue it for syncing
             currentSave.content = contentManager.Content;
-            DebounceUpdate();
-            return currentSave;
+            return await DebounceUpdate();
         }
 
         public async Task<GameSave> UpdateSave(int saveId, string newName = "")
@@ -238,7 +252,10 @@ public async Task<GameSave> UpdateSave(int saveId, string newName = "")
 
             if (Talo.IsOffline())
             {
-                if (!string.IsNullOrEmpty(newName)) save.name = newName;
+                if (!string.IsNullOrEmpty(newName))
+                {
+                    save.name = newName;
+                }
                 save.content = saveContent;
                 save.updatedAt = DateTime.UtcNow.ToString("O");
             }
@@ -254,7 +271,6 @@ public async Task<GameSave> UpdateSave(int saveId, string newName = "")
                 });
 
                 var json = await Call(uri, "PATCH", content);
-
                 var res = JsonUtility.FromJson<SavesPostResponse>(json);
                 save = res.save;
             }
@@ -293,5 +309,17 @@ public async Task DeleteSave(int saveId, bool unloadIfCurrentSave = false)
 
             savesManager.DeleteSave(saveId, unloadIfCurrentSave);
         }
+
+        public class SaveUpdateResult
+        {
+            public bool Success { get; }
+            public GameSave Save { get; }
+
+            public SaveUpdateResult(bool success, GameSave save = null)
+            {
+                Success = success;
+                Save = save;
+            }
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs
index 73b4d2a8..df79fb15 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Entities/Player.cs	
@@ -1,101 +1,108 @@
-using UnityEngine;
-using System.Linq;
-using System;
-using System.Collections.Generic;
-
-namespace TaloGameServices
-{
-    [Serializable]
-    public class Player : EntityWithProps
-    {
-        public string id;
-        public PlayerAlias[] aliases;
-        public GroupStub[] groups;
-        public PlayerPresence presence;
-
-        public override string ToString()
-        {
-            return JsonUtility.ToJson(this);
-        }
-
-        public void SetProp(string key, string value, bool update = true)
-        {
-            base.SetProp(key, value);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public void DeleteProp(string key, bool update = true)
-        {
-            base.DeleteProp(key);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public void SetPropArray(string key, IEnumerable<string> values, bool update = true)
-        {
-            base.SetPropArray(key, values);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public void DeletePropArray(string key, bool update = true)
-        {
-            base.DeletePropArray(key);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public void InsertIntoPropArray(string key, string value, bool update = true)
-        {
-            base.InsertIntoPropArray(key, value);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public void RemoveFromPropArray(string key, string value, bool update = true)
-        {
-            base.RemoveFromPropArray(key, value);
-
-            if (update)
-            {
-                Talo.Players.DebounceUpdate();
-            }
-        }
-
-        public bool IsInGroupID(string groupId)
-        {
-            return groups.Any((group) => group.id == groupId);
-        }
-
-        public bool IsInGroupName(string groupName)
-        {
-            return groups.Any((group) => group.name == groupName);
-        }
-
-        public PlayerAlias GetAlias(string service = "")
-        {
-            if (string.IsNullOrEmpty(service))
-            {
-                return aliases.Length > 0 ? aliases[0] : null;
-            }
-
-            return aliases.FirstOrDefault((alias) => alias.service == service);
-        }
-    }
-}
+using UnityEngine;
+using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace TaloGameServices
+{
+    [Serializable]
+    public class Player : EntityWithProps
+    {
+        public string id;
+        public PlayerAlias[] aliases;
+        public GroupStub[] groups;
+        public PlayerPresence presence;
+
+        public override string ToString()
+        {
+            return JsonUtility.ToJson(this);
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> SetProp(string key, string value, bool update = true)
+        {
+            base.SetProp(key, value);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> DeleteProp(string key, bool update = true)
+        {
+            base.DeleteProp(key);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> SetPropArray(string key, IEnumerable<string> values, bool update = true)
+        {
+            base.SetPropArray(key, values);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> DeletePropArray(string key, bool update = true)
+        {
+            base.DeletePropArray(key);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> InsertIntoPropArray(string key, string value, bool update = true)
+        {
+            base.InsertIntoPropArray(key, value);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public Task<PlayersAPI.PlayerUpdateResult> RemoveFromPropArray(string key, string value, bool update = true)
+        {
+            base.RemoveFromPropArray(key, value);
+
+            if (update)
+            {
+                return Talo.Players.DebounceUpdate();
+            }
+            return Task.FromResult(new PlayersAPI.PlayerUpdateResult(true));
+        }
+
+        public bool IsInGroupID(string groupId)
+        {
+            return groups.Any((group) => group.id == groupId);
+        }
+
+        public bool IsInGroupName(string groupName)
+        {
+            return groups.Any((group) => group.name == groupName);
+        }
+
+        public PlayerAlias GetAlias(string service = "")
+        {
+            if (string.IsNullOrEmpty(service))
+            {
+                return aliases.Length > 0 ? aliases[0] : null;
+            }
+
+            return aliases.FirstOrDefault((alias) => alias.service == service);
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs b/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs
index 6f55788e..f36c0e92 100644
--- a/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/TaloManager.cs	
@@ -37,9 +37,24 @@ private void OnDisable()
             Talo.Events.OnFlushed -= ResetFlushTimer;
         }
 
-        private void OnApplicationQuit()
+        private async void OnApplicationQuit()
         {
-            DoFlush();
+            try
+            {
+                if (Talo.HasIdentity())
+                {
+                    await Talo.Events.Flush();
+                    await Talo.Players.FlushUpdates();
+                    if (Talo.Saves.Current != null)
+                    {
+                        await Talo.Saves.FlushUpdates();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"Failed to flush on quit: {ex}");
+            }
         }
 
         private void OnApplicationFocus(bool hasFocus)
diff --git a/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs
index 7244f918..f68e4ee6 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Utils/RequestMock.cs	
@@ -13,8 +13,8 @@ private struct RequestHandler
             public long status;
         }
 
-        private static List<RequestHandler> _permanentHandlers = new List<RequestHandler>();
-        private static List<RequestHandler> _oneTimeHandlers = new List<RequestHandler>();
+        private static readonly List<RequestHandler> _permanentHandlers = new();
+        private static readonly List<RequestHandler> _oneTimeHandlers = new();
         private static bool _offline;
 
         public static bool Offline
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs
index 032341bf..3a567d18 100644
--- a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Players/SetProp.cs	
@@ -7,22 +7,12 @@ public class SetProp : MonoBehaviour
     {
         public string key, value;
 
-        private void OnEnable()
-        {
-            Talo.Players.OnPropsRejected += OnPropsRejected;
-        }
-
-        private void OnDisable()
-        {
-            Talo.Players.OnPropsRejected -= OnPropsRejected;
-        }
-
         public void OnButtonClick()
         {
             UpdateProp();
         }
 
-        private void UpdateProp()
+        private async void UpdateProp()
         {
             if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value))
             {
@@ -32,20 +22,21 @@ private void UpdateProp()
 
             try
             {
-                Talo.CurrentPlayer.SetProp(key, value);
-                ResponseMessage.SetText($"{key} set to {value}");
+                var result = await Talo.CurrentPlayer.SetProp(key, value);
+
+                if (result.RejectedProps.Length > 0)
+                {
+                    var reasons = string.Join(", ", Array.ConvertAll(result.RejectedProps, (rp) => $"[{rp.key}] {rp.message}"));
+                    ResponseMessage.SetText($"Rejected props: {reasons}");
+                    return;
+                }
+
+                ResponseMessage.SetText($"{key} saved successfully");
             }
-            catch (System.Exception ex)
+            catch (Exception ex)
             {
                 ResponseMessage.SetText(ex.Message);
-                throw;
             }
         }
-
-        private void OnPropsRejected(RejectedProp[] rejectedProps)
-        {
-            var reasons = string.Join(", ", Array.ConvertAll(rejectedProps, (rp) => $"[{rp.key}] {rp.message}"));
-            ResponseMessage.SetText($"Rejected props: {reasons}");
-        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs
index 84b21baa..af699282 100644
--- a/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/SavesDemo/Scripts/GameUIController.cs	
@@ -29,8 +29,6 @@ private void Start()
             updateSaveButton.clicked += async () =>
             {
                 await Talo.Saves.UpdateCurrentSave();
-                updateSaveButton.text = "Saved!";
-                Invoke("ResetUpdateSaveButtonText", 1f);
             };
 
             root.Q<Button>("back-btn").clicked += () =>
@@ -42,6 +40,22 @@ private void Start()
             SetupLevelButtons();
         }
 
+        private void OnEnable()
+        {
+            Talo.Saves.OnSaveUpdated += OnSaveUpdated;
+        }
+
+        private void OnDisable()
+        {
+            Talo.Saves.OnSaveUpdated -= OnSaveUpdated;
+        }
+
+        private void OnSaveUpdated(bool success, GameSave save)
+        {
+            updateSaveButton.text = success ? "Saved!" : "Save failed";
+            Invoke(nameof(ResetUpdateSaveButtonText), 1f);
+        }
+
         private void SetupLevelButtons()
         {
             var buttons = new[] { 1, 2, 3 }.Select((level) =>
diff --git a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs
new file mode 100644
index 00000000..1139f12b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.Collections;
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace TaloGameServices.Test
+{
+    internal class PlayerUpdateEventMock
+    {
+        public int updatedCount = 0;
+        public bool lastSuccess = false;
+
+        public void OnUpdated(bool success)
+        {
+            updatedCount++;
+            lastSuccess = success;
+        }
+    }
+
+    internal class PlayerUpdatedEventTest
+    {
+        private PlayersAPI _originalPlayersApi;
+        private PlayerUpdateEventMock _mock;
+
+        [OneTimeSetUp]
+        public void SetUp()
+        {
+            var tm = new GameObject().AddComponent<TaloManager>();
+            tm.settings = ScriptableObject.CreateInstance<TaloSettings>();
+            tm.settings.autoConnectSocket = false;
+            tm.settings.debounceTimerSeconds = 0.1f;
+
+            Talo.CurrentAlias = new PlayerAlias() {
+                player = new Player() {
+                    id = "uuid",
+                    props = new[] { new Prop(("k1", "v1")) }
+                }
+            };
+
+            _originalPlayersApi = Talo.Players;
+        }
+
+        [SetUp]
+        public void PerTestSetUp()
+        {
+            _mock = new PlayerUpdateEventMock();
+            Talo._players = new PlayersAPI();
+            RequestMock.Reset();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Talo._players = _originalPlayersApi;
+            RequestMock.Reset();
+        }
+
+        [UnityTest]
+        public IEnumerator LeadingCall_FiresOnPlayerUpdated()
+        {
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" }
+            }));
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsTrue(_mock.lastSuccess);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator LeadingAndTrailing_FireOnPlayerUpdatedTwice()
+        {
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.Reply(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" }
+            }));
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+            Talo.CurrentPlayer.SetProp("k2", "v2");
+
+            Assert.AreEqual(1, _mock.updatedCount);
+
+            var result = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
+            Assert.AreEqual(2, _mock.updatedCount);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator PropRejection_BothOnPropsRejectedAndOnPlayerUpdatedFire()
+        {
+            int rejectedCount = 0;
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+            Talo.Players.OnPropsRejected += _ =>
+            {
+                rejectedCount++;
+            };
+
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" },
+                rejectedProps = new[] { new RejectedProp { key = "k1", error = "PROP_VALUE_TOO_LONG", message = "too long" } }
+            }));
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+
+            Assert.AreEqual(1, rejectedCount);
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsTrue(_mock.lastSuccess);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator HttpError_FiresOnPlayerUpdatedWithFalse()
+        {
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+
+            // no mock for update means the leading call's Debounce() fails
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsFalse(_mock.lastSuccess);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator TrailingCall_FailsOnHttpError_ReturnsFlushResultFailure()
+        {
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" }
+            }));
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+            Talo.CurrentPlayer.SetProp("k2", "v2");
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsTrue(_mock.lastSuccess);
+
+            // trailing call has no mock so flush returns Failure (not throw)
+            var flushResult = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.Failure, flushResult);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator FlushUpdates_NoPending_ReturnsNothingPending()
+        {
+            var result = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.NothingPending, result);
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator FlushUpdates_WithTrailingQueued_ReturnsSuccessAndFiresEvent()
+        {
+            Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
+
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.Reply(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" }
+            }));
+
+            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+            Talo.CurrentPlayer.SetProp("k2", "v2");
+
+            Assert.AreEqual(1, _mock.updatedCount);
+
+            var result = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
+            Assert.AreEqual(2, _mock.updatedCount);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator SetProp_ReturnsResultInline()
+        {
+            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
+            RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
+            {
+                player = new Player { id = "uuid" }
+            }));
+
+            var result = Talo.CurrentPlayer.SetProp("k1", "v1-updated").GetAwaiter().GetResult();
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(0, result.RejectedProps.Length);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator SetProp_LocalOnly_ReturnsImmediateSuccess()
+        {
+            var result = Talo.CurrentPlayer.SetProp("k1", "v1-local", false).GetAwaiter().GetResult();
+
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(0, result.RejectedProps.Length);
+
+            yield return null;
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs.meta
new file mode 100644
index 00000000..da77f16b
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9466b9f624c1431ea743ce20a979ead5
diff --git a/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs
new file mode 100644
index 00000000..efa62333
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs	
@@ -0,0 +1,174 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace TaloGameServices.Test
+{
+    internal class SaveUpdateEventMock
+    {
+        public int updatedCount = 0;
+        public bool lastSuccess = false;
+        public GameSave lastSave = null;
+
+        public void OnUpdated(bool success, GameSave save)
+        {
+            updatedCount++;
+            lastSuccess = success;
+            lastSave = save;
+        }
+    }
+
+    internal class SaveUpdatedEventTest
+    {
+        private SavesAPI _originalSavesApi;
+        private SaveUpdateEventMock _mock;
+
+        [OneTimeSetUp]
+        public void SetUp()
+        {
+            var tm = new GameObject().AddComponent<TaloManager>();
+            tm.settings = ScriptableObject.CreateInstance<TaloSettings>();
+            tm.settings.autoConnectSocket = false;
+            tm.settings.debounceTimerSeconds = 0.1f;
+
+            Talo.CurrentAlias = new PlayerAlias() {
+                player = new Player() {
+                    id = "uuid"
+                }
+            };
+
+            _originalSavesApi = Talo.Saves;
+        }
+
+        [SetUp]
+        public void PerTestSetUp()
+        {
+            _mock = new SaveUpdateEventMock();
+            RequestMock.Reset();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            Talo._saves = _originalSavesApi;
+            RequestMock.Reset();
+        }
+
+        private SavesAPI BuildApiWithChosenSave(int saveId, string name)
+        {
+            var api = new SavesAPI();
+            Talo._saves = api;
+            api.Setup();
+
+            var save = new GameSave { id = saveId, name = name };
+            api.savesManager._allSaves.Add(save);
+            api.savesManager.SetChosenSave(save, false);
+
+            return api;
+        }
+
+        private static string PatchedSaveJson()
+        {
+            return JsonUtility.ToJson(new SavesPostResponse
+            {
+                save = new GameSave
+                {
+                    id = 1,
+                    name = "Online Save",
+                    content = new SaveContent(new Dictionary<string, SavedObject>()),
+                    updatedAt = "2026-07-21T23:38:00.999Z"
+                }
+            });
+        }
+
+        [UnityTest]
+        public IEnumerator LeadingCall_FiresOnSaveUpdated()
+        {
+            var api = BuildApiWithChosenSave(1, "Online Save");
+            Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
+
+            var uri = new Uri(api.GetUri() + "/1");
+            RequestMock.ReplyOnce(uri, "PATCH", PatchedSaveJson());
+
+            _ = Talo.Saves.DebounceUpdate();
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsTrue(_mock.lastSuccess);
+            Assert.IsNotNull(_mock.lastSave);
+            Assert.AreEqual(1, _mock.lastSave.id);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator LeadingAndTrailing_FireOnSaveUpdatedTwice()
+        {
+            var api = BuildApiWithChosenSave(1, "Online Save");
+            Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
+
+            var uri = new Uri(api.GetUri() + "/1");
+            RequestMock.Reply(uri, "PATCH", PatchedSaveJson());
+
+            _ = Talo.Saves.DebounceUpdate();
+            _ = Talo.Saves.DebounceUpdate();
+
+            Assert.AreEqual(1, _mock.updatedCount);
+
+            var result = Talo.Saves.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
+            Assert.AreEqual(2, _mock.updatedCount);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator HttpError_FiresOnSaveUpdatedWithFalse()
+        {
+            BuildApiWithChosenSave(1, "Online Save");
+            Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
+
+            // no mock for update means the leading call's Debounce() fails
+            _ = Talo.Saves.DebounceUpdate();
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsFalse(_mock.lastSuccess);
+            Assert.IsNull(_mock.lastSave);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator TrailingCall_FailsOnHttpError_ReturnsFlushResultFailure()
+        {
+            var api = BuildApiWithChosenSave(1, "Online Save");
+            Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
+
+            var uri = new Uri(api.GetUri() + "/1");
+            RequestMock.ReplyOnce(uri, "PATCH", PatchedSaveJson());
+
+            _ = Talo.Saves.DebounceUpdate();
+            _ = Talo.Saves.DebounceUpdate();
+
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsTrue(_mock.lastSuccess);
+
+            // trailing call has no mock so flush returns Failure (not throw)
+            var flushResult = Talo.Saves.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.Failure, flushResult);
+
+            yield return null;
+        }
+
+        [UnityTest]
+        public IEnumerator FlushUpdates_NoPending_ReturnsNothingPending()
+        {
+            BuildApiWithChosenSave(1, "Online Save");
+            var result = Talo.Saves.FlushUpdates().GetAwaiter().GetResult();
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.NothingPending, result);
+            yield return null;
+        }
+    }
+}
diff --git a/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs.meta b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs.meta
new file mode 100644
index 00000000..0e3fc72c
--- /dev/null
+++ b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 390c73ec4f144d189e64cef017111fa2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f73989a5..07f62f0f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Assets/Talo Game Services/Talo/
 
 Follow the patterns established in existing API and entity files:
 
-- All API classes inherit from `BaseAPI` (or `DebouncedAPI<TOperation>` when debouncing is needed)
+- All API classes inherit from `BaseAPI` (or `DebouncedAPI` when debouncing is needed)
 - Use `async`/`await` for all network operations
 - Request and response types live in their respective `Requests/` and `Responses/` folders
 

From 12ceb2d6f662f75bfa101b7ff3258b2e4070433c Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 4 Aug 2026 21:31:23 +0100
Subject: [PATCH 22/27] summarise just my prs

---
 .github/workflows/pr-summary.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-summary.yml b/.github/workflows/pr-summary.yml
index 9cba9c3a..605d8e4d 100644
--- a/.github/workflows/pr-summary.yml
+++ b/.github/workflows/pr-summary.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   summarise:
-    if: ${{ github.event.pull_request.author_association == 'MEMBER' }}
+    if: ${{ github.event.pull_request.user.login == 'tudddorrr' }}
     runs-on: ubuntu-latest
     timeout-minutes: 10
 

From f3640b10811262f76c090db4e43e5d08cfee6bfe Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Tue, 4 Aug 2026 20:59:21 +0100
Subject: [PATCH 23/27] remove prop rejection events, keep them inline with
 update results

---
 .../Talo/Runtime/APIs/ChannelsAPI.cs          | 29 ++++++++++++++-----
 .../Talo/Runtime/APIs/FeedbackAPI.cs          | 19 +++++++++---
 .../Talo/Runtime/APIs/LeaderboardsAPI.cs      | 26 +++++++++++++----
 .../Talo/Runtime/APIs/PlayersAPI.cs           |  6 ----
 .../Talo/Runtime/Entities/RejectedProp.cs     |  8 -----
 .../Scripts/ChannelStorageDemoUIController.cs | 12 +++++++-
 .../ChatDemo/Scripts/ChatUIController.cs      |  4 ++-
 .../Scripts/LeaderboardUIController.cs        |  4 +--
 .../Scripts/Feedback/SendFeedback.cs          | 11 +++++--
 .../Leaderboards/PostLeaderboardEntry.cs      | 10 +++++--
 .../PlayersAPI/PlayerUpdatedEventTest.cs      | 12 +++-----
 11 files changed, 93 insertions(+), 48 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs
index ec6c9bf7..8aa81692 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/ChannelsAPI.cs	
@@ -96,7 +96,6 @@ public class ChannelsAPI : BaseAPI
         public event Action<Channel, PlayerAlias> OnOwnershipTransferred;
         public event Action<Channel> OnChannelDeleted;
         public event Action<Channel, string[]> OnChannelUpdated;
-        public event Action<RejectedProp[]> OnChannelPropsRejected;
         public event Action<Channel, RejectedProp[]> OnChannelStoragePropsFailedToSet;
         public event Action<Channel, ChannelStorageProp[], ChannelStorageProp[]> OnChannelStoragePropsUpdated;
 
@@ -170,7 +169,7 @@ public async Task<Channel[]> GetSubscribedChannels(GetSubscribedChannelsOptions
             return res.channels;
         }
 
-        private async Task<Channel> SendCreateChannelRequest(CreateChannelOptions options)
+        private async Task<ChannelUpsertResult> SendCreateChannelRequest(CreateChannelOptions options)
         {
             Talo.IdentityCheck();
 
@@ -191,19 +190,19 @@ private async Task<Channel> SendCreateChannelRequest(CreateChannelOptions option
                 var json = await Call(uri, "POST", content);
 
                 var res = JsonUtility.FromJson<ChannelResponse>(json);
-                return res.channel;
+                return new ChannelUpsertResult(true, res.channel);
             }
             catch (RequestException ex)
             {
                 if (ex.IsBadRequest())
                 {
-                    RejectedProp.TryEmit(ex.responseBody, OnChannelPropsRejected);
+                    return new ChannelUpsertResult(false, null, RejectedProp.FromJson(ex.responseBody));
                 }
                 throw;
             }
         }
 
-        public async Task<Channel> Create(CreateChannelOptions options)
+        public async Task<ChannelUpsertResult> Create(CreateChannelOptions options)
         {
             options ??= new CreateChannelOptions();
             return await SendCreateChannelRequest(options);
@@ -228,7 +227,7 @@ public async Task Leave(int channelId)
             await Call(uri, "POST");
         }
 
-        public async Task<Channel> Update(int channelId, UpdateChannelOptions options = null)
+        public async Task<ChannelUpsertResult> Update(int channelId, UpdateChannelOptions options = null)
         {
             Talo.IdentityCheck();
 
@@ -252,13 +251,13 @@ public async Task<Channel> Update(int channelId, UpdateChannelOptions options =
                 var json = await Call(uri, "PUT", content);
 
                 var res = JsonUtility.FromJson<ChannelResponse>(json);
-                return res.channel;
+                return new ChannelUpsertResult(true, res.channel);
             }
             catch (RequestException ex)
             {
                 if (ex.IsBadRequest())
                 {
-                    RejectedProp.TryEmit(ex.responseBody, OnChannelPropsRejected);
+                    return new ChannelUpsertResult(false, null, RejectedProp.FromJson(ex.responseBody));
                 }
                 throw;
             }
@@ -400,5 +399,19 @@ public async Task<ChannelStorageProp[]> ListStorageProps(int channelId, string[]
 
             return Array.Empty<ChannelStorageProp>();
         }
+
+        public class ChannelUpsertResult
+        {
+            public bool Success { get; }
+            public Channel Channel { get; }
+            public RejectedProp[] RejectedProps { get; }
+
+            public ChannelUpsertResult(bool success, Channel channel, RejectedProp[] rejectedProps = null)
+            {
+                Success = success;
+                Channel = channel;
+                RejectedProps = rejectedProps ?? Array.Empty<RejectedProp>();
+            }
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs
index e1e2b4df..17da423d 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/FeedbackAPI.cs	
@@ -7,8 +7,6 @@ namespace TaloGameServices
 {
     public class FeedbackAPI : BaseAPI
     {
-        public event Action<RejectedProp[]> OnPropsRejected;
-
         public FeedbackAPI() : base("v1/game-feedback") { }
 
         public async Task<FeedbackCategory[]> GetCategories()
@@ -20,7 +18,7 @@ public async Task<FeedbackCategory[]> GetCategories()
             return res.feedbackCategories;
         }
 
-        public async Task Send(string categoryInternalName, string comment, params (string, string)[] props)
+        public async Task<FeedbackSendResult> Send(string categoryInternalName, string comment, params (string, string)[] props)
         {
             Talo.IdentityCheck();
 
@@ -31,15 +29,28 @@ public async Task Send(string categoryInternalName, string comment, params (stri
             try
             {
                 await Call(uri, "POST", content);
+                return new FeedbackSendResult(true);
             }
             catch (RequestException ex)
             {
                 if (ex.IsBadRequest())
                 {
-                    RejectedProp.TryEmit(ex.responseBody, OnPropsRejected);
+                    return new FeedbackSendResult(false, RejectedProp.FromJson(ex.responseBody));
                 }
                 throw;
             }
         }
+
+        public class FeedbackSendResult
+        {
+            public bool Success { get; }
+            public RejectedProp[] RejectedProps { get; }
+
+            public FeedbackSendResult(bool success, RejectedProp[] rejectedProps = null)
+            {
+                Success = success;
+                RejectedProps = rejectedProps ?? Array.Empty<RejectedProp>();
+            }
+        }
     }
 }
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs
index 39703076..9f3b54e8 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/LeaderboardsAPI.cs	
@@ -45,8 +45,6 @@ public class LeaderboardsAPI : BaseAPI
     {
         private readonly LeaderboardEntriesManager _entriesManager = new();
 
-        public event Action<RejectedProp[]> OnPropsRejected;
-
         public LeaderboardsAPI() : base("v1/leaderboards") { }
 
         public List<LeaderboardEntry> GetCachedEntries(string internalName, GetCachedEntriesOptions options = null)
@@ -77,7 +75,7 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, Ge
             return res;
         }
 
-        public async Task<(LeaderboardEntry, bool)> AddEntry(string internalName, float score, params (string, string)[] propTuples)
+        public async Task<AddEntryResult> AddEntry(string internalName, float score, params (string, string)[] propTuples)
         {
             Talo.IdentityCheck();
 
@@ -93,16 +91,32 @@ public async Task<LeaderboardEntriesResponse> GetEntries(string internalName, Ge
                 var res = JsonUtility.FromJson<LeaderboardEntryResponse>(json);
                 _entriesManager.UpsertEntry(internalName, res.entry, true);
 
-                return (res.entry, res.updated);
+                return new AddEntryResult(true, res.entry, res.updated);
             }
             catch (RequestException ex)
             {
                 if (ex.IsBadRequest())
                 {
-                    RejectedProp.TryEmit(ex.responseBody, OnPropsRejected);
+                    return new AddEntryResult(false, null, false, RejectedProp.FromJson(ex.responseBody));
                 }
                 throw;
             }
         }
+
+        public class AddEntryResult
+        {
+            public bool Success { get; }
+            public LeaderboardEntry Entry { get; }
+            public bool Updated { get; }
+            public RejectedProp[] RejectedProps { get; }
+
+            public AddEntryResult(bool success, LeaderboardEntry entry, bool updated, RejectedProp[] rejectedProps = null)
+            {
+                Success = success;
+                Entry = entry;
+                Updated = updated;
+                RejectedProps = rejectedProps ?? Array.Empty<RejectedProp>();
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs
index f2d739a7..fbc812cd 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs	
@@ -20,7 +20,6 @@ public enum DebouncedOperation
         public event Action OnIdentificationStarted;
         public event Action<IdentifyException> OnIdentificationFailed;
         public event Action OnIdentityCleared;
-        public event Action<RejectedProp[]> OnPropsRejected;
         public event Action<bool> OnPlayerUpdated;
 
         public PlayersAPI() : base("v1/players")
@@ -175,11 +174,6 @@ private async Task<RejectedProp[]> RunUpdate()
             Talo.CurrentPlayer = res.player;
             Talo.CurrentAlias.WriteOfflineAlias();
 
-            if (res.rejectedProps != null && res.rejectedProps.Length > 0)
-            {
-                OnPropsRejected?.Invoke(res.rejectedProps);
-            }
-
             return res.rejectedProps ?? Array.Empty<RejectedProp>();
         }
 
diff --git a/Assets/Talo Game Services/Talo/Runtime/Entities/RejectedProp.cs b/Assets/Talo Game Services/Talo/Runtime/Entities/RejectedProp.cs
index 5f338fc1..9ae7724c 100644
--- a/Assets/Talo Game Services/Talo/Runtime/Entities/RejectedProp.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/Entities/RejectedProp.cs	
@@ -35,14 +35,6 @@ public static RejectedProp[] FromJson(string json)
             return wrapper?.rejectedProps ?? Array.Empty<RejectedProp>();
         }
 
-        public static void TryEmit(string json, Action<RejectedProp[]> onRejected)
-        {
-            var rejectedProps = FromJson(json);
-            if (rejectedProps.Length > 0)
-            {
-                onRejected?.Invoke(rejectedProps);
-            }
-        }
     }
 
     [Serializable]
diff --git a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs
index 97a998ae..deb54faa 100644
--- a/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/ChannelStorageDemo/Scripts/ChannelStorageDemoUIController.cs	
@@ -65,7 +65,17 @@ private async Task SetupDemoChannel()
                         ("channel-storage-demo", "true")
                     }
                 };
-                demoChannel = await Talo.Channels.Create(createOptions);
+                var createResult = await Talo.Channels.Create(createOptions);
+                if (createResult.Success)
+                {
+                    demoChannel = createResult.Channel;
+                }
+            }
+
+            if (demoChannel == null)
+            {
+                Debug.LogError("Failed to create or find a channel for the Channel Storage Demo");
+                return;
             }
 
             await Talo.Channels.Join(demoChannel.id);
diff --git a/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs
index cf8d04b0..b8d364f0 100644
--- a/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/ChatDemo/Scripts/ChatUIController.cs	
@@ -132,7 +132,9 @@ private async void OnCreateChannelClick()
                 return;
             }
 
-            var channel = await Talo.Channels.Create(new CreateChannelOptions() { name = channelName, autoCleanup = true });
+            var result = await Talo.Channels.Create(new CreateChannelOptions() { name = channelName, autoCleanup = true });
+
+            var channel = result.Channel;
             AddChannelToList(channel);
             channelNameField.value = "";
             activeChannelId = channel.id;
diff --git a/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs
index 1038aacb..52b7e27a 100644
--- a/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/LeaderboardsDemo/Scripts/LeaderboardUIController.cs	
@@ -42,14 +42,14 @@ private async void OnPostClick()
             var team = UnityEngine.Random.Range(0, 2) == 0 ? "Blue" : "Red";
 
             await Talo.Players.Identify("username", username);
-            (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(
+            var result = await Talo.Leaderboards.AddEntry(
                 leaderboardName,
                 score,
                 ("team", team)
             );
 
             infoLabel.text = $"You scored {score} for the {team} team.";
-            if (updated) infoLabel.text += " Your highscore was updated!";
+            if (result.Updated) infoLabel.text += " Your highscore was updated!";
 
             entriesList.Rebuild();
         }
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs
index aad398cf..9bc57564 100644
--- a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Feedback/SendFeedback.cs	
@@ -17,8 +17,15 @@ public async void OnButtonClick()
 
             try
             {
-                await Talo.Feedback.Send(categoryInternalName, feedbackComment);
-                ResponseMessage.SetText($"Feedback sent for {categoryInternalName}: {feedbackComment}");
+                var result = await Talo.Feedback.Send(categoryInternalName, feedbackComment);
+                if (result.Success)
+                {
+                    ResponseMessage.SetText($"Feedback sent for {categoryInternalName}: {feedbackComment}");
+                }
+                else
+                {
+                    ResponseMessage.SetText("Failed to send feedback");
+                }
             }
             catch (Exception ex)
             {
diff --git a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs
index 7bf24906..2309f113 100644
--- a/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs	
+++ b/Assets/Talo Game Services/Talo/Samples/Playground/Scripts/Leaderboards/PostLeaderboardEntry.cs	
@@ -24,9 +24,15 @@ private async Task PostEntry()
             try
             {
                 int score = UnityEngine.Random.Range(0, 10000);
-                (LeaderboardEntry entry, bool updated) = await Talo.Leaderboards.AddEntry(leaderboardInternalName, score);
+                var result = await Talo.Leaderboards.AddEntry(leaderboardInternalName, score);
 
-                ResponseMessage.SetText($"Entry with score {score} added, position is {entry.position}, it was {(updated ? "" : "not")} updated");
+                if (result.Entry == null)
+                {
+                    ResponseMessage.SetText("Failed to add entry");
+                    return;
+                }
+
+                ResponseMessage.SetText($"Entry with score {score} added, position is {result.Entry.position}, it was {(result.Updated ? "" : "not")} updated");
             }
             catch (Exception ex)
             {
diff --git a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs
index 1139f12b..a03af117 100644
--- a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs	
+++ b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs	
@@ -99,14 +99,9 @@ public IEnumerator LeadingAndTrailing_FireOnPlayerUpdatedTwice()
         }
 
         [UnityTest]
-        public IEnumerator PropRejection_BothOnPropsRejectedAndOnPlayerUpdatedFire()
+        public IEnumerator PropRejection_OnPlayerUpdatedFiresWithRejectedProps()
         {
-            int rejectedCount = 0;
             Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
-            Talo.Players.OnPropsRejected += _ =>
-            {
-                rejectedCount++;
-            };
 
             var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
             RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
@@ -115,9 +110,10 @@ public IEnumerator PropRejection_BothOnPropsRejectedAndOnPlayerUpdatedFire()
                 rejectedProps = new[] { new RejectedProp { key = "k1", error = "PROP_VALUE_TOO_LONG", message = "too long" } }
             }));
 
-            Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+            var result = Talo.CurrentPlayer.SetProp("k1", "v1-updated").GetAwaiter().GetResult();
 
-            Assert.AreEqual(1, rejectedCount);
+            Assert.AreEqual(1, result.RejectedProps.Length);
+            Assert.AreEqual("k1", result.RejectedProps[0].key);
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsTrue(_mock.lastSuccess);
 

From fda55ad30e5e6ac69cd763cc70e1c629563d5097 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Wed, 5 Aug 2026 18:15:46 +0100
Subject: [PATCH 24/27] remove leading debounces

---
 AGENTS.md                                     |  4 +-
 .../Talo/Runtime/APIs/DebouncedAPI.cs         | 48 ++++----------
 .../PlayersAPI/PlayerUpdatedEventTest.cs      | 66 +++++++++----------
 .../Tests/SavesAPI/SaveUpdatedEventTest.cs    | 39 +++++------
 4 files changed, 59 insertions(+), 98 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index e083762e..b61e975e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -47,7 +47,7 @@ Events are batched and flushed on application quit/pause/focus loss. On WebGL, e
 ### Debouncing
 Player updates and save updates are debounced to prevent excessive API calls during rapid property changes. APIs that need debouncing inherit from `DebouncedAPI<TOperation, TReturnData, TUpdateResult>` and define a `DebouncedOperation` enum for type-safe operation keys. The base class uses a dictionary to track multiple debounced operations independently.
 
-The debounce is **leading and trailing**: the first call fires immediately (leading), and if further calls arrive during the debounce window they are coalesced into a single trailing call executed after the window closes. The window is defined by `debounceTimerSeconds` (default: 1s) and resets on each subsequent call.
+The debounce is **trailing**: calls are coalesced into a single API call executed after the debounce window closes. The window is defined by `debounceTimerSeconds` (default: 1s) and resets on each subsequent call. All callers in the same window share the same `Task` result.
 
 To add debouncing to an API:
 1. Define a public `enum DebouncedOperation` with your debounced operations
@@ -56,7 +56,7 @@ To add debouncing to an API:
 4. Implement `ExecuteDebouncedOperation(DebouncedOperation operation)` with a switch statement
 5. The base class's `ProcessPendingUpdates()` is called by `TaloManager.Update()` every frame
 
-Example: `PlayersAPI` defines `enum DebouncedOperation { Update }` and inherits from `DebouncedAPI<PlayersAPI.DebouncedOperation, RejectedProp[], PlayersAPI.PlayerUpdateResult>`. When `Player.SetProp()` is called, it calls `Debounce(DebouncedOperation.Update)`. The first call fires immediately; subsequent calls within the debounce window result in a single trailing API call at the end of the window.
+Example: `PlayersAPI` defines `enum DebouncedOperation { Update }` and inherits from `DebouncedAPI<PlayersAPI.DebouncedOperation, RejectedProp[], PlayersAPI.PlayerUpdateResult>`. When `Player.SetProp()` is called, it calls `Debounce(DebouncedOperation.Update)`. The first call opens a window; subsequent calls within the window extend it. A single trailing API call fires at the end of the window.
 
 #### Debounced update completion signals
 
diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs
index c1607262..c5f0d976 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/DebouncedAPI.cs	
@@ -50,31 +50,11 @@ protected Task<TUpdateResult> Debounce(TOperation operation)
 
             var op = operations[operation];
 
-            if (!op.windowOpen && !op.isExecuting)
-            {
-                op.hasTrailingCallQueued = false;
-                op.isExecuting = true;
-                OpenWindow(op);
-
-                var pending = new List<TaskCompletionSource<TUpdateResult>>(op.pendingTasks);
-                op.pendingTasks.Clear();
-
-                return SettleLeading(operation, op, pending);
-            }
-            else
-            {
-                var tcs = new TaskCompletionSource<TUpdateResult>();
-                op.pendingTasks.Add(tcs);
-                op.hasTrailingCallQueued = true;
-                OpenWindow(op);
-                return tcs.Task;
-            }
-        }
-
-        private async Task<TUpdateResult> SettleLeading(TOperation operation, DebouncedOperation op, List<TaskCompletionSource<TUpdateResult>> pending)
-        {
-            (_, var result) = await RunAndSettle(operation, op, pending);
-            return result;
+            var tcs = new TaskCompletionSource<TUpdateResult>();
+            op.pendingTasks.Add(tcs);
+            op.hasTrailingCallQueued = true;
+            OpenWindow(op);
+            return tcs.Task;
         }
 
         private async Task<(bool success, TUpdateResult result)> RunAndSettle(TOperation operation, DebouncedOperation op, List<TaskCompletionSource<TUpdateResult>> pending)
@@ -118,22 +98,16 @@ public async Task ProcessPendingUpdates()
                 var windowClosed = Time.realtimeSinceStartup >= op.windowEndTime;
                 if (windowClosed)
                 {
-                    if (op.hasTrailingCallQueued)
+                    if (op.hasTrailingCallQueued && !op.isExecuting)
+                    {
+                        keysToProcess.Add(kvp.Key);
+                    }
+                    else if (op.isExecuting)
                     {
-                        if (!op.isExecuting)
-                        {
-                            // window closed with a trailing call pending: execute it
-                            keysToProcess.Add(kvp.Key);
-                        }
-                        else
-                        {
-                            // leading call still in-flight: delay trailing until it completes
-                            OpenWindow(op);
-                        }
+                        OpenWindow(op);
                     }
                     else if (op.windowOpen)
                     {
-                        // window closed with no trailing call: reset for the next leading call
                         op.windowOpen = false;
                     }
                 }
diff --git a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs
index a03af117..81a82001 100644
--- a/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs	
+++ b/Assets/Talo Game Services/Talo/Tests/PlayersAPI/PlayerUpdatedEventTest.cs	
@@ -29,7 +29,7 @@ public void SetUp()
             var tm = new GameObject().AddComponent<TaloManager>();
             tm.settings = ScriptableObject.CreateInstance<TaloSettings>();
             tm.settings.autoConnectSocket = false;
-            tm.settings.debounceTimerSeconds = 0.1f;
+            tm.settings.debounceTimerSeconds = 0f;
 
             Talo.CurrentAlias = new PlayerAlias() {
                 player = new Player() {
@@ -57,7 +57,7 @@ public void TearDown()
         }
 
         [UnityTest]
-        public IEnumerator LeadingCall_FiresOnPlayerUpdated()
+        public IEnumerator TrailingCall_FiresOnPlayerUpdated()
         {
             Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
 
@@ -69,14 +69,14 @@ public IEnumerator LeadingCall_FiresOnPlayerUpdated()
 
             Talo.CurrentPlayer.SetProp("k1", "v1-updated");
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsTrue(_mock.lastSuccess);
-
-            yield return null;
         }
 
         [UnityTest]
-        public IEnumerator LeadingAndTrailing_FireOnPlayerUpdatedTwice()
+        public IEnumerator TrailingCall_FiresOnceForMultipleCalls()
         {
             Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
 
@@ -89,13 +89,13 @@ public IEnumerator LeadingAndTrailing_FireOnPlayerUpdatedTwice()
             Talo.CurrentPlayer.SetProp("k1", "v1-updated");
             Talo.CurrentPlayer.SetProp("k2", "v2");
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
 
             var result = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
-            Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
-            Assert.AreEqual(2, _mock.updatedCount);
-
-            yield return null;
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.NothingPending, result);
+            Assert.AreEqual(1, _mock.updatedCount);
         }
 
         [UnityTest]
@@ -110,51 +110,44 @@ public IEnumerator PropRejection_OnPlayerUpdatedFiresWithRejectedProps()
                 rejectedProps = new[] { new RejectedProp { key = "k1", error = "PROP_VALUE_TOO_LONG", message = "too long" } }
             }));
 
-            var result = Talo.CurrentPlayer.SetProp("k1", "v1-updated").GetAwaiter().GetResult();
+            var task = Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+
+            yield return null;
+
+            var result = task.GetAwaiter().GetResult();
 
             Assert.AreEqual(1, result.RejectedProps.Length);
             Assert.AreEqual("k1", result.RejectedProps[0].key);
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsTrue(_mock.lastSuccess);
-
-            yield return null;
         }
 
         [UnityTest]
-        public IEnumerator HttpError_FiresOnPlayerUpdatedWithFalse()
+        public IEnumerator TrailingCall_HttpError_FiresOnPlayerUpdatedWithFalse()
         {
             Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
 
-            // no mock for update means the leading call's Debounce() fails
-
+            // no mock registered — RequestMock.HandleCall throws, simulating an HTTP error
             Talo.CurrentPlayer.SetProp("k1", "v1-updated");
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsFalse(_mock.lastSuccess);
-
-            yield return null;
         }
 
         [UnityTest]
-        public IEnumerator TrailingCall_FailsOnHttpError_ReturnsFlushResultFailure()
+        public IEnumerator TrailingCall_HttpError_FlushReturnsFailure()
         {
             Talo.Players.OnPlayerUpdated += _mock.OnUpdated;
 
-            var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
-            RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
-            {
-                player = new Player { id = "uuid" }
-            }));
-
+            // no mock registered — RequestMock.HandleCall throws, simulating an HTTP error
             Talo.CurrentPlayer.SetProp("k1", "v1-updated");
-            Talo.CurrentPlayer.SetProp("k2", "v2");
-
-            Assert.AreEqual(1, _mock.updatedCount);
-            Assert.IsTrue(_mock.lastSuccess);
 
-            // trailing call has no mock so flush returns Failure (not throw)
             var flushResult = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
             Assert.AreEqual(DebouncedAPIBase.FlushResult.Failure, flushResult);
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsFalse(_mock.lastSuccess);
 
             yield return null;
         }
@@ -179,19 +172,18 @@ public IEnumerator FlushUpdates_WithTrailingQueued_ReturnsSuccessAndFiresEvent()
             }));
 
             Talo.CurrentPlayer.SetProp("k1", "v1-updated");
-            Talo.CurrentPlayer.SetProp("k2", "v2");
 
-            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.AreEqual(0, _mock.updatedCount);
 
             var result = Talo.Players.FlushUpdates().GetAwaiter().GetResult();
             Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
-            Assert.AreEqual(2, _mock.updatedCount);
+            Assert.AreEqual(1, _mock.updatedCount);
 
             yield return null;
         }
 
         [UnityTest]
-        public IEnumerator SetProp_ReturnsResultInline()
+        public IEnumerator SetProp_ReturnsResult()
         {
             var uri = new Uri($"{Talo.Settings.apiUrl}/v1/players/uuid");
             RequestMock.ReplyOnce(uri, "PATCH", JsonUtility.ToJson(new PlayersUpdateResponse
@@ -199,12 +191,14 @@ public IEnumerator SetProp_ReturnsResultInline()
                 player = new Player { id = "uuid" }
             }));
 
-            var result = Talo.CurrentPlayer.SetProp("k1", "v1-updated").GetAwaiter().GetResult();
+            var task = Talo.CurrentPlayer.SetProp("k1", "v1-updated");
+
+            yield return null;
+
+            var result = task.GetAwaiter().GetResult();
 
             Assert.IsTrue(result.Success);
             Assert.AreEqual(0, result.RejectedProps.Length);
-
-            yield return null;
         }
 
         [UnityTest]
diff --git a/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs
index efa62333..506e49a9 100644
--- a/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs	
+++ b/Assets/Talo Game Services/Talo/Tests/SavesAPI/SaveUpdatedEventTest.cs	
@@ -32,7 +32,7 @@ public void SetUp()
             var tm = new GameObject().AddComponent<TaloManager>();
             tm.settings = ScriptableObject.CreateInstance<TaloSettings>();
             tm.settings.autoConnectSocket = false;
-            tm.settings.debounceTimerSeconds = 0.1f;
+            tm.settings.debounceTimerSeconds = 0f;
 
             Talo.CurrentAlias = new PlayerAlias() {
                 player = new Player() {
@@ -85,7 +85,7 @@ private static string PatchedSaveJson()
         }
 
         [UnityTest]
-        public IEnumerator LeadingCall_FiresOnSaveUpdated()
+        public IEnumerator TrailingCall_FiresOnSaveUpdated()
         {
             var api = BuildApiWithChosenSave(1, "Online Save");
             Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
@@ -95,16 +95,16 @@ public IEnumerator LeadingCall_FiresOnSaveUpdated()
 
             _ = Talo.Saves.DebounceUpdate();
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsTrue(_mock.lastSuccess);
             Assert.IsNotNull(_mock.lastSave);
             Assert.AreEqual(1, _mock.lastSave.id);
-
-            yield return null;
         }
 
         [UnityTest]
-        public IEnumerator LeadingAndTrailing_FireOnSaveUpdatedTwice()
+        public IEnumerator TrailingCall_FiresOnceForMultipleCalls()
         {
             var api = BuildApiWithChosenSave(1, "Online Save");
             Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
@@ -115,49 +115,42 @@ public IEnumerator LeadingAndTrailing_FireOnSaveUpdatedTwice()
             _ = Talo.Saves.DebounceUpdate();
             _ = Talo.Saves.DebounceUpdate();
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
 
             var result = Talo.Saves.FlushUpdates().GetAwaiter().GetResult();
-            Assert.AreEqual(DebouncedAPIBase.FlushResult.Success, result);
-            Assert.AreEqual(2, _mock.updatedCount);
-
-            yield return null;
+            Assert.AreEqual(DebouncedAPIBase.FlushResult.NothingPending, result);
+            Assert.AreEqual(1, _mock.updatedCount);
         }
 
         [UnityTest]
-        public IEnumerator HttpError_FiresOnSaveUpdatedWithFalse()
+        public IEnumerator TrailingCall_HttpError_FiresOnSaveUpdatedWithFalse()
         {
             BuildApiWithChosenSave(1, "Online Save");
             Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
 
-            // no mock for update means the leading call's Debounce() fails
             _ = Talo.Saves.DebounceUpdate();
 
+            yield return null;
+
             Assert.AreEqual(1, _mock.updatedCount);
             Assert.IsFalse(_mock.lastSuccess);
             Assert.IsNull(_mock.lastSave);
-
-            yield return null;
         }
 
         [UnityTest]
-        public IEnumerator TrailingCall_FailsOnHttpError_ReturnsFlushResultFailure()
+        public IEnumerator TrailingCall_HttpError_FlushReturnsFailure()
         {
-            var api = BuildApiWithChosenSave(1, "Online Save");
+            BuildApiWithChosenSave(1, "Online Save");
             Talo.Saves.OnSaveUpdated += _mock.OnUpdated;
 
-            var uri = new Uri(api.GetUri() + "/1");
-            RequestMock.ReplyOnce(uri, "PATCH", PatchedSaveJson());
-
             _ = Talo.Saves.DebounceUpdate();
-            _ = Talo.Saves.DebounceUpdate();
-
-            Assert.AreEqual(1, _mock.updatedCount);
-            Assert.IsTrue(_mock.lastSuccess);
 
-            // trailing call has no mock so flush returns Failure (not throw)
             var flushResult = Talo.Saves.FlushUpdates().GetAwaiter().GetResult();
             Assert.AreEqual(DebouncedAPIBase.FlushResult.Failure, flushResult);
+            Assert.AreEqual(1, _mock.updatedCount);
+            Assert.IsFalse(_mock.lastSuccess);
 
             yield return null;
         }

From e60b914d66fb08a6d0dd95b17c481318658a0c8d Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Wed, 5 Aug 2026 18:18:56 +0100
Subject: [PATCH 25/27] make default debounce time 0.5 seconds

---
 Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs b/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs
index ef6d1e7e..fa7522d2 100644
--- a/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/TaloSettings.cs	
@@ -36,7 +36,7 @@ public class TaloSettings : ScriptableObject
         public bool cachePlayerOnIdentify = true;
 
         [Tooltip("Number of seconds to wait before sending debounced requests (e.g. player updates, save updates and health checks)")]
-        public float debounceTimerSeconds = 1f;
+        public float debounceTimerSeconds = 0.5f;
 
         [Tooltip("Enable request verification to prevent replay attacks and tampering - this must also be enabled in the dashboard")]
         public bool verificationEnabled = false;

From 91b6f09f21366aba5cac7596875bbee163f9c357 Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Wed, 19 Aug 2026 21:04:38 +0100
Subject: [PATCH 26/27] restrict ci workflows to develop and pull requests,
 drop pr summary

---
 .github/workflows/build-check.yml |  5 ++-
 .github/workflows/ci.yml          |  7 ++--
 .github/workflows/pr-summary.yml  | 58 -------------------------------
 3 files changed, 9 insertions(+), 61 deletions(-)
 delete mode 100644 .github/workflows/pr-summary.yml

diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
index 9299695f..66981748 100644
--- a/.github/workflows/build-check.yml
+++ b/.github/workflows/build-check.yml
@@ -1,6 +1,9 @@
 name: Build check
 
-on: push
+on:
+  push:
+    branches: [develop]
+  pull_request:
 
 jobs:
   build-check:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f7b6c9f4..2ee5b9a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
-name: Unity tests
+name: Unit tests
 
-on: push
+on:
+  push:
+    branches: [develop]
+  pull_request:
 
 jobs:
   test:
diff --git a/.github/workflows/pr-summary.yml b/.github/workflows/pr-summary.yml
deleted file mode 100644
index 605d8e4d..00000000
--- a/.github/workflows/pr-summary.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: Summarise
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  summarise:
-    if: ${{ github.event.pull_request.user.login == 'tudddorrr' }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    permissions:
-      contents: read
-      pull-requests: write
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      - name: Get opencode version
-        id: version
-        run: |
-          VERSION=$(curl -sf https://api.github.com/repos/anomalyco/opencode/releases/latest | grep -o '"tag_name": *"[^"]*"' | cut -d'"' -f4)
-          echo "version=${VERSION:-latest}" >> "$GITHUB_OUTPUT"
-
-      - name: Cache opencode
-        id: cache
-        uses: actions/cache@v5
-        with:
-          path: ~/.opencode/bin
-          key: opencode-${{ runner.os }}-${{ runner.arch }}-${{ steps.version.outputs.version }}
-
-      - name: Install opencode
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: curl -fsSL https://opencode.ai/install | bash
-
-      - name: Generate and apply summary
-        env:
-          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          MODEL: opencode-go/mimo-v2.5-pro
-        run: |
-          set -euo pipefail
-          export PATH="$HOME/.opencode/bin:$PATH"
-          PROMPT="$(cat <<'EOF'
-          Summarise the changes in this pull request at a high level.
-          1-5 paragraphs. Each paragraph must start with a bolded theme title of a few words on its own line (e.g. **Authentication overhaul**), followed by one bullet point for each individual point within that theme.
-          Separate paragraphs with a blank line.
-          Focus on substantive changes. Skip tests, fixtures, formatting and wiring unless they are the point of the PR.
-          Describe what changed and why, not how it works internally.
-          No preamble, no restating the title, no judgements.
-          EOF
-          )"
-          BODY="$(gh pr diff "$PR_NUMBER" | opencode run --model "$MODEL" "$PROMPT")"
-          gh pr edit "$PR_NUMBER" --body "$BODY"

From 70e2c3a86b59fe7f66de01678691f68867f94d7f Mon Sep 17 00:00:00 2001
From: tudor <7089284+tudddorrr@users.noreply.github.com>
Date: Mon, 24 Aug 2026 00:12:20 +0100
Subject: [PATCH 27/27] 1.0.0

---
 Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs | 2 +-
 Assets/Talo Game Services/Talo/VERSION                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs
index 6d367940..88ad0da9 100644
--- a/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs	
+++ b/Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs	
@@ -9,7 +9,7 @@ namespace TaloGameServices
     public class BaseAPI
     {
         // automatically updated with a pre-commit hook
-        private const string ClientVersion = "0.60.2";
+        private const string ClientVersion = "1.0.0";
 
         protected string baseUrl;
 
diff --git a/Assets/Talo Game Services/Talo/VERSION b/Assets/Talo Game Services/Talo/VERSION
index aba2fdc2..3eefcb9d 100644
--- a/Assets/Talo Game Services/Talo/VERSION	
+++ b/Assets/Talo Game Services/Talo/VERSION	
@@ -1 +1 @@
-0.60.2
+1.0.0