fix(android): preserve history context usage (#92837) (thanks @Tosko4)

obviyus · obviyus · commit c1219d161d3e · 2026-06-15T19:55:17.000+05:30
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/chat/ChatController.kt b/apps/android/app/src/main/java/ai/openclaw/app/chat/ChatController.kt
@@ -699,15 +699,25 @@ class ChatController(
 
   private fun updateSessionFromHistory(history: ChatHistory) {
     val info = history.sessionInfo ?: return
-    upsertSessionEntry(info)
+    upsertSessionEntry(info, preserveExistingContextUsageWithoutTotal = true)
   }
 
-  private fun upsertSessionEntry(entry: ChatSessionEntry) {
+  private fun upsertSessionEntry(
+    entry: ChatSessionEntry,
+    preserveExistingContextUsageWithoutTotal: Boolean = false,
+  ) {
     val current = _sessions.value
     val index = current.indexOfFirst { it.key == entry.key }
     _sessions.value =
       if (index >= 0) {
-        current.toMutableList().also { it[index] = mergeChatSessionEntry(it[index], entry) }
+        current.toMutableList().also {
+          it[index] =
+            mergeChatSessionEntry(
+              existing = it[index],
+              next = entry,
+              preserveExistingContextUsageWithoutTotal = preserveExistingContextUsageWithoutTotal,
+            )
+        }
       } else {
         listOf(entry) + current
       }
@@ -947,12 +957,34 @@ private fun JsonElement?.asBooleanOrNull(): Boolean? =
 internal fun mergeChatSessionEntry(
   existing: ChatSessionEntry,
   next: ChatSessionEntry,
-): ChatSessionEntry =
-  existing.copy(
+  preserveExistingContextUsageWithoutTotal: Boolean = false,
+): ChatSessionEntry {
+  val preserveExistingContextUsage = preserveExistingContextUsageWithoutTotal && next.totalTokens == null
+  return existing.copy(
     updatedAtMs = next.updatedAtMs ?: existing.updatedAtMs,
     displayName = next.displayName ?: existing.displayName,
-    totalTokens = if (next.hasContextUsageMetadata) next.totalTokens else null,
-    totalTokensFresh = if (next.hasContextUsageMetadata) next.totalTokensFresh else null,
-    contextTokens = if (next.hasContextUsageMetadata) next.contextTokens else null,
-    hasContextUsageMetadata = next.hasContextUsageMetadata,
+    totalTokens =
+      when {
+        preserveExistingContextUsage -> existing.totalTokens
+        next.hasContextUsageMetadata -> next.totalTokens
+        else -> null
+      },
+    totalTokensFresh =
+      when {
+        preserveExistingContextUsage -> existing.totalTokensFresh
+        next.hasContextUsageMetadata -> next.totalTokensFresh
+        else -> null
+      },
+    contextTokens =
+      when {
+        preserveExistingContextUsage -> next.contextTokens ?: existing.contextTokens
+        next.hasContextUsageMetadata -> next.contextTokens
+        else -> null
+      },
+    hasContextUsageMetadata =
+      when {
+        preserveExistingContextUsage -> existing.hasContextUsageMetadata || next.contextTokens != null
+        else -> next.hasContextUsageMetadata
+      },
   )
+}
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/chat/ChatControllerSessionPolicyTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/chat/ChatControllerSessionPolicyTest.kt
@@ -90,6 +90,41 @@ class ChatControllerSessionPolicyTest {
     assertFalse(merged.hasContextUsageMetadata)
   }
 
+  @Test
+  fun sessionMergePreservesUsageWhenHistorySnapshotOmitsTotalTokens() {
+    val existing =
+      ChatSessionEntry(
+        key = "agent:main:phone",
+        updatedAtMs = 1L,
+        displayName = "Phone",
+        totalTokens = 41_000L,
+        totalTokensFresh = true,
+        contextTokens = 100_000L,
+      )
+    val next =
+      ChatSessionEntry(
+        key = "agent:main:phone",
+        updatedAtMs = 2L,
+        displayName = "Phone renamed",
+        totalTokensFresh = false,
+        contextTokens = 120_000L,
+      )
+
+    val merged =
+      mergeChatSessionEntry(
+        existing = existing,
+        next = next,
+        preserveExistingContextUsageWithoutTotal = true,
+      )
+
+    assertEquals(2L, merged.updatedAtMs)
+    assertEquals("Phone renamed", merged.displayName)
+    assertEquals(41_000L, merged.totalTokens)
+    assertEquals(true, merged.totalTokensFresh)
+    assertEquals(120_000L, merged.contextTokens)
+    assertTrue(merged.hasContextUsageMetadata)
+  }
+
   @Test
   fun sessionMergeAppliesExplicitStaleUsageMetadata() {
     val existing =
