The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.
Rust agent-orchestrationai-agentsai-assistantdesktopllmlocal-firstmcppersonal-aiprivacyrustsecond-braintauri
fix(socket): recheck the active core after reading the bearer
M3gA-Mindbf95bcc74026
diff --git a/app/src/services/__tests__/socketService.events.test.ts b/app/src/services/__tests__/socketService.events.test.tsindex f6a35807ee..fe58a6c2f6 100644--- a/app/src/services/__tests__/socketService.events.test.ts+++ b/app/src/services/__tests__/socketService.events.test.ts@@ -247,7 +247,7 @@ describe('socketService — socket event handler dispatches (lines 212, 230, 237// Forget the initial connect so only a reconnect is counted.const connect = (mockSocket as { connect: ReturnType<typeof vi.fn> }).connect;connect.mockClear();- return { handlers, connect };+ return { handlers, connect, auth: auth! };}it('reconnects with the refreshed bearer after the core rejects the handshake', async () => {@@ -258,6 +258,25 @@ describe('socketService — socket event handler dispatches (lines 212, 230, 237expect(clearCoreRpcTokenCacheMock).toHaveBeenCalled();});+ it('does not reconnect the old socket after the active core changed', async () => {+ const { handlers, connect } = await connectAndHandshake();+ getCoreRpcTokenMock.mockResolvedValue('core-b-bearer');+ getCoreRpcUrlMock.mockResolvedValue('http://127.0.0.1:9999/rpc');+ handlers['disconnect']!('io server disconnect');+ await new Promise(r => setTimeout(r, 50));+ expect(connect).not.toHaveBeenCalled();+ });++ it('keeps its own bearer when the active core changes during the bearer read', async () => {+ const { auth } = await connectAndHandshake();+ getCoreRpcTokenMock.mockImplementation(async () => {+ getCoreRpcUrlMock.mockResolvedValue('http://127.0.0.1:9999/rpc');+ return 'core-b-bearer';+ });+ const sent = await new Promise<object>(resolve => auth(resolve));+ expect(sent).toMatchObject({ token: 'mock-core-bearer' });+ });+it('does not loop when the core rejects the same bearer again', async () => {const { handlers, connect } = await connectAndHandshake();handlers['disconnect']!('io server disconnect');diff --git a/app/src/services/socketService.ts b/app/src/services/socketService.tsindex 873189517d..694c32fb20 100644--- a/app/src/services/socketService.ts+++ b/app/src/services/socketService.ts@@ -194,8 +194,11 @@ class SocketService {// Only a bearer for the core this socket targets: after a gateway// switch the fresh bearer belongs to another endpoint, so fall back to// this socket's own instead of handing it to the old core.- resolveToken: async () =>- (await resolveCoreSocketBaseUrl()) === backendUrl ? getCoreRpcToken() : null,+ resolveToken: async () => {+ const fresh = await getCoreRpcToken();+ // Checked after the read, so a switch during it can't leak the bearer.+ return (await resolveCoreSocketBaseUrl()) === backendUrl ? fresh : null;+ },overrides: {path: endpoint.path,...(endpoint.transports ? { transports: endpoint.transports } : {}),@@ -271,7 +274,7 @@ class SocketService {store.dispatch(setStatusForUser({ userId: uid, status: 'disconnected' }));store.dispatch(setSocketIdForUser({ userId: uid, socketId: null }));store.dispatch(setBackend({ value: 'disconnected', error: reason }));- if (reason === 'io server disconnect') void this.retryRejectedHandshake(socket);+ if (reason === 'io server disconnect') void this.retryRejectedHandshake(socket, backendUrl);});this.socket.on('connect_error', (error: Error) => {@@ -397,11 +400,13 @@ class SocketService {* the bearer and reconnect — only when it changed, so a bearer the core* genuinely rejects does not loop.*/- private async retryRejectedHandshake(socket: Socket): Promise<void> {+ private async retryRejectedHandshake(socket: Socket, backendUrl: string): Promise<void> {const used = lastHandshakeToken(socket);clearCoreRpcTokenCache();const fresh = await getCoreRpcToken();- if (this.socket === socket && fresh && fresh !== used) {+ // After a gateway switch this socket targets the old core; leave it be.+ const sameCore = (await resolveCoreSocketBaseUrl()) === backendUrl;+ if (this.socket === socket && sameCore && fresh && fresh !== used) {socketLog('Core rejected the socket bearer; reconnecting with the refreshed one');socket.connect();}