fix(gateway): clear pairing state on device token mismatch by mbelinky · Pull Request #22071 · openclaw/openclaw

mbelinky · 2026-02-20T17:39:21Z

Summary

clear paired-device state when gateway client receives close code 1008 with a device token mismatch reason
keep token-clear behavior and add explicit async error handling for pairing-state clear
add focused tests for close-handling and clearDevicePairing behavior

Why

This is the minimal safe salvage of #19562. It keeps only the pairing-recovery behavior needed for re-pairing after token mismatch and drops unrelated changes.

Changes

src/gateway/client.ts
src/infra/device-pairing.ts
src/gateway/client.test.ts
src/infra/device-pairing.test.ts

Validation run locally

pnpm exec vitest run src/gateway/client.test.ts -t "GatewayClient close handling"
pnpm exec vitest run src/infra/device-pairing.test.ts -t "clears paired device state by device id"

Supersedes #19562 for this fix scope.

Greptile Summary

Added device pairing state cleanup alongside token cleanup when gateway receives close code 1008 with device token mismatch. The new clearDevicePairing function removes paired device state by device ID.

Added clearDevicePairing to remove paired device state by device ID
Gateway client now calls clearDevicePairing (fire-and-forget) when clearing stale tokens
Tests cover both successful pairing clear and error handling when pairing clear fails
One issue found: log message prematurely claims pairing is cleared before the async operation completes

Confidence Score: 4/5

Safe to merge with one minor logging inaccuracy that doesn't affect functionality
The implementation correctly adds pairing state cleanup when device token mismatch occurs, with proper error handling and comprehensive tests. The only issue is a premature log message that claims pairing is cleared before the async operation completes, but this is a logging cosmetic issue that doesn't affect the actual cleanup behavior.
No files require special attention

_{Last reviewed commit: 4423f6e}

greptile-apps

_{4 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}

greptile-apps · 2026-02-20T17:41:24Z

src/gateway/client.ts

+          void clearDevicePairing(deviceId).catch((err) => {
+            logDebug(`failed clearing stale device pairing for device ${deviceId}: ${String(err)}`);
+          });
+          logDebug(`cleared stale device-auth token and pairing for device ${deviceId}`);


log message claims pairing is cleared, but clearDevicePairing is async and fire-and-forget (voided promise), so pairing might not be cleared when this logs

Suggested change

logDebug(`cleared stale device-auth token and pairing for device ${deviceId}`);

logDebug(`cleared stale device-auth token for device ${deviceId}`);

Prompt To Fix With AI

This is a comment left during a code review. Path: src/gateway/client.ts Line: 192 Comment: log message claims pairing is cleared, but `clearDevicePairing` is async and fire-and-forget (voided promise), so pairing might not be cleared when this logs ```suggestion logDebug(`cleared stale device-auth token for device ${deviceId}`); ``` How can I resolve this? If you propose a fix, please make it concise.

@mbelinky