fix(android): clear stale context usage snapshots · openclaw/openclaw@8f9493c

Recent Commits to openclaw:main

Tosko4 · 2026-06-15 · via Recent Commits to openclaw:main

File tree

- main/java/ai/openclaw/app/chat
- test/java/ai/openclaw/app/chat

Original file line number	Diff line number	Diff line change
`@@ -685,6 +685,10 @@ class ChatController(`
`685`	`685`	`totalTokens = obj["totalTokens"].asLongOrNull(),`
`686`	`686`	`totalTokensFresh = obj["totalTokensFresh"].asBooleanOrNull(),`
`687`	`687`	`contextTokens = obj["contextTokens"].asLongOrNull(),`
	`688`	`+ hasContextUsageMetadata =`
	`689`	`+"totalTokens" in obj \|\|`
	`690`	`+"totalTokensFresh" in obj \|\|`
	`691`	`+"contextTokens" in obj,`
`688`	`692`	`)`
`689`	`693`	`}`
`690`	`694`
`@@ -698,7 +702,7 @@ class ChatController(`
`698`	`702`	`val index = current.indexOfFirst { it.key == entry.key }`
`699`	`703`	`_sessions.value =`
`700`	`704`	`if (index >= 0) {`
`701`		`- current.toMutableList().also { it[index] = mergeSessionEntry(it[index], entry) }`
	`705`	`+ current.toMutableList().also { it[index] = mergeChatSessionEntry(it[index], entry) }`
`702`	`706`	`} else {`
`703`	`707`	`listOf(entry) + current`
`704`	`708`	`}`
`@@ -709,18 +713,6 @@ class ChatController(`
`709`	`713`	`_sessions.value = _sessions.value.filterNot { it.key == key }`
`710`	`714`	`}`
`711`	`715`
`712`		`-private fun mergeSessionEntry(`
`713`		`-existing: ChatSessionEntry,`
`714`		`-next: ChatSessionEntry,`
`715`		`- ): ChatSessionEntry =`
`716`		`- existing.copy(`
`717`		`- updatedAtMs = next.updatedAtMs ?: existing.updatedAtMs,`
`718`		`- displayName = next.displayName ?: existing.displayName,`
`719`		`- totalTokens = next.totalTokens ?: existing.totalTokens,`
`720`		`- totalTokensFresh = next.totalTokensFresh ?: existing.totalTokensFresh,`
`721`		`- contextTokens = next.contextTokens ?: existing.contextTokens,`
`722`		`- )`
`723`		`-`
`724`	`716`	`private fun parseRunId(resJson: String): String? =`
`725`	`717`	`try {`
`726`	`718`	`json`
`@@ -946,3 +938,16 @@ private fun JsonElement?.asBooleanOrNull(): Boolean? =`
`946`	`938`	`is JsonPrimitive -> content.toBooleanStrictOrNull()`
`947`	`939`	`else -> null`
`948`	`940`	`}`
	`941`	`+`
	`942`	`+internal fun mergeChatSessionEntry(`
	`943`	`+existing: ChatSessionEntry,`
	`944`	`+next: ChatSessionEntry,`
	`945`	`+): ChatSessionEntry =`
	`946`	`+ existing.copy(`
	`947`	`+ updatedAtMs = next.updatedAtMs ?: existing.updatedAtMs,`
	`948`	`+ displayName = next.displayName ?: existing.displayName,`
	`949`	`+ totalTokens = if (next.hasContextUsageMetadata) next.totalTokens else null,`
	`950`	`+ totalTokensFresh = if (next.hasContextUsageMetadata) next.totalTokensFresh else null,`
	`951`	`+ contextTokens = if (next.hasContextUsageMetadata) next.contextTokens else null,`
	`952`	`+ hasContextUsageMetadata = next.hasContextUsageMetadata,`
	`953`	`+ )`

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ data class ChatSessionEntry(`
`43`	`43`	`val totalTokens: Long? = null,`
`44`	`44`	`val totalTokensFresh: Boolean? = null,`
`45`	`45`	`val contextTokens: Long? = null,`
	`46`	`+val hasContextUsageMetadata: Boolean = totalTokens != null \|\| totalTokensFresh != null \|\| contextTokens != null,`
`46`	`47`	`)`
`47`	`48`
`48`	`49`	`/**`

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,61 @@ class ChatControllerSessionPolicyTest {`
`59`	`59`	`),`
`60`	`60`	`)`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ @Test`
	`64`	`+fun sessionMergeClearsUsageWhenNewSnapshotOmitsUsageMetadata() {`
	`65`	`+val existing =`
	`66`	`+ChatSessionEntry(`
	`67`	`+ key = "agent:main:phone",`
	`68`	`+ updatedAtMs = 1L,`
	`69`	`+ displayName = "Phone",`
	`70`	`+ totalTokens = 41_000L,`
	`71`	`+ totalTokensFresh = true,`
	`72`	`+ contextTokens = 100_000L,`
	`73`	`+ )`
	`74`	`+val next =`
	`75`	`+ChatSessionEntry(`
	`76`	`+ key = "agent:main:phone",`
	`77`	`+ updatedAtMs = 2L,`
	`78`	`+ displayName = "Phone renamed",`
	`79`	`+ hasContextUsageMetadata = false,`
	`80`	`+ )`
	`81`	`+`
	`82`	`+val merged = mergeChatSessionEntry(existing, next)`
	`83`	`+`
	`84`	`+ assertEquals("agent:main:phone", merged.key)`
	`85`	`+ assertEquals(2L, merged.updatedAtMs)`
	`86`	`+ assertEquals("Phone renamed", merged.displayName)`
	`87`	`+ assertEquals(null, merged.totalTokens)`
	`88`	`+ assertEquals(null, merged.totalTokensFresh)`
	`89`	`+ assertEquals(null, merged.contextTokens)`
	`90`	`+ assertFalse(merged.hasContextUsageMetadata)`
	`91`	`+ }`
	`92`	`+`
	`93`	`+ @Test`
	`94`	`+fun sessionMergeAppliesExplicitStaleUsageMetadata() {`
	`95`	`+val existing =`
	`96`	`+ChatSessionEntry(`
	`97`	`+ key = "agent:main:phone",`
	`98`	`+ updatedAtMs = 1L,`
	`99`	`+ totalTokens = 41_000L,`
	`100`	`+ totalTokensFresh = true,`
	`101`	`+ contextTokens = 100_000L,`
	`102`	`+ )`
	`103`	`+val next =`
	`104`	`+ChatSessionEntry(`
	`105`	`+ key = "agent:main:phone",`
	`106`	`+ updatedAtMs = 2L,`
	`107`	`+ totalTokens = 82_000L,`
	`108`	`+ totalTokensFresh = false,`
	`109`	`+ contextTokens = 100_000L,`
	`110`	`+ )`
	`111`	`+`
	`112`	`+val merged = mergeChatSessionEntry(existing, next)`
	`113`	`+`
	`114`	`+ assertEquals(82_000L, merged.totalTokens)`
	`115`	`+ assertEquals(false, merged.totalTokensFresh)`
	`116`	`+ assertEquals(100_000L, merged.contextTokens)`
	`117`	`+ assertTrue(merged.hasContextUsageMetadata)`
	`118`	`+ }`
`62`	`119`	`}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree