Skip to content

Commit bd25182

Browse files
mbelinkymagneval
andauthored
feat(ios): add Live Activity connection status + stale cleanup (openclaw#33591)
* feat(ios): add live activity connection status and cleanup Add lock-screen/Dynamic Island connection health states and prune duplicate/stale activities before reuse. This intentionally excludes AI/title generation and heavier UX rewrites from openclaw#27488. Co-authored-by: leepokai <1663017+leepokai@users.noreply.github.com> * fix(ios): treat ended live activities as inactive * chore(changelog): add PR reference and author thanks --------- Co-authored-by: leepokai <1663017+leepokai@users.noreply.github.com>
1 parent 6a40f69 commit bd25182

12 files changed

Lines changed: 355 additions & 0 deletions
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

apps/ios/ActivityWidget/Info.plist

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>OpenClaw Activity</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundlePackageType</key>
18+
<string>XPC!</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>2026.3.2</string>
21+
<key>CFBundleVersion</key>
22+
<string>20260301</string>
23+
<key>NSExtension</key>
24+
<dict>
25+
<key>NSExtensionPointIdentifier</key>
26+
<string>com.apple.widgetkit-extension</string>
27+
</dict>
28+
<key>NSSupportsLiveActivities</key>
29+
<true/>
30+
</dict>
31+
</plist>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import SwiftUI
2+
import WidgetKit
3+
4+
@main
5+
struct OpenClawActivityWidgetBundle: WidgetBundle {
6+
var body: some Widget {
7+
OpenClawLiveActivity()
8+
}
9+
}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import ActivityKit
2+
import SwiftUI
3+
import WidgetKit
4+
5+
struct OpenClawLiveActivity: Widget {
6+
var body: some WidgetConfiguration {
7+
ActivityConfiguration(for: OpenClawActivityAttributes.self) { context in
8+
lockScreenView(context: context)
9+
} dynamicIsland: { context in
10+
DynamicIsland {
11+
DynamicIslandExpandedRegion(.leading) {
12+
statusDot(state: context.state)
13+
}
14+
DynamicIslandExpandedRegion(.center) {
15+
Text(context.state.statusText)
16+
.font(.subheadline)
17+
.lineLimit(1)
18+
}
19+
DynamicIslandExpandedRegion(.trailing) {
20+
trailingView(state: context.state)
21+
}
22+
} compactLeading: {
23+
statusDot(state: context.state)
24+
} compactTrailing: {
25+
Text(context.state.statusText)
26+
.font(.caption2)
27+
.lineLimit(1)
28+
.frame(maxWidth: 64)
29+
} minimal: {
30+
statusDot(state: context.state)
31+
}
32+
}
33+
}
34+
35+
@ViewBuilder
36+
private func lockScreenView(context: ActivityViewContext<OpenClawActivityAttributes>) -> some View {
37+
HStack(spacing: 8) {
38+
statusDot(state: context.state)
39+
.frame(width: 10, height: 10)
40+
VStack(alignment: .leading, spacing: 2) {
41+
Text("OpenClaw")
42+
.font(.subheadline.bold())
43+
Text(context.state.statusText)
44+
.font(.caption)
45+
.foregroundStyle(.secondary)
46+
}
47+
Spacer()
48+
trailingView(state: context.state)
49+
}
50+
.padding(.vertical, 4)
51+
}
52+
53+
@ViewBuilder
54+
private func trailingView(state: OpenClawActivityAttributes.ContentState) -> some View {
55+
if state.isConnecting {
56+
ProgressView().controlSize(.small)
57+
} else if state.isDisconnected {
58+
Image(systemName: "wifi.slash")
59+
.foregroundStyle(.red)
60+
} else if state.isIdle {
61+
Image(systemName: "antenna.radiowaves.left.and.right")
62+
.foregroundStyle(.green)
63+
} else {
64+
Text(state.startedAt, style: .timer)
65+
.font(.caption)
66+
.monospacedDigit()
67+
.foregroundStyle(.secondary)
68+
}
69+
}
70+
71+
@ViewBuilder
72+
private func statusDot(state: OpenClawActivityAttributes.ContentState) -> some View {
73+
Circle()
74+
.fill(dotColor(state: state))
75+
.frame(width: 6, height: 6)
76+
}
77+
78+
private func dotColor(state: OpenClawActivityAttributes.ContentState) -> Color {
79+
if state.isDisconnected { return .red }
80+
if state.isConnecting { return .gray }
81+
if state.isIdle { return .green }
82+
return .blue
83+
}
84+
}

apps/ios/Config/Signing.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ OPENCLAW_IOS_SELECTED_TEAM = $(OPENCLAW_IOS_DEFAULT_TEAM)
44
OPENCLAW_APP_BUNDLE_ID = ai.openclaw.ios
55
OPENCLAW_WATCH_APP_BUNDLE_ID = ai.openclaw.ios.watchkitapp
66
OPENCLAW_WATCH_EXTENSION_BUNDLE_ID = ai.openclaw.ios.watchkitapp.extension
7+
OPENCLAW_ACTIVITY_WIDGET_BUNDLE_ID = ai.openclaw.ios.activitywidget
78

89
// Local contributors can override this by running scripts/ios-configure-signing.sh.
910
// Keep include after defaults: xcconfig is evaluated top-to-bottom.

apps/ios/Sources/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
<string>OpenClaw needs microphone access for voice wake.</string>
5555
<key>NSSpeechRecognitionUsageDescription</key>
5656
<string>OpenClaw uses on-device speech recognition for voice wake.</string>
57+
<key>NSSupportsLiveActivities</key>
58+
<true/>
5759
<key>UIApplicationSceneManifest</key>
5860
<dict>
5961
<key>UIApplicationSupportsMultipleScenes</key>
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
import ActivityKit
2+
import Foundation
3+
import os
4+
5+
/// Minimal Live Activity lifecycle focused on connection health + stale cleanup.
6+
@MainActor
7+
final class LiveActivityManager {
8+
static let shared = LiveActivityManager()
9+
10+
private let logger = Logger(subsystem: "ai.openclaw.ios", category: "LiveActivity")
11+
private var currentActivity: Activity<OpenClawActivityAttributes>?
12+
private var activityStartDate: Date = .now
13+
14+
private init() {
15+
self.hydrateCurrentAndPruneDuplicates()
16+
}
17+
18+
var isActive: Bool {
19+
guard let activity = self.currentActivity else { return false }
20+
guard activity.activityState == .active else {
21+
self.currentActivity = nil
22+
return false
23+
}
24+
return true
25+
}
26+
27+
func startActivity(agentName: String, sessionKey: String) {
28+
self.hydrateCurrentAndPruneDuplicates()
29+
30+
if self.currentActivity != nil {
31+
self.handleConnecting()
32+
return
33+
}
34+
35+
let authInfo = ActivityAuthorizationInfo()
36+
guard authInfo.areActivitiesEnabled else {
37+
self.logger.info("Live Activities disabled; skipping start")
38+
return
39+
}
40+
41+
self.activityStartDate = .now
42+
let attributes = OpenClawActivityAttributes(agentName: agentName, sessionKey: sessionKey)
43+
44+
do {
45+
let activity = try Activity.request(
46+
attributes: attributes,
47+
content: ActivityContent(state: self.connectingState(), staleDate: nil),
48+
pushType: nil)
49+
self.currentActivity = activity
50+
self.logger.info("started live activity id=\(activity.id, privacy: .public)")
51+
} catch {
52+
self.logger.error("failed to start live activity: \(error.localizedDescription, privacy: .public)")
53+
}
54+
}
55+
56+
func handleConnecting() {
57+
self.updateCurrent(state: self.connectingState())
58+
}
59+
60+
func handleReconnect() {
61+
self.updateCurrent(state: self.idleState())
62+
}
63+
64+
func handleDisconnect() {
65+
self.updateCurrent(state: self.disconnectedState())
66+
}
67+
68+
private func hydrateCurrentAndPruneDuplicates() {
69+
let active = Activity<OpenClawActivityAttributes>.activities
70+
guard !active.isEmpty else {
71+
self.currentActivity = nil
72+
return
73+
}
74+
75+
let keeper = active.max { lhs, rhs in
76+
lhs.content.state.startedAt < rhs.content.state.startedAt
77+
} ?? active[0]
78+
79+
self.currentActivity = keeper
80+
self.activityStartDate = keeper.content.state.startedAt
81+
82+
let stale = active.filter { $0.id != keeper.id }
83+
for activity in stale {
84+
Task {
85+
await activity.end(
86+
ActivityContent(state: self.disconnectedState(), staleDate: nil),
87+
dismissalPolicy: .immediate)
88+
}
89+
}
90+
}
91+
92+
private func updateCurrent(state: OpenClawActivityAttributes.ContentState) {
93+
guard let activity = self.currentActivity else { return }
94+
Task {
95+
await activity.update(ActivityContent(state: state, staleDate: nil))
96+
}
97+
}
98+
99+
private func connectingState() -> OpenClawActivityAttributes.ContentState {
100+
OpenClawActivityAttributes.ContentState(
101+
statusText: "Connecting...",
102+
isIdle: false,
103+
isDisconnected: false,
104+
isConnecting: true,
105+
startedAt: self.activityStartDate)
106+
}
107+
108+
private func idleState() -> OpenClawActivityAttributes.ContentState {
109+
OpenClawActivityAttributes.ContentState(
110+
statusText: "Idle",
111+
isIdle: true,
112+
isDisconnected: false,
113+
isConnecting: false,
114+
startedAt: self.activityStartDate)
115+
}
116+
117+
private func disconnectedState() -> OpenClawActivityAttributes.ContentState {
118+
OpenClawActivityAttributes.ContentState(
119+
statusText: "Disconnected",
120+
isIdle: false,
121+
isDisconnected: true,
122+
isConnecting: false,
123+
startedAt: self.activityStartDate)
124+
}
125+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import ActivityKit
2+
import Foundation
3+
4+
/// Shared schema used by iOS app + Live Activity widget extension.
5+
struct OpenClawActivityAttributes: ActivityAttributes {
6+
var agentName: String
7+
var sessionKey: String
8+
9+
struct ContentState: Codable, Hashable {
10+
var statusText: String
11+
var isIdle: Bool
12+
var isDisconnected: Bool
13+
var isConnecting: Bool
14+
var startedAt: Date
15+
}
16+
}
17+
18+
#if DEBUG
19+
extension OpenClawActivityAttributes {
20+
static let preview = OpenClawActivityAttributes(agentName: "main", sessionKey: "main")
21+
}
22+
23+
extension OpenClawActivityAttributes.ContentState {
24+
static let connecting = OpenClawActivityAttributes.ContentState(
25+
statusText: "Connecting...",
26+
isIdle: false,
27+
isDisconnected: false,
28+
isConnecting: true,
29+
startedAt: .now)
30+
31+
static let idle = OpenClawActivityAttributes.ContentState(
32+
statusText: "Idle",
33+
isIdle: true,
34+
isDisconnected: false,
35+
isConnecting: false,
36+
startedAt: .now)
37+
38+
static let disconnected = OpenClawActivityAttributes.ContentState(
39+
statusText: "Disconnected",
40+
isIdle: false,
41+
isDisconnected: true,
42+
isConnecting: false,
43+
startedAt: .now)
44+
}
45+
#endif

apps/ios/Sources/Model/NodeAppModel.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,6 +1695,7 @@ extension NodeAppModel {
16951695
self.operatorGatewayTask = nil
16961696
self.voiceWakeSyncTask?.cancel()
16971697
self.voiceWakeSyncTask = nil
1698+
LiveActivityManager.shared.handleDisconnect()
16981699
self.gatewayHealthMonitor.stop()
16991700
Task {
17001701
await self.operatorGateway.disconnect()
@@ -1731,6 +1732,7 @@ private extension NodeAppModel {
17311732
self.operatorConnected = false
17321733
self.voiceWakeSyncTask?.cancel()
17331734
self.voiceWakeSyncTask = nil
1735+
LiveActivityManager.shared.handleDisconnect()
17341736
self.gatewayDefaultAgentId = nil
17351737
self.gatewayAgents = []
17361738
self.selectedAgentId = GatewaySettingsStore.loadGatewaySelectedAgentId(stableID: stableID)
@@ -1811,13 +1813,15 @@ private extension NodeAppModel {
18111813
await self.refreshAgentsFromGateway()
18121814
await self.refreshShareRouteFromGateway()
18131815
await self.startVoiceWakeSync()
1816+
await MainActor.run { LiveActivityManager.shared.handleReconnect() }
18141817
await MainActor.run { self.startGatewayHealthMonitor() }
18151818
},
18161819
onDisconnected: { [weak self] reason in
18171820
guard let self else { return }
18181821
await MainActor.run {
18191822
self.operatorConnected = false
18201823
self.talkMode.updateGatewayConnected(false)
1824+
LiveActivityManager.shared.handleDisconnect()
18211825
}
18221826
GatewayDiagnostics.log("operator gateway disconnected reason=\(reason)")
18231827
await MainActor.run { self.stopGatewayHealthMonitor() }
@@ -1882,6 +1886,14 @@ private extension NodeAppModel {
18821886
self.gatewayStatusText = (attempt == 0) ? "Connecting…" : "Reconnecting…"
18831887
self.gatewayServerName = nil
18841888
self.gatewayRemoteAddress = nil
1889+
let liveActivity = LiveActivityManager.shared
1890+
if liveActivity.isActive {
1891+
liveActivity.handleConnecting()
1892+
} else {
1893+
liveActivity.startActivity(
1894+
agentName: self.selectedAgentId ?? "main",
1895+
sessionKey: self.mainSessionKey)
1896+
}
18851897
}
18861898

18871899
do {

apps/ios/SwiftSources.input.xcfilelist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,7 @@ Sources/Voice/VoiceWakePreferences.swift
6262
../../Swabble/Sources/SwabbleKit/WakeWordGate.swift
6363
Sources/Voice/TalkModeManager.swift
6464
Sources/Voice/TalkOrbOverlay.swift
65+
Sources/LiveActivity/OpenClawActivityAttributes.swift
66+
Sources/LiveActivity/LiveActivityManager.swift
67+
ActivityWidget/OpenClawActivityWidgetBundle.swift
68+
ActivityWidget/OpenClawLiveActivity.swift

0 commit comments

Comments
 (0)