fix: handle iOS global agent transcripts · openclaw/openc...

Recent Commits to openclaw:main

steipete · 2026-06-01 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ import Testing`
`95`	`95`	`@Test func mapsSessionMessageEventToSessionMessage() {`
`96`	`96`	`let payload = AnyCodable([`
`97`	`97`	`"sessionKey": AnyCodable("agent:main:main"),`
	`98`	`+"agentId": AnyCodable("main"),`
`98`	`99`	`"messageId": AnyCodable("msg-1"),`
`99`	`100`	`"messageSeq": AnyCodable(7),`
`100`	`101`	`"message": AnyCodable([`
`@@ -119,6 +120,7 @@ import Testing`
`119`	`120`	`switch mapped {`
`120`	`121`	`case let .sessionMessage(message):`
`121`	`122`	`#expect(message.sessionKey == "agent:main:main")`
	`123`	`+ #expect(message.agentId == "main")`
`122`	`124`	`#expect(message.messageId == "msg-1")`
`123`	`125`	`#expect(message.messageSeq == 7)`
`124`	`126`	`#expect(message.message?.role == "assistant")`

Original file line number	Diff line number	Diff line change
`@@ -326,17 +326,20 @@ public struct OpenClawChatEventPayload: Codable, Sendable {`
`326`	`326`
`327`	`327`	`public struct OpenClawSessionMessageEventPayload: Codable, Sendable {`
`328`	`328`	`public let sessionKey: String?`
	`329`	`+public let agentId: String?`
`329`	`330`	`public let message: OpenClawChatMessage?`
`330`	`331`	`public let messageId: String?`
`331`	`332`	`public let messageSeq: Int?`
`332`	`333`
`333`	`334`	`public init(`
`334`	`335`	`sessionKey: String?,`
	`336`	`+ agentId: String? = nil,`
`335`	`337`	`message: OpenClawChatMessage?,`
`336`	`338`	`messageId: String?,`
`337`	`339`	`messageSeq: Int?)`
`338`	`340`	`{`
`339`	`341`	`self.sessionKey = sessionKey`
	`342`	`+self.agentId = agentId`
`340`	`343`	`self.message = message`
`341`	`344`	`self.messageId = messageId`
`342`	`345`	`self.messageSeq = messageSeq`

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,21 @@ extension OpenClawChatViewModel {`
`8`	`8`	`mainSessionKey: self.resolvedMainSessionKey)`
`9`	`9`	`}`
`10`	`10`
`11`		`-static func matchesCurrentSessionKey(incoming: String, current: String, mainSessionKey: String) -> Bool {`
	`11`	`+func matchesCurrentSessionKey(incoming: String, agentId: String?, current: String) -> Bool {`
	`12`	`+Self.matchesCurrentSessionKey(`
	`13`	`+ incoming: incoming,`
	`14`	`+ agentId: agentId,`
	`15`	`+ current: current,`
	`16`	`+ mainSessionKey: self.resolvedMainSessionKey)`
	`17`	`+}`
	`18`	`+`
	`19`	`+static func matchesCurrentSessionKey(`
	`20`	`+ incoming: String,`
	`21`	`+ agentId: String? = nil,`
	`22`	`+ current: String,`
	`23`	`+ mainSessionKey: String)`
	`24`	`+-> Bool`
	`25`	`+{`
`12`	`26`	`let incomingNormalized = incoming.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()`
`13`	`27`	`let currentNormalized = current.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()`
`14`	`28`	`if incomingNormalized == currentNormalized {`
`@@ -23,6 +37,13 @@ extension OpenClawChatViewModel {`
`23`	`37`	`{`
`24`	`38`	`return true`
`25`	`39`	`}`
	`40`	`+if Self.matchesSelectedAgentGlobal(`
	`41`	`+ incoming: incomingNormalized,`
	`42`	`+ agentId: agentId,`
	`43`	`+ current: currentNormalized)`
	`44`	`+{`
	`45`	`+return true`
	`46`	`+}`
`26`	`47`	`return false`
`27`	`48`	`}`
`28`	`49`
`@@ -36,4 +57,14 @@ extension OpenClawChatViewModel {`
`36`	`57`	`return (current == "main" && incoming == "agent:main:main") \|\|`
`37`	`58`	`(incoming == "main" && current == "agent:main:main")`
`38`	`59`	`}`
	`60`	`+`
	`61`	`+private static func matchesSelectedAgentGlobal(incoming: String, agentId: String?, current: String) -> Bool {`
	`62`	`+guard incoming == "global",`
	`63`	`+let selectedAgentId = agentId?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased(),`
	`64`	`+ !selectedAgentId.isEmpty`
	`65`	`+else {`
	`66`	`+return false`
	`67`	`+}`
	`68`	`+return current == "agent:\(selectedAgentId):global"`
	`69`	`+}`
`39`	`70`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ public final class OpenClawChatViewModel {`
`1302`	`1302`
`1303`	`1303`	`private func handleSessionMessageEvent(_ payload: OpenClawSessionMessageEventPayload) {`
`1304`	`1304`	`if let sessionKey = payload.sessionKey,`
`1305`		`- !self.matchesCurrentSessionKey(incoming: sessionKey, current: self.sessionKey)`
	`1305`	`+ !self.matchesCurrentSessionKey(incoming: sessionKey, agentId: payload.agentId, current: self.sessionKey)`
`1306`	`1306`	`{`
`1307`	`1307`	`return`
`1308`	`1308`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1092,6 +1092,75 @@ extension TestChatTransportState {`
`1092`	`1092`	`}`
`1093`	`1093`	`}`
`1094`	`1094`
	`1095`	`+@Test func appendsGlobalSessionUserMessageForSelectedAgent() async throws {`
	`1096`	`+let now = Date().timeIntervalSince1970 * 1000`
	`1097`	`+let (transport, vm) = await makeViewModel(`
	`1098`	`+ sessionKey: "agent:work:global",`
	`1099`	`+ historyResponses: [historyPayload(sessionKey: "agent:work:global")])`
	`1100`	`+`
	`1101`	`+await MainActor.run { vm.load() }`
	`1102`	`+try await waitUntil("bootstrap history loaded") { await MainActor.run { vm.messages.isEmpty } }`
	`1103`	`+`
	`1104`	`+ transport.emit(`
	`1105`	`+.sessionMessage(`
	`1106`	`+OpenClawSessionMessageEventPayload(`
	`1107`	`+ sessionKey: "global",`
	`1108`	`+ agentId: "work",`
	`1109`	`+ message: OpenClawChatMessage(`
	`1110`	`+ role: "user",`
	`1111`	`+ content: [`
	`1112`	`+OpenClawChatMessageContent(`
	`1113`	`+ type: "text",`
	`1114`	`+ text: "global transcript",`
	`1115`	`+ mimeType: nil,`
	`1116`	`+ fileName: nil,`
	`1117`	`+ content: nil),`
	`1118`	`+],`
	`1119`	`+ timestamp: now),`
	`1120`	`+ messageId: "msg-global-work",`
	`1121`	`+ messageSeq: 1)))`
	`1122`	`+`
	`1123`	`+try await waitUntil("selected agent global transcript visible") {`
	`1124`	`+await MainActor.run {`
	`1125`	`+ vm.messages.count == 1 &&`
	`1126`	`+ vm.messages.first?.role == "user" &&`
	`1127`	`+ vm.messages.first?.content.first?.text == "global transcript"`
	`1128`	`+}`
	`1129`	`+}`
	`1130`	`+}`
	`1131`	`+`
	`1132`	`+@Test func ignoresGlobalSessionUserMessageForDifferentAgent() async throws {`
	`1133`	`+let now = Date().timeIntervalSince1970 * 1000`
	`1134`	`+let (transport, vm) = await makeViewModel(`
	`1135`	`+ sessionKey: "agent:work:global",`
	`1136`	`+ historyResponses: [historyPayload(sessionKey: "agent:work:global")])`
	`1137`	`+`
	`1138`	`+await MainActor.run { vm.load() }`
	`1139`	`+try await waitUntil("bootstrap history loaded") { await MainActor.run { vm.messages.isEmpty } }`
	`1140`	`+`
	`1141`	`+ transport.emit(`
	`1142`	`+.sessionMessage(`
	`1143`	`+OpenClawSessionMessageEventPayload(`
	`1144`	`+ sessionKey: "global",`
	`1145`	`+ agentId: "main",`
	`1146`	`+ message: OpenClawChatMessage(`
	`1147`	`+ role: "user",`
	`1148`	`+ content: [`
	`1149`	`+OpenClawChatMessageContent(`
	`1150`	`+ type: "text",`
	`1151`	`+ text: "wrong global transcript",`
	`1152`	`+ mimeType: nil,`
	`1153`	`+ fileName: nil,`
	`1154`	`+ content: nil),`
	`1155`	`+],`
	`1156`	`+ timestamp: now),`
	`1157`	`+ messageId: "msg-global-main",`
	`1158`	`+ messageSeq: 1)))`
	`1159`	`+`
	`1160`	`+try await Task.sleep(nanoseconds: 100_000_000)`
	`1161`	`+ #expect(await MainActor.run { vm.messages.isEmpty })`
	`1162`	`+}`
	`1163`	`+`
`1095`	`1164`	`@Test func ignoresAgentMainSessionMessageForDifferentCurrentMainAlias() async throws {`
`1096`	`1165`	`let now = Date().timeIntervalSince1970 * 1000`
`1097`	`1166`	`let (transport, vm) = await makeViewModel(historyResponses: [historyPayload()])`

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

推荐订阅源

Recent Commits to openclaw:main