github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 07:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

iOS: normalize watch quick actions and fix test signing

Browse Source
This commit is contained in:
Mariano Belinky
2026-02-22 14:42:23 +00:00
committed by Peter Steinberger
parent d18ae2256f
commit d06d8701fd
5 changed files with 245 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
apps/ios/Sources/Model/NodeAppModel.swift
View File

@@ -1490,8 +1490,9 @@ private extension NodeAppModel {
return BridgeInvokeResponse(id: req.id, ok: true, payloadJSON: json)
case OpenClawWatchCommand.notify.rawValue:
let params = try Self.decodeParams(OpenClawWatchNotifyParams.self, from: req.paramsJSON)
let title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
let body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
let normalizedParams = Self.normalizeWatchNotifyParams(params)
let title = normalizedParams.title
let body = normalizedParams.body
if title.isEmpty && body.isEmpty {
return BridgeInvokeResponse(
id: req.id,
@@ -1503,13 +1504,13 @@ private extension NodeAppModel {
do {
let result = try await self.watchMessagingService.sendNotification(
id: req.id,
params: params)
params: normalizedParams)
if result.queuedForDelivery || !result.deliveredImmediately {
let invokeID = req.id
Task { @MainActor in
await WatchPromptNotificationBridge.scheduleMirroredWatchPromptNotificationIfNeeded(
invokeID: invokeID,
params: params,
params: normalizedParams,
sendResult: result)
}
}
@@ -1535,6 +1536,105 @@ private extension NodeAppModel {
}
}
private static func normalizeWatchNotifyParams(_ params: OpenClawWatchNotifyParams) -> OpenClawWatchNotifyParams {
var normalized = params
normalized.title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
normalized.body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
normalized.promptId = self.trimmedOrNil(params.promptId)
normalized.sessionKey = self.trimmedOrNil(params.sessionKey)
normalized.kind = self.trimmedOrNil(params.kind)
normalized.details = self.trimmedOrNil(params.details)
normalized.priority = self.normalizedWatchPriority(params.priority, risk: params.risk)
normalized.risk = self.normalizedWatchRisk(params.risk, priority: normalized.priority)
let normalizedActions = self.normalizeWatchActions(
params.actions,
kind: normalized.kind,
promptId: normalized.promptId)
normalized.actions = normalizedActions.isEmpty ? nil : normalizedActions
return normalized
}
private static func normalizeWatchActions(
_ actions: [OpenClawWatchAction]?,
kind: String?,
promptId: String?) -> [OpenClawWatchAction]
{
let provided = (actions ?? []).compactMap { action -> OpenClawWatchAction? in
let id = action.id.trimmingCharacters(in: .whitespacesAndNewlines)
let label = action.label.trimmingCharacters(in: .whitespacesAndNewlines)
guard !id.isEmpty, !label.isEmpty else { return nil }
return OpenClawWatchAction(
id: id,
label: label,
style: self.trimmedOrNil(action.style))
}
if !provided.isEmpty {
return Array(provided.prefix(4))
}
// Only auto-insert quick actions when this is a prompt/decision flow.
guard promptId?.isEmpty == false else {
return []
}
let normalizedKind = kind?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() ?? ""
if normalizedKind.contains("approval") || normalizedKind.contains("approve") {
return [
OpenClawWatchAction(id: "approve", label: "Approve"),
OpenClawWatchAction(id: "decline", label: "Decline", style: "destructive"),
OpenClawWatchAction(id: "open_phone", label: "Open iPhone"),
OpenClawWatchAction(id: "escalate", label: "Escalate"),
]
}
return [
OpenClawWatchAction(id: "done", label: "Done"),
OpenClawWatchAction(id: "snooze_10m", label: "Snooze 10m"),
OpenClawWatchAction(id: "open_phone", label: "Open iPhone"),
OpenClawWatchAction(id: "escalate", label: "Escalate"),
]
}
private static func normalizedWatchRisk(
_ risk: OpenClawWatchRisk?,
priority: OpenClawNotificationPriority?) -> OpenClawWatchRisk?
{
if let risk { return risk }
switch priority {
case .passive:
return .low
case .active:
return .medium
case .timeSensitive:
return .high
case nil:
return nil
}
}
private static func normalizedWatchPriority(
_ priority: OpenClawNotificationPriority?,
risk: OpenClawWatchRisk?) -> OpenClawNotificationPriority?
{
if let priority { return priority }
switch risk {
case .low:
return .passive
case .medium:
return .active
case .high:
return .timeSensitive
case nil:
return nil
}
}
private static func trimmedOrNil(_ value: String?) -> String? {
let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
return trimmed.isEmpty ? nil : trimmed
}
func locationMode() -> OpenClawLocationMode {
let raw = UserDefaults.standard.string(forKey: "location.enabledMode") ?? "off"
return OpenClawLocationMode(rawValue: raw) ?? .off

89
apps/ios/Sources/OpenClawApp.swift
View File

@@ -182,8 +182,30 @@ final class OpenClawAppDelegate: NSObject, UIApplicationDelegate, @preconcurrenc
actionLabel: actionLabel,
sessionKey: sessionKey)
default:
break
}
guard response.actionIdentifier.hasPrefix(WatchPromptNotificationBridge.actionIdentifierPrefix) else {
return nil
}
let indexString = String(
response.actionIdentifier.dropFirst(WatchPromptNotificationBridge.actionIdentifierPrefix.count))
guard let actionIndex = Int(indexString), actionIndex >= 0 else {
return nil
}
let actionIdKey = WatchPromptNotificationBridge.actionIDKey(index: actionIndex)
let actionLabelKey = WatchPromptNotificationBridge.actionLabelKey(index: actionIndex)
let actionId = (userInfo[actionIdKey] as? String)?
.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
guard !actionId.isEmpty else {
return nil
}
let actionLabel = userInfo[actionLabelKey] as? String
return PendingWatchPromptAction(
promptId: promptId,
actionId: actionId,
actionLabel: actionLabel,
sessionKey: sessionKey)
}
private func routeWatchPromptAction(_ action: PendingWatchPromptAction) async {
@@ -243,6 +265,9 @@ enum WatchPromptNotificationBridge {
static let actionSecondaryLabelKey = "openclaw.watch.action.secondary.label"
static let actionPrimaryIdentifier = "openclaw.watch.action.primary"
static let actionSecondaryIdentifier = "openclaw.watch.action.secondary"
static let actionIdentifierPrefix = "openclaw.watch.action."
static let actionIDKeyPrefix = "openclaw.watch.action.id."
static let actionLabelKeyPrefix = "openclaw.watch.action.label."
static let categoryPrefix = "openclaw.watch.prompt.category."
@MainActor
@@ -264,16 +289,15 @@ enum WatchPromptNotificationBridge {
guard !id.isEmpty, !label.isEmpty else { return nil }
return OpenClawWatchAction(id: id, label: label, style: action.style)
}
let primaryAction = normalizedActions.first
let secondaryAction = normalizedActions.dropFirst().first
let displayedActions = Array(normalizedActions.prefix(4))
let center = UNUserNotificationCenter.current()
var categoryIdentifier = ""
if let primaryAction {
if !displayedActions.isEmpty {
let categoryID = "\(self.categoryPrefix)\(invokeID)"
let category = UNNotificationCategory(
identifier: categoryID,
actions: self.categoryActions(primaryAction: primaryAction, secondaryAction: secondaryAction),
actions: self.categoryActions(displayedActions),
intentIdentifiers: [],
options: [])
await self.upsertNotificationCategory(category, center: center)
@@ -289,13 +313,16 @@ enum WatchPromptNotificationBridge {
if let sessionKey = params.sessionKey?.trimmingCharacters(in: .whitespacesAndNewlines), !sessionKey.isEmpty {
userInfo[self.sessionKeyKey] = sessionKey
}
if let primaryAction {
userInfo[self.actionPrimaryIDKey] = primaryAction.id
userInfo[self.actionPrimaryLabelKey] = primaryAction.label
}
if let secondaryAction {
userInfo[self.actionSecondaryIDKey] = secondaryAction.id
userInfo[self.actionSecondaryLabelKey] = secondaryAction.label
for (index, action) in displayedActions.enumerated() {
userInfo[self.actionIDKey(index: index)] = action.id
userInfo[self.actionLabelKey(index: index)] = action.label
if index == 0 {
userInfo[self.actionPrimaryIDKey] = action.id
userInfo[self.actionPrimaryLabelKey] = action.label
} else if index == 1 {
userInfo[self.actionSecondaryIDKey] = action.id
userInfo[self.actionSecondaryLabelKey] = action.label
}
}
let content = UNMutableNotificationContent()
@@ -324,24 +351,30 @@ enum WatchPromptNotificationBridge {
try? await self.addNotificationRequest(request, center: center)
}
private static func categoryActions(
primaryAction: OpenClawWatchAction,
secondaryAction: OpenClawWatchAction?) -> [UNNotificationAction]
{
var actions: [UNNotificationAction] = [
UNNotificationAction(
identifier: self.actionPrimaryIdentifier,
title: primaryAction.label,
options: self.notificationActionOptions(style: primaryAction.style))
]
if let secondaryAction {
actions.append(
UNNotificationAction(
identifier: self.actionSecondaryIdentifier,
title: secondaryAction.label,
options: self.notificationActionOptions(style: secondaryAction.style)))
static func actionIDKey(index: Int) -> String {
"\(self.actionIDKeyPrefix)\(index)"
}
static func actionLabelKey(index: Int) -> String {
"\(self.actionLabelKeyPrefix)\(index)"
}
private static func categoryActions(_ actions: [OpenClawWatchAction]) -> [UNNotificationAction] {
actions.enumerated().map { index, action in
let identifier: String
switch index {
case 0:
identifier = self.actionPrimaryIdentifier
case 1:
identifier = self.actionSecondaryIdentifier
default:
identifier = "\(self.actionIdentifierPrefix)\(index)"
}
return UNNotificationAction(
identifier: identifier,
title: action.label,
options: self.notificationActionOptions(style: action.style))
}
return actions
}
private static func notificationActionOptions(style: String?) -> UNNotificationActionOptions {