Skip to content

Cherry-pick a6131438e: fix(macos): improve tailscale gateway discovery#1338

Merged
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/a6131438e-tailscale-gateway-discovery
Mar 14, 2026
Merged

Cherry-pick a6131438e: fix(macos): improve tailscale gateway discovery#1338
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/a6131438e-tailscale-gateway-discovery

Conversation

@alexey-pelykh
Copy link
Copy Markdown

Cherry-pick from upstream

Upstream commit: a6131438e
Author: steipete (Peter Steinberger)
Tier: AUTO-PICK (alive=3, rebranded=4)

Conflict resolution

This cherry-pick required conflict resolution for rebranded paths:

  • CHANGELOG.md: Kept fork's deletion (fork removed CHANGELOG.md)
  • GatewayDiscoverySelectionSupport.swift: Placed upstream's version at fork's rebranded path (RemoteClaw/ instead of OpenClaw/), rebranded imports (RemoteClawDiscovery, RemoteClawConfigFile)
  • TailscaleServeGatewayDiscovery.swift: Placed upstream's version at fork's rebranded path (RemoteClawDiscovery/ instead of OpenClawDiscovery/), rebranded import (RemoteClawKit)
  • GatewayDiscoveryModel.swift: Kept fork's version (fork replaced scheduleTailscaleServeFallback with scheduleWideAreaFallback; upstream's changes to the old method don't apply)
  • GatewayDiscoveryModelTests.swift: Kept fork's version (tests for removed code don't apply)
  • TailscaleServeGatewayDiscoveryTests.swift: Placed upstream's version at fork's rebranded path, rebranded imports
  • GatewayDiscoverySelectionSupportTests.swift: New file placed at fork's rebranded path, rebranded imports and env var names (REMOTECLAW_CONFIG_PATH), domain names (remoteclaw.internal.)

Closes #914 — commit 3/4

Sanitized test tailnet hostnames and re-ran the targeted macOS gateway discovery test suite before merge.

(cherry picked from commit a613143)
@alexey-pelykh alexey-pelykh merged commit 561a8ff into main Mar 14, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the cherry-pick/a6131438e-tailscale-gateway-discovery branch March 14, 2026 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cherry-pick: iOS/macOS gateway replay, tailscale discovery, canvas auto-load,

2 participants