iOS/Gateway: harden pairing resolution and settings-driven capability refresh by mbelinky · Pull Request #22120 · openclaw/openclaw

mbelinky · 2026-02-20T18:50:53Z

Summary

prefer connected node matches when duplicate display names exist
improve nodes invoke pairing-required error text with actionable hint
refresh active iOS gateway registration when settings permissions/capabilities change

Files

src/shared/node-match.ts
src/shared/shared-misc.test.ts
src/agents/tools/nodes-tool.ts
apps/ios/Sources/Gateway/GatewayConnectionController.swift
apps/ios/Sources/Settings/SettingsTab.swift

Validation

pnpm test -- src/shared/shared-misc.test.ts

Greptile Summary

This PR hardens pairing resolution and settings-driven capability refresh in iOS gateway connections. The changes address three main areas:

Node matching with duplicate names: Modified resolveNodeIdFromCandidates in src/shared/node-match.ts to prefer connected nodes when multiple nodes share the same display name (common during re-pairing/reinstall flows)
Improved pairing error messages: Enhanced nodes-tool.ts to extract pairing request IDs from error messages and provide actionable hints for users to approve pending pairing requests
iOS capability refresh: Added refreshActiveGatewayRegistrationFromSettings() method to rebuild gateway registration when location permissions change, ensuring capability updates take effect immediately

The implementation is well-tested with new unit tests covering both the connected node preference logic and ambiguous match scenarios. The Swift code follows proper guard patterns and MainActor execution for UI updates.

Confidence Score: 3/5

Safe to merge with noted capability refresh gaps for camera and voice wake settings
The core changes are well-implemented with proper tests and guard clauses. However, the PR introduces capability refresh for location settings but misses the same pattern for camera and voice wake settings, creating an inconsistent user experience where some capability changes take effect immediately while others require reconnection
apps/ios/Sources/Settings/SettingsTab.swift needs refresh calls added for camera and voice wake toggles to match the location setting pattern

_{Last reviewed commit: 41bbd41}

greptile-apps

_{5 files reviewed, 2 comments}

_{Edit Code Review Agent Settings | Greptile}

greptile-apps · 2026-02-20T18:54:57Z

Additional Comments (2)

apps/ios/Sources/Settings/SettingsTab.swift
cameraEnabled changes affect capabilities (currentCaps() checks camera.enabled at GatewayConnectionController.swift:789-793) but don't trigger refreshActiveGatewayRegistrationFromSettings() like location changes do. Camera capability updates won't take effect until next reconnect.

Consider adding the refresh callback:

                        self.featureToggle(
                            "Allow Camera",
                            isOn: self.$cameraEnabled,
                            help: "Allows the gateway to request photos or short video clips while OpenClaw is foregrounded.") { _ in
                                self.gatewayController.refreshActiveGatewayRegistrationFromSettings()
                            }

Prompt To Fix With AI

This is a comment left during a code review.
Path: apps/ios/Sources/Settings/SettingsTab.swift
Line: 276-279

Comment:
`cameraEnabled` changes affect capabilities (`currentCaps()` checks `camera.enabled` at GatewayConnectionController.swift:789-793) but don't trigger `refreshActiveGatewayRegistrationFromSettings()` like location changes do. Camera capability updates won't take effect until next reconnect.

Consider adding the refresh callback:
```suggestion
                        self.featureToggle(
                            "Allow Camera",
                            isOn: self.$cameraEnabled,
                            help: "Allows the gateway to request photos or short video clips while OpenClaw is foregrounded.") { _ in
                                self.gatewayController.refreshActiveGatewayRegistrationFromSettings()
                            }
```

How can I resolve this? If you propose a fix, please make it concise.

apps/ios/Sources/Settings/SettingsTab.swift
voiceWakeEnabled changes affect capabilities (currentCaps() checks voiceWake.enabled at GatewayConnectionController.swift:795-796) but don't trigger refreshActiveGatewayRegistrationFromSettings(). Voice wake capability updates won't take effect until next reconnect.

Add refresh after setVoiceWakeEnabled:

                        self.featureToggle(
                            "Voice Wake",
                            isOn: self.$voiceWakeEnabled,
                            help: "Enables wake-word activation to start a hands-free session.") { newValue in
                                self.appModel.setVoiceWakeEnabled(newValue)
                                self.gatewayController.refreshActiveGatewayRegistrationFromSettings()
                            }

Prompt To Fix With AI

This is a comment left during a code review.
Path: apps/ios/Sources/Settings/SettingsTab.swift
Line: 251-256

Comment:
`voiceWakeEnabled` changes affect capabilities (`currentCaps()` checks `voiceWake.enabled` at GatewayConnectionController.swift:795-796) but don't trigger `refreshActiveGatewayRegistrationFromSettings()`. Voice wake capability updates won't take effect until next reconnect.

Add refresh after `setVoiceWakeEnabled`:
```suggestion
                        self.featureToggle(
                            "Voice Wake",
                            isOn: self.$voiceWakeEnabled,
                            help: "Enables wake-word activation to start a hands-free session.") { newValue in
                                self.appModel.setVoiceWakeEnabled(newValue)
                                self.gatewayController.refreshActiveGatewayRegistrationFromSettings()
                            }
```

How can I resolve this? If you propose a fix, please make it concise.

mbelinky · 2026-02-20T18:57:09Z

Merged via squash.

Prepared head SHA: 55b8a93
Merge commit: 5828708

Thanks @mbelinky!

@mbelinky