fix(agents): prevent native hook relay bridge race condition on renew and registration

nankingjing · nankingjing · commit c6c3f82efbbd · 2026-07-05T19:05:52.000+08:00
Remove synchronous bridge record write after server.listen() that races before the TCP server binds, and guard renew handler with server.listening check to prevent stale relay registrations. Closes #98650
diff --git a/src/agents/harness/native-hook-relay.ts b/src/agents/harness/native-hook-relay.ts
@@ -474,7 +474,7 @@ export function registerNativeHookRelay(
       current.expiresAtMs = renewedExpiresAtMs;
       handle.expiresAtMs = renewedExpiresAtMs;
       const bridge = relayBridges.get(relayId);
-      if (bridge) {
+      if (bridge && bridge.server.listening) {
         writeNativeHookRelayBridgeRecordForRegistration(current, bridge);
       }
     },
@@ -992,9 +992,6 @@ function registerNativeHookRelayBridge(registration: ActiveNativeHookRelayRegist
     }
     writeNativeHookRelayBridgeRecordForRegistration(registration, bridge);
   });
-  if (relayBridges.get(registration.relayId) === bridge) {
-    writeNativeHookRelayBridgeRecordForRegistration(registration, bridge);
-  }
   server.unref();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ export function registerNativeHookRelay(`
`474`	`474`	`current.expiresAtMs = renewedExpiresAtMs;`
`475`	`475`	`handle.expiresAtMs = renewedExpiresAtMs;`
`476`	`476`	`const bridge = relayBridges.get(relayId);`
`477`		`- if (bridge) {`
	`477`	`+ if (bridge && bridge.server.listening) {`
`478`	`478`	`writeNativeHookRelayBridgeRecordForRegistration(current, bridge);`
`479`	`479`	`}`
`480`	`480`	`},`
`@@ -992,9 +992,6 @@ function registerNativeHookRelayBridge(registration: ActiveNativeHookRelayRegist`
`992`	`992`	`}`
`993`	`993`	`writeNativeHookRelayBridgeRecordForRegistration(registration, bridge);`
`994`	`994`	`});`
`995`		`- if (relayBridges.get(registration.relayId) === bridge) {`
`996`		`- writeNativeHookRelayBridgeRecordForRegistration(registration, bridge);`
`997`		`- }`
`998`	`995`	`server.unref();`
`999`	`996`	`}`
`1000`	`997`