watch: fix compilation errors — body naming conflict, WKApplication, accessibility traits, nonisolated key, remove unused dep

Rocuts · Rocuts · commit 5ea05e2b8911 · 2026-02-28T10:54:34.000-05:00
diff --git a/apps/ios/WatchApp/Info.plist b/apps/ios/WatchApp/Info.plist
@@ -20,6 +20,8 @@
 	<string>2026.2.27</string>
 	<key>CFBundleVersion</key>
 	<string>20260227</string>
+	<key>WKApplication</key>
+	<true/>
 	<key>WKCompanionAppBundleIdentifier</key>
 	<string>$(OPENCLAW_APP_BUNDLE_ID)</string>
 </dict>
diff --git a/apps/ios/WatchApp/Sources/OpenClawWatchApp.swift b/apps/ios/WatchApp/Sources/OpenClawWatchApp.swift
@@ -19,7 +19,6 @@ struct OpenClawWatchApp: App {
                 }
                 .navigationTitle("OpenClaw")
             }
-            .toolbarStyle(.glass)
             .onOpenURL { _ in
                 // Widget taps open openclaw://watch/inbox — the app already shows the
                 // inbox as the root view, so no navigation is needed.
diff --git a/apps/ios/WatchApp/Sources/WatchConnectionBanner.swift b/apps/ios/WatchApp/Sources/WatchConnectionBanner.swift
@@ -37,7 +37,7 @@ struct WatchConnectionBanner: View {
                 .transition(.opacity)
                 .accessibilityElement(children: .combine)
                 .accessibilityLabel(label)
-                .accessibilityAddTraits(.isStatusElement)
+                .accessibilityAddTraits(.updatesFrequently)
             }
         }
         .onChange(of: isConnected) { _, connected in
diff --git a/apps/ios/WatchApp/Sources/WatchHomeView.swift b/apps/ios/WatchApp/Sources/WatchHomeView.swift
@@ -52,7 +52,7 @@ struct WatchHomeView: View {
     private var messageContent: some View {
         WatchMessageCard(
             title: store.title,
-            body: store.body,
+            message: store.body,
             details: store.details,
             risk: store.risk,
             isExpired: store.isExpired)
@@ -78,7 +78,20 @@ struct WatchHomeView: View {
 
     @ViewBuilder
     private var actionButtons: some View {
-        ForEach(Array(store.actions.enumerated()), id: \.element.id) { index, action in
+        // First action gets Double Tap gesture shortcut
+        if let first = store.actions.first {
+            WatchActionButton(
+                label: first.label,
+                role: role(for: first),
+                isLoading: store.isReplySending,
+                isDisabled: store.isExpired)
+            {
+                onAction?(first)
+            }
+            .handGestureShortcut(.primaryAction)
+        }
+
+        ForEach(store.actions.dropFirst()) { action in
             WatchActionButton(
                 label: action.label,
                 role: role(for: action),
@@ -87,8 +100,6 @@ struct WatchHomeView: View {
             {
                 onAction?(action)
             }
-            // Double Tap gesture triggers the first action button
-            .handGestureShortcut(index == 0 ? .primaryAction : .never)
         }
     }
 }
diff --git a/apps/ios/WatchApp/Sources/WatchInboxStore.swift b/apps/ios/WatchApp/Sources/WatchInboxStore.swift
@@ -41,7 +41,7 @@ struct WatchNotifyMessage: Sendable {
         var replyStatusAt: Date?
     }
 
-    static let persistedStateKey = "watch.inbox.state.v1"
+    nonisolated static let persistedStateKey = "watch.inbox.state.v1"
     private let defaults: UserDefaults
 
     var title = "OpenClaw"
diff --git a/apps/ios/WatchApp/Sources/WatchMessageCard.swift b/apps/ios/WatchApp/Sources/WatchMessageCard.swift
@@ -2,7 +2,7 @@ import SwiftUI
 
 struct WatchMessageCard: View {
     let title: String
-    let body: String
+    let message: String
     var details: String?
     var risk: String?
     var isExpired: Bool = false
@@ -15,7 +15,7 @@ struct WatchMessageCard: View {
             parts.append("\(risk) risk")
         }
         parts.append(title)
-        parts.append(body)
+        parts.append(message)
         if let details, !details.isEmpty {
             parts.append(details)
         }
@@ -35,7 +35,7 @@ struct WatchMessageCard: View {
                 .font(WatchDesignTokens.fontTitle)
                 .lineLimit(2)
 
-            Text(self.body)
+            Text(message)
                 .font(WatchDesignTokens.fontBody)
                 .fixedSize(horizontal: false, vertical: true)
 
diff --git a/apps/ios/WatchApp/Sources/WatchPreviews.swift b/apps/ios/WatchApp/Sources/WatchPreviews.swift
@@ -33,20 +33,20 @@ import SwiftUI
 #Preview("Card: Normal") {
     WatchMessageCard(
         title: "Daily Summary",
-        body: "3 tasks completed, 1 pending review.")
+        message: "3 tasks completed, 1 pending review.")
 }
 
 #Preview("Card: High Risk") {
     WatchMessageCard(
         title: "Deploy to Production",
-        body: "Merge main into release branch and trigger CI pipeline.",
+        message: "Merge main into release branch and trigger CI pipeline.",
         risk: "high")
 }
 
 #Preview("Card: Expired") {
     WatchMessageCard(
         title: "Session Token Refresh",
-        body: "Token expired 5 minutes ago.",
+        message: "Token expired 5 minutes ago.",
         details: "Session: abc-123",
         isExpired: true)
 }
diff --git a/apps/ios/WatchApp/Tests/WatchConnectivityReceiverTests.swift b/apps/ios/WatchApp/Tests/WatchConnectivityReceiverTests.swift
@@ -1,3 +1,4 @@
+import Foundation
 import Testing
 
 @testable import OpenClawWatch
diff --git a/apps/ios/project.yml b/apps/ios/project.yml
@@ -177,7 +177,6 @@ targets:
         excludes:
           - Tests/**
     dependencies:
-      - package: OpenClawKit
       - sdk: WatchConnectivity.framework
       - sdk: UserNotifications.framework
       - sdk: WidgetKit.framework
@@ -204,6 +203,7 @@ targets:
         CFBundleDisplayName: OpenClaw
         CFBundleShortVersionString: "2026.2.27"
         CFBundleVersion: "20260227"
+        WKApplication: true
         WKCompanionAppBundleIdentifier: "$(OPENCLAW_APP_BUNDLE_ID)"
 
   OpenClawTests:

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ struct OpenClawWatchApp: App {`
`19`	`19`	`}`
`20`	`20`	`.navigationTitle("OpenClaw")`
`21`	`21`	`}`
`22`		`- .toolbarStyle(.glass)`
`23`	`22`	`.onOpenURL { _ in`
`24`	`23`	`// Widget taps open openclaw://watch/inbox — the app already shows the`
`25`	`24`	`// inbox as the root view, so no navigation is needed.`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct WatchConnectionBanner: View {`
`37`	`37`	`.transition(.opacity)`
`38`	`38`	`.accessibilityElement(children: .combine)`
`39`	`39`	`.accessibilityLabel(label)`
`40`		`- .accessibilityAddTraits(.isStatusElement)`
	`40`	`+ .accessibilityAddTraits(.updatesFrequently)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`.onChange(of: isConnected) { _, connected in`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ struct WatchNotifyMessage: Sendable {`
`41`	`41`	`var replyStatusAt: Date?`
`42`	`42`	`}`
`43`	`43`
`44`		`- static let persistedStateKey = "watch.inbox.state.v1"`
	`44`	`+ nonisolated static let persistedStateKey = "watch.inbox.state.v1"`
`45`	`45`	`private let defaults: UserDefaults`
`46`	`46`
`47`	`47`	`var title = "OpenClaw"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import Foundation`
`1`	`2`	`import Testing`
`2`	`3`
`3`	`4`	`@testable import OpenClawWatch`