Fix iOS selected agent chat routing · openclaw/openclaw@5c07f7c

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
`@@ -6,6 +6,7 @@ struct ChatProTab: View {`
`6`	`6`	`@Environment(NodeAppModel.self) private var appModel`
`7`	`7`	`@Environment(\.colorScheme) private var colorScheme`
`8`	`8`	`@State private var viewModel: OpenClawChatViewModel?`
	`9`	`+@State private var programmaticSessionSwitchCounts: [String: Int] = [:]`
`9`	`10`
`10`	`11`	`var body: some View {`
`11`	`12`	`NavigationStack {`
`@@ -104,6 +105,14 @@ struct ChatProTab: View {`
`104`	`105`	`sessionKey: sessionKey,`
`105`	`106`	`transport: IOSGatewayChatTransport(gateway: self.appModel.operatorSession),`
`106`	`107`	`onSessionChanged: { sessionKey in`
	`108`	`+if self.consumeProgrammaticSessionSwitch(sessionKey) {`
	`109`	`+ // Programmatic switches complete asynchronously; stale completions`
	`110`	`+ // must repair back to the current app-model session, not become focus.`
	`111`	`+if sessionKey != self.appModel.chatSessionKey {`
	`112`	`+self.syncChatViewModel()`
	`113`	`+}`
	`114`	`+return`
	`115`	`+}`
`107`	`116`	`self.appModel.focusChatSession(sessionKey)`
`108`	`117`	`},`
`109`	`118`	`diagnosticsLog: { message in`
`@@ -112,9 +121,26 @@ struct ChatProTab: View {`
`112`	`121`	`return`
`113`	`122`	`}`
`114`	`123`	`guard viewModel.sessionKey != sessionKey else { return }`
	`124`	`+self.recordProgrammaticSessionSwitch(sessionKey)`
`115`	`125`	`viewModel.switchSession(to: sessionKey)`
`116`	`126`	`}`
`117`	`127`
	`128`	`+private func recordProgrammaticSessionSwitch(_ sessionKey: String) {`
	`129`	`+self.programmaticSessionSwitchCounts[sessionKey, default: 0] += 1`
	`130`	`+}`
	`131`	`+`
	`132`	`+private func consumeProgrammaticSessionSwitch(_ sessionKey: String) -> Bool {`
	`133`	`+guard let count = self.programmaticSessionSwitchCounts[sessionKey] else {`
	`134`	`+return false`
	`135`	`+}`
	`136`	`+if count <= 1 {`
	`137`	`+self.programmaticSessionSwitchCounts[sessionKey] = nil`
	`138`	`+} else {`
	`139`	`+self.programmaticSessionSwitchCounts[sessionKey] = count - 1`
	`140`	`+}`
	`141`	`+return true`
	`142`	`+}`
	`143`	`+`
`118`	`144`	`private var talkControl: OpenClawChatTalkControl {`
`119`	`145`	`OpenClawChatTalkControl(`
`120`	`146`	`isEnabled: self.appModel.talkMode.isEnabled,`

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ struct CommandCenterTab: View {`
`502`	`502`	`trailing: "session",`
`503`	`503`	`color: self.gatewayConnected ? OpenClawBrand.ok : .secondary,`
`504`	`504`	`progress: nil,`
`505`		`- route: .chat(self.appModel.chatSessionKey)),`
	`505`	`+ route: .chat(self.appModel.defaultChatSessionKey)),`
`506`	`506`	`WorkItem(`
`507`	`507`	`id: "talk-mode",`
`508`	`508`	`icon: "waveform",`

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,7 @@ final class NodeAppModel {`
`762`	`762`	`let selected = (self.selectedAgentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`763`	`763`	`if !selected.isEmpty, !decoded.agents.contains(where: { $0.id == selected }) {`
`764`	`764`	`self.selectedAgentId = nil`
	`765`	`+self.focusedChatSessionKey = nil`
`765`	`766`	`}`
`766`	`767`	`self.talkMode.updateMainSessionKey(self.mainSessionKey)`
`767`	`768`	`self.homeCanvasRevision &+= 1`
`@@ -779,13 +780,19 @@ final class NodeAppModel {`
`779`	`780`
`780`	`781`	`func setSelectedAgentId(_ agentId: String?) {`
`781`	`782`	`let trimmed = (agentId ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
	`783`	`+let nextSelectedAgentId = trimmed.isEmpty ? nil : trimmed`
	`784`	`+let currentSelectedAgentId = self.selectedAgentId?.trimmingCharacters(in: .whitespacesAndNewlines)`
	`785`	`+let selectedAgentChanged = currentSelectedAgentId != nextSelectedAgentId`
`782`	`786`	`let stableID = (self.connectedGatewayID ?? "").trimmingCharacters(in: .whitespacesAndNewlines)`
`783`	`787`	`if stableID.isEmpty {`
`784`		`-self.selectedAgentId = trimmed.isEmpty ? nil : trimmed`
	`788`	`+self.selectedAgentId = nextSelectedAgentId`
`785`	`789`	`} else {`
`786`		`-self.selectedAgentId = trimmed.isEmpty ? nil : trimmed`
	`790`	`+self.selectedAgentId = nextSelectedAgentId`
`787`	`791`	`GatewaySettingsStore.saveGatewaySelectedAgentId(stableID: stableID, agentId: self.selectedAgentId)`
`788`	`792`	`}`
	`793`	`+if selectedAgentChanged {`
	`794`	`+self.focusedChatSessionKey = nil`
	`795`	`+}`
`789`	`796`	`self.talkMode.updateMainSessionKey(self.mainSessionKey)`
`790`	`797`	`self.homeCanvasRevision &+= 1`
`791`	`798`	`if let relay = ShareGatewayRelaySettings.loadConfig() {`
`@@ -1837,9 +1844,13 @@ extension NodeAppModel {`
`1837`	`1844`	`{`
`1838`	`1845`	`return focused`
`1839`	`1846`	`}`
	`1847`	`+return self.defaultChatSessionKey`
	`1848`	`+}`
	`1849`	`+`
	`1850`	`+var defaultChatSessionKey: String {`
`1840`	`1851`	`// Keep chat aligned with the gateway's resolved main session key.`
`1841`	`1852`	`// A hardcoded "ios" base creates synthetic placeholder sessions in the chat UI.`
`1842`		`-return self.mainSessionKey`
	`1853`	`+self.mainSessionKey`
`1843`	`1854`	`}`
`1844`	`1855`
`1845`	`1856`	`func openChat(sessionKey: String?) {`
`@@ -2005,6 +2016,7 @@ extension NodeAppModel {`
`2005`	`2016`	`self.gatewayDefaultAgentId = nil`
`2006`	`2017`	`self.gatewayAgents = []`
`2007`	`2018`	`self.selectedAgentId = GatewaySettingsStore.loadGatewaySelectedAgentId(stableID: stableID)`
	`2019`	`+self.focusedChatSessionKey = nil`
`2008`	`2020`	`self.homeCanvasRevision &+= 1`
`2009`	`2021`	`self.apnsLastRegisteredTokenHex = nil`
`2010`	`2022`	`}`

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,44 @@ private final class MockBootstrapNotificationCenter: NotificationCentering, @unc`
`214`	`214`	`#expect(appModel.mainSessionKey == "agent:agent-123:main")`
`215`	`215`	`}`
`216`	`216`
	`217`	`+@Test @MainActor func selectingAgentClearsExplicitChatFocus() {`
	`218`	`+let appModel = NodeAppModel()`
	`219`	`+ appModel.gatewayDefaultAgentId = "main"`
	`220`	`+let rustSessionKey = SessionKey.makeAgentSessionKey(agentId: "rust-claw", baseKey: "main")`
	`221`	`+`
	`222`	`+ appModel.setSelectedAgentId("rust-claw")`
	`223`	`+ #expect(appModel.chatSessionKey == rustSessionKey)`
	`224`	`+ appModel.focusChatSession(rustSessionKey)`
	`225`	`+`
	`226`	`+ appModel.setSelectedAgentId("main")`
	`227`	`+ #expect(appModel.defaultChatSessionKey == "main")`
	`228`	`+ #expect(appModel.mainSessionKey == "main")`
	`229`	`+ #expect(appModel.chatSessionKey == "main")`
	`230`	`+}`
	`231`	`+`
	`232`	`+@Test @MainActor func sameSelectedAgentKeepsExplicitChatFocus() {`
	`233`	`+let appModel = NodeAppModel()`
	`234`	`+ appModel.gatewayDefaultAgentId = "main"`
	`235`	`+ appModel.setSelectedAgentId("main")`
	`236`	`+ appModel.openChat(sessionKey: "incident-42")`
	`237`	`+`
	`238`	`+ appModel.setSelectedAgentId("main")`
	`239`	`+ #expect(appModel.defaultChatSessionKey == "main")`
	`240`	`+ #expect(appModel.chatSessionKey == "incident-42")`
	`241`	`+}`
	`242`	`+`
	`243`	`+@Test @MainActor func defaultChatSessionKeyIgnoresExplicitChatFocus() {`
	`244`	`+let appModel = NodeAppModel()`
	`245`	`+ appModel.gatewayDefaultAgentId = "main"`
	`246`	`+ appModel.setSelectedAgentId("rust-claw")`
	`247`	`+ appModel.openChat(sessionKey: "incident-42")`
	`248`	`+`
	`249`	`+ #expect(appModel.defaultChatSessionKey == SessionKey.makeAgentSessionKey(`
	`250`	`+ agentId: "rust-claw",`
	`251`	`+ baseKey: "main"))`
	`252`	`+ #expect(appModel.chatSessionKey == "incident-42")`
	`253`	`+}`
	`254`	`+`
`217`	`255`	`@Test @MainActor func execApprovalPromptPresentationTracksLatestNotificationTap() throws {`
`218`	`256`	`let appModel = NodeAppModel()`
`219`	`257`	`try appModel._test_presentExecApprovalPrompt(`

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

推荐订阅源

Recent Commits to openclaw:main