fix(ios): show focused session agent · openclaw/openclaw@67dc719

Recent Commits to openclaw:main

joshavant · 2026-06-06 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,7 @@ struct ChatProTab: View {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private var activeAgentID: String {`
`135`		`-self.normalized(self.appModel.selectedAgentId)`
`136`		`-?? self.normalized(self.appModel.gatewayDefaultAgentId)`
	`135`	`+self.normalized(self.appModel.chatAgentId)`
`137`	`136`	`?? "main"`
`138`	`137`	`}`
`139`	`138`
`@@ -171,7 +170,7 @@ struct ChatProTab: View {`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`private var agentDisplayName: String {`
`174`		`-self.normalized(self.activeAgent?.name) ?? self.appModel.activeAgentName`
	`173`	`+self.normalized(self.activeAgent?.name) ?? self.appModel.chatAgentName`
`175`	`174`	`}`
`176`	`175`
`177`	`176`	`private var agentBadge: String {`

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ struct TalkProTab: View {`
`153`	`153`	`.padding(.horizontal, 12)`
`154`	`154`	`.padding(.top, 11)`
`155`	`155`	`.padding(.bottom, 3)`
`156`		`-self.infoRow(icon: "person.crop.circle.fill", title: "Agent", value: self.appModel.activeAgentName)`
	`156`	`+self.infoRow(icon: "person.crop.circle.fill", title: "Agent", value: self.appModel.chatAgentName)`
`157`	`157`	`Divider().padding(.leading, 54)`
`158`	`158`	`self.infoRow(`
`159`	`159`	`icon: "bubble.left.and.text.bubble.right.fill",`
`@@ -292,7 +292,7 @@ struct TalkProTab: View {`
`292`	`292`
`293`	`293`	`private var headerSubtitle: String {`
`294`	`294`	`let mode = self.appModel.talkMode.gatewayTalkVoiceModeTitle.trimmingCharacters(in: .whitespacesAndNewlines)`
`295`		`-let agent = self.appModel.activeAgentName.trimmingCharacters(in: .whitespacesAndNewlines)`
	`295`	`+let agent = self.appModel.chatAgentName.trimmingCharacters(in: .whitespacesAndNewlines)`
`296`	`296`	`if mode.isEmpty \|\| mode == "Not loaded" { return agent.isEmpty ? "Realtime voice" : agent }`
`297`	`297`	`if agent.isEmpty { return mode }`
`298`	`298`	`return "\(agent) • \(mode)"`
`@@ -308,7 +308,7 @@ struct TalkProTab: View {`
`308`	`308`	`let subtitle = (self.appModel.talkMode.gatewayTalkVoiceModeSubtitle ?? "")`
`309`	`309`	`.trimmingCharacters(in: .whitespacesAndNewlines)`
`310`	`310`	`if !subtitle.isEmpty { return subtitle }`
`311`		`-return "Routes voice to \(self.appModel.activeAgentName)."`
	`311`	`+return "Routes voice to \(self.appModel.chatAgentName)."`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`private var transportText: String {`
`@@ -368,6 +368,7 @@ struct TalkProTab: View {`
`368`	`368`
`369`	`369`	`private func startTalk() {`
`370`	`370`	`self.talkEnabled = true`
	`371`	`+self.appModel.talkMode.updateMainSessionKey(self.appModel.chatSessionKey)`
`371`	`372`	`self.appModel.setTalkEnabled(true)`
`372`	`373`	`}`
`373`	`374`

Original file line number	Diff line number	Diff line change
`@@ -1864,11 +1864,30 @@ extension NodeAppModel {`
`1864`	`1864`	`self.talkMode.updateMainSessionKey(self.chatSessionKey)`
`1865`	`1865`	`}`
`1866`	`1866`
	`1867`	`+var chatAgentId: String {`
	`1868`	`+if let sessionAgentId = SessionKey.agentId(from: self.chatSessionKey) {`
	`1869`	`+return sessionAgentId`
	`1870`	`+}`
	`1871`	`+return self.selectedOrDefaultAgentId`
	`1872`	`+}`
	`1873`	`+`
	`1874`	`+var chatAgentName: String {`
	`1875`	`+self.agentDisplayName(for: self.chatAgentId, fallback: "Main")`
	`1876`	`+}`
	`1877`	`+`
`1867`	`1878`	`var activeAgentName: String {`
	`1879`	`+self.agentDisplayName(for: self.selectedOrDefaultAgentId, fallback: "Main")`
	`1880`	`+}`
	`1881`	`+`
	`1882`	`+private var selectedOrDefaultAgentId: String {`
`1868`	`1883`	`let agentId = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`1869`	`1884`	`let defaultId = (self.gatewayDefaultAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`1870`		`-let resolvedId = agentId.isEmpty ? defaultId : agentId`
`1871`		`-if resolvedId.isEmpty { return "Main" }`
	`1885`	`+return agentId.isEmpty ? defaultId : agentId`
	`1886`	`+}`
	`1887`	`+`
	`1888`	`+private func agentDisplayName(for agentId: String, fallback: String) -> String {`
	`1889`	`+let resolvedId = agentId.trimmingCharacters(in: .whitespacesAndNewlines)`
	`1890`	`+if resolvedId.isEmpty { return fallback }`
`1872`	`1891`	`if let match = self.gatewayAgents.first(where: { $0.id == resolvedId }) {`
`1873`	`1892`	`let name = (match.name ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`1874`	`1893`	`return name.isEmpty ? match.id : name`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,15 @@ enum SessionKey {`
`14`	`14`	`return "agent:\(trimmedAgent):\(normalizedBase)"`
`15`	`15`	`}`
`16`	`16`
	`17`	`+static func agentId(from value: String?) -> String? {`
	`18`	`+let parts = (value ?? "")`
	`19`	`+.trimmingCharacters(in: .whitespacesAndNewlines)`
	`20`	`+.split(separator: ":", omittingEmptySubsequences: false)`
	`21`	`+guard parts.count >= 3, parts[0].lowercased() == "agent" else { return nil }`
	`22`	`+let agentId = String(parts[1]).trimmingCharacters(in: .whitespacesAndNewlines)`
	`23`	`+return agentId.isEmpty ? nil : agentId`
	`24`	`+}`
	`25`	`+`
`17`	`26`	`static func isCanonicalMainSessionKey(_ value: String?) -> Bool {`
`18`	`27`	`let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`19`	`28`	`if trimmed.isEmpty { return false }`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import Foundation`
`2`	`2`	`import OpenClawKit`
	`3`	`+import OpenClawProtocol`
`3`	`4`	`import Testing`
`4`	`5`	`import UIKit`
`5`	`6`	`import UserNotifications`
`@@ -214,6 +215,63 @@ private final class MockBootstrapNotificationCenter: NotificationCentering, @unc`
`214`	`215`	`#expect(appModel.mainSessionKey == "agent:agent-123:main")`
`215`	`216`	`}`
`216`	`217`
	`218`	`+@Test @MainActor func sessionKeyExtractsCanonicalAgentID() {`
	`219`	`+ #expect(SessionKey.agentId(from: "agent:rust-claw:mattermost:channel:w6g") == "rust-claw")`
	`220`	`+ #expect(SessionKey.agentId(from: " agent:main:main ") == "main")`
	`221`	`+ #expect(SessionKey.agentId(from: "main") == nil)`
	`222`	`+ #expect(SessionKey.agentId(from: "agent::main") == nil)`
	`223`	`+ #expect(SessionKey.agentId(from: nil) == nil)`
	`224`	`+}`
	`225`	`+`
	`226`	`+@Test @MainActor func chatAgentNameUsesFocusedCanonicalSessionAgent() {`
	`227`	`+let appModel = NodeAppModel()`
	`228`	`+ appModel.gatewayDefaultAgentId = "main"`
	`229`	`+ appModel.gatewayAgents = [`
	`230`	`+AgentSummary(`
	`231`	`+ id: "main",`
	`232`	`+ name: "Joshtimus Prime",`
	`233`	`+ identity: nil,`
	`234`	`+ workspace: nil,`
	`235`	`+ model: nil,`
	`236`	`+ agentruntime: nil),`
	`237`	`+AgentSummary(`
	`238`	`+ id: "rust-claw",`
	`239`	`+ name: "Rust Claw",`
	`240`	`+ identity: nil,`
	`241`	`+ workspace: nil,`
	`242`	`+ model: nil,`
	`243`	`+ agentruntime: nil),`
	`244`	`+]`
	`245`	`+ appModel.setSelectedAgentId("main")`
	`246`	`+`
	`247`	`+ appModel.openChat(sessionKey: "agent:rust-claw:mattermost:channel:w6gjp6iz3fyp3fo15q4fwfpnno")`
	`248`	`+`
	`249`	`+ #expect(appModel.selectedAgentId == "main")`
	`250`	`+ #expect(appModel.activeAgentName == "Joshtimus Prime")`
	`251`	`+ #expect(appModel.chatAgentId == "rust-claw")`
	`252`	`+ #expect(appModel.chatAgentName == "Rust Claw")`
	`253`	`+}`
	`254`	`+`
	`255`	`+@Test @MainActor func chatAgentNameFallsBackToSelectedAgentForUnscopedSession() {`
	`256`	`+let appModel = NodeAppModel()`
	`257`	`+ appModel.gatewayDefaultAgentId = "main"`
	`258`	`+ appModel.gatewayAgents = [`
	`259`	`+AgentSummary(`
	`260`	`+ id: "rust-claw",`
	`261`	`+ name: "Rust Claw",`
	`262`	`+ identity: nil,`
	`263`	`+ workspace: nil,`
	`264`	`+ model: nil,`
	`265`	`+ agentruntime: nil),`
	`266`	`+]`
	`267`	`+ appModel.setSelectedAgentId("rust-claw")`
	`268`	`+`
	`269`	`+ appModel.openChat(sessionKey: "incident-42")`
	`270`	`+`
	`271`	`+ #expect(appModel.chatAgentId == "rust-claw")`
	`272`	`+ #expect(appModel.chatAgentName == "Rust Claw")`
	`273`	`+}`
	`274`	`+`
`217`	`275`	`@Test @MainActor func selectingAgentClearsExplicitChatFocus() {`
`218`	`276`	`let appModel = NodeAppModel()`
`219`	`277`	`appModel.gatewayDefaultAgentId = "main"`

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

推荐订阅源

Recent Commits to openclaw:main