3

agents/rap-node-agent/internal/mesh/peer_connection_manager.go

@@ -308,7 +308,7 @@ func (m *PeerConnectionManager) probeIntent(ctx context.Context, intent PeerConn
 		Transport:      intent.Transport,
 		PeerCertSHA256: intent.BestPeerCertSHA256,
 	}}
-	if intent.DirectCandidate {
+	if intent.DirectCandidate || peerConnectionShouldProbeDirectUpgrade(intent, cacheEntry) {
 		targets = peerConnectionProbeTargets(intent, cacheEntry)
 	}
 	var lastFailure string
@@ -354,7 +354,9 @@ func (m *PeerConnectionManager) probeIntent(ctx context.Context, intent PeerConn
 		result.SelectedCandidateID = probePeer.BestCandidateID
 		result.SelectedEndpoint = probePeer.Endpoint
 		result.LatencyMs = latency
-		if intent.RelayCandidate {
+		if probeTargetUsesDirectQUIC(probeTarget) {
+			result.ConnectionState = m.tracker.RecordSuccessForPeer(probePeer, latency, completedAt)
+		} else if intent.RelayCandidate {
 			result.ConnectionState = m.tracker.RecordRelayReady(probePeer, latency, completedAt)
 		} else {
 			result.ConnectionState = m.tracker.RecordSuccessForPeer(probePeer, latency, completedAt)
@@ -410,6 +412,10 @@ func (m *PeerConnectionManager) probePeerTarget(ctx context.Context, probePeer P
 func peerConnectionProbeTargets(intent PeerConnectionIntent, cacheEntry PeerCacheEntry) []peerConnectionProbeTarget {
 	seen := map[string]struct{}{}
 	out := make([]peerConnectionProbeTarget, 0, len(cacheEntry.EndpointCandidates)+1)
+	fallbackPeerCertSHA256 := firstNonEmpty(
+		strings.TrimSpace(cacheEntry.BestPeerCertSHA256),
+		strings.TrimSpace(intent.BestPeerCertSHA256),
+	)
 	add := func(candidateID, endpoint, transport, peerCertSHA256 string) {
 		endpoint = strings.TrimRight(strings.TrimSpace(endpoint), "/")
 		if endpoint == "" {
@@ -423,6 +429,9 @@ func peerConnectionProbeTargets(intent PeerConnectionIntent, cacheEntry PeerCach
 			return
 		}
 		seen[key] = struct{}{}
+		if strings.TrimSpace(peerCertSHA256) == "" {
+			peerCertSHA256 = fallbackPeerCertSHA256
+		}
 		out = append(out, peerConnectionProbeTarget{
 			CandidateID:    strings.TrimSpace(candidateID),
 			Endpoint:       endpoint,
@@ -440,6 +449,31 @@ func peerConnectionProbeTargets(intent PeerConnectionIntent, cacheEntry PeerCach
 	return out
 }
 
+func peerConnectionShouldProbeDirectUpgrade(intent PeerConnectionIntent, cacheEntry PeerCacheEntry) bool {
+	if intent.DirectCandidate {
+		return true
+	}
+	if strings.TrimSpace(intent.ConnectionState) != PeerConnectionRelayReady &&
+		!intent.RelayCandidate &&
+		strings.TrimSpace(intent.TransportMode) != PeerTransportModeRelayControl {
+		return false
+	}
+	for _, candidate := range cacheEntry.EndpointCandidates {
+		if candidateUsableForDirectProbe(candidate) {
+			return true
+		}
+	}
+	return false
+}
+
+func probeTargetUsesDirectQUIC(target peerConnectionProbeTarget) bool {
+	transport := strings.ToLower(strings.TrimSpace(target.Transport))
+	if strings.Contains(transport, "relay") || strings.Contains(transport, "reverse") || strings.Contains(transport, "outbound") {
+		return false
+	}
+	return peerConnectionTargetIsQUIC(target.Transport, target.Endpoint)
+}
+
 func peerConnectionTargetIsQUIC(transport string, endpoint string) bool {
 	return isQUICOnlyCandidateTransport(transport) || strings.HasPrefix(strings.ToLower(strings.TrimSpace(endpoint)), "quic://")
 }