vrr/openclaw
2
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-09 15:59:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(chat): keep proof decision out of actor closure (#101611)

Browse source 
* fix(chat): keep proof decision out of actor closure

* fix(ios): narrow chat proof lock scope

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>
This commit is contained in:
冯基魁 2026-07-09 15:44:14 +08:00 • committed by GitHub
parent f0d4d4f2fc
commit bacf048ab9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
apps/shared/OpenClawKit/Sources/OpenClawChatUI/ChatTranscriptCache.swift
View file

@ -72,10 +72,13 @@ private final class CanonicalMessageProofHub: @unchecked Sendable {
/// Serializes the final cancellation decision and SQLite commit with
/// synchronous canonical observation. Evidence recorded before this lock
/// wins; evidence after it observes a completed cancellation.
func withProofDecision<T>(for key: String, _ body: (Bool) -> T) -> T {
func lockProofDecision(for key: String) -> Bool {
self.lock.lock()
defer { self.lock.unlock() }
return body(self.keys.contains(key))
return self.keys.contains(key)
}
func unlockProofDecision() {
self.lock.unlock()
}
}
@ -1028,11 +1031,11 @@ public actor OpenClawChatSQLiteTranscriptCache: OpenClawChatTranscriptCache,
sessionKey = foundSessionKey
agentID = foundAgentID
case .missing:
return self.canonicalMessageProofHub.withProofDecision(for: messageKey) { isProven in
committed = self.execute(db, sql: "COMMIT", bindings: [])
guard committed else { return .unavailable }
return isProven ? .confirmed : .missing
}
let isProven = self.canonicalMessageProofHub.lockProofDecision(for: messageKey)
defer { self.canonicalMessageProofHub.unlockProofDecision() }
committed = self.execute(db, sql: "COMMIT", bindings: [])
guard committed else { return .unavailable }
return isProven ? .confirmed : .missing
case .unavailable:
return .unavailable
}
@ -1045,21 +1048,25 @@ public actor OpenClawChatSQLiteTranscriptCache: OpenClawChatTranscriptCache,
bindings: [self.gatewayID, id])
else { return .unavailable }
guard sqlite3_changes(db) > 0 else { return .unavailable }
let result = self.canonicalMessageProofHub.withProofDecision(for: messageKey) { isProven in
let result: OpenClawChatOutboxUpdateResult
do {
let isProven = self.canonicalMessageProofHub.lockProofDecision(for: messageKey)
defer { self.canonicalMessageProofHub.unlockProofDecision() }
if isProven {
committed = self.execute(db, sql: "COMMIT", bindings: [])
return committed ? OpenClawChatOutboxUpdateResult.confirmed : .unavailable
}
guard self.removeCachedMessage(
db,
sessionKey: sessionKey,
agentID: Self.transcriptCacheAgentID(
result = committed ? .confirmed : .unavailable
} else {
guard self.removeCachedMessage(
db,
sessionKey: sessionKey,
agentID: agentID),
idempotencyKey: messageKey)
else { return .unavailable }
committed = self.execute(db, sql: "COMMIT", bindings: [])
return committed ? .updated : .unavailable
agentID: Self.transcriptCacheAgentID(
sessionKey: sessionKey,
agentID: agentID),
idempotencyKey: messageKey)
else { return .unavailable }
committed = self.execute(db, sql: "COMMIT", bindings: [])
result = committed ? .updated : .unavailable
}
}
if result == .confirmed {
self.emitOutboxChange(.confirmed(id: id))