@telnyx/react-voice-commons-sdk 0.2.1 → 0.3.1

package/CHANGELOG.md

@@ -1,10 +1,35 @@
 # CHANGELOG.md
 
-## [0.2.1](https://github.com/team-telnyx/react-native-voice-commons/releases/tag/commons-sdk-v0.2.1) (2026-04-02)
+## [0.3.1] (2026-04-16)
 
 ### Bug Fixing
 
-- Fixed CallKit auto-answer not working on iOS when user answers from CallKit UI during app cold launch from VoIP push. The native `CXAnswerCallAction` event was silently dropped because JS listeners weren't registered yet. Now persists the answer action in UserDefaults so the JS side can detect and honor it.
+- Fixed stale `CONNECTED` state during background disconnect: `SessionManager.disconnect()` now emits `DISCONNECTED` before awaiting the underlying client teardown. Previously, observers (including the auto-reconnect logic in `TelnyxVoiceApp`) could read a stale `CONNECTED` value while the socket was being torn down, causing auto-reconnection to be skipped and subsequent `newCall()` attempts to fail with `Cannot make call when connection state is: DISCONNECTED` or `No connection exists. Please connect first.`
+- Tracked calls are now cleared on disconnect. Previously, calls left in non-terminal states when the socket was torn down would accumulate across background/foreground cycles, since a dead socket never emits the `ENDED`/`FAILED` events that normally trigger per-call cleanup.
+
+## [0.3.0] (2026-04-15)
+
+### ⚠️ Breaking changes
+
+- **`expo-router` is no longer a dependency of the SDK.** The SDK previously navigated the host app in a few places (`useAppStateHandler` on background disconnect, `CallKitHandler` after CallKit answer/end). Those calls have been removed — navigation is now exclusively the host app's responsibility.
+  - **Migration for Expo consumers:** subscribe to `voipClient.connectionState$` and `voipClient.activeCall$` in your app and navigate there. Example:
+    ```tsx
+    useEffect(() => {
+      const sub = voipClient.connectionState$.subscribe((state) => {
+        if (state === TelnyxConnectionState.DISCONNECTED) {
+          router.replace('/');
+        }
+      });
+      return () => sub.unsubscribe();
+    }, []);
+    ```
+  - `CallKitHandler` already exposed `onNavigateToDialer` / `onNavigateBack` callback props; those are now the only way to wire navigation.
+  - The `navigateToLoginOnDisconnect` option on `useAppStateHandler` is retained in the type signature for source compatibility but no longer has any effect.
+- **Bare React Native (non-Expo) projects are now supported.** Metro bundling no longer fails on missing `expo-router`; SDK-level behavior is identical for Expo and bare RN consumers.
+
+### Enhancement
+
+- **`react-native-url-polyfill` is now a direct dependency and auto-loaded** from the SDK entry point. Previously, apps running Hermes crashed on the second login attempt with `URLSearchParams.set is not implemented` because the SDK constructs the WebSocket URL via `URLSearchParams`, which is incomplete in Hermes. No action required from consumers.
 
 ## [0.2.0](https://github.com/team-telnyx/react-native-voice-commons/releases/tag/commons-sdk-v0.2.0) (2026-04-01)
 

package/README.md

@@ -11,6 +11,7 @@ A high-level, state-agnostic, drop-in module for the Telnyx React Native SDK tha
 - **Reactive State Management**: RxJS-based state streams for real-time UI updates
 - **TypeScript Support**: Full TypeScript definitions for better developer experience
 - **Cross-Platform**: Built for both iOS and Android with React Native
+- **Framework-agnostic**: Works in both Expo and bare React Native projects. See the [bare RN reference demo](https://github.com/team-telnyx/telnyx-react-native-bare-demo) for non-Expo integration.
 
 ## About @telnyx/react-voice-commons-sdk
 
@@ -115,6 +116,29 @@ call.callState$.subscribe((state) => {
 });
 ```
 
+### Navigation
+
+As of **v0.3.0**, the SDK no longer navigates the host app. Routing on state transitions (e.g. redirecting to a login screen on disconnect, surfacing a dialer screen after answering a call via CallKit) is entirely the host app's responsibility. Subscribe to `connectionState$` and `activeCall$` and invoke your own navigator.
+
+Example using `expo-router`:
+
+```tsx
+import { router } from 'expo-router';
+import { useEffect } from 'react';
+import { TelnyxConnectionState } from '@telnyx/react-voice-commons-sdk';
+
+useEffect(() => {
+  const sub = voipClient.connectionState$.subscribe((state) => {
+    if (state === TelnyxConnectionState.DISCONNECTED) {
+      router.replace('/');
+    }
+  });
+  return () => sub.unsubscribe();
+}, []);
+```
+
+The same pattern works with `react-navigation`, React Router, or any other navigator — the SDK is agnostic.
+
 ### 4. Call Management
 
 ```tsx

package/ios/CallKitBridge.swift

@@ -533,12 +533,6 @@ import React
             NSLog("📞 TelnyxVoice: CALLKIT ANSWER ACTION - Provider: \(provider), Action: \(action)")
             NSLog("TelnyxVoice: User answered call with UUID: \(action.callUUID)")
 
-            // Always persist the answer action in UserDefaults so the JS side can detect it
-            // even when the RCTEventEmitter bridge is not yet ready (app cold-launched from push).
-            UserDefaults.standard.set(action.callUUID.uuidString, forKey: "pending_callkit_answer")
-            UserDefaults.standard.synchronize()
-            NSLog("TelnyxVoice: Stored pending CallKit answer for UUID: \(action.callUUID)")
-
             // Check if this is a programmatic answer (call already answered in WebRTC)
             // vs a user answer from CallKit UI
             if let callData = activeCalls[action.callUUID],
@@ -561,10 +555,6 @@ import React
         public func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
             NSLog("TelnyxVoice: User ended call with UUID: \(action.callUUID)")
 
-            // Clear any pending CallKit answer (prevents stale auto-answer on next call)
-            UserDefaults.standard.removeObject(forKey: "pending_callkit_answer")
-            UserDefaults.standard.synchronize()
-
             // Notify React Native via CallKit bridge
             CallKitBridge.shared?.emitCallEvent(
                 "CallKitDidPerformEndCallAction", callUUID: action.callUUID,

package/ios/VoicePnBridge.m

@@ -22,12 +22,6 @@ RCT_EXTERN_METHOD(getPendingVoipPush:(RCTPromiseResolveBlock)resolve
 RCT_EXTERN_METHOD(clearPendingVoipPush:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getPendingCallKitAnswer:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(clearPendingCallKitAnswer:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
 RCT_EXTERN_METHOD(getPendingVoipAction:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 

package/ios/VoicePnBridge.swift

@@ -70,21 +70,6 @@ class VoicePnBridge: NSObject {
         resolve(true)
     }
     
-    @objc
-    func getPendingCallKitAnswer(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        let answer = UserDefaults.standard.string(forKey: "pending_callkit_answer")
-        NSLog("[VoicePnBridge] getPendingCallKitAnswer - answer: \(answer ?? "nil")")
-        resolve(answer)
-    }
-
-    @objc
-    func clearPendingCallKitAnswer(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        UserDefaults.standard.removeObject(forKey: "pending_callkit_answer")
-        UserDefaults.standard.synchronize()
-        NSLog("[VoicePnBridge] clearPendingCallKitAnswer - cleared")
-        resolve(true)
-    }
-
     @objc
     func getPendingVoipAction(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         let pending = UserDefaults.standard.string(forKey: "pending_voip_action")

package/lib/callkit/callkit-coordinator.js

@@ -258,10 +258,6 @@ class CallKitCoordinator {
       console.log('CallKitCoordinator: Answer action already being processed, skipping duplicate');
       return;
     }
-    // Clear native-side pending answer since JS received the event normally
-    try {
-      await voice_pn_bridge_1.VoicePnBridge.clearPendingCallKitAnswer();
-    } catch (_) {}
     const call = this.callMap.get(callKitUUID);
     if (!call) {
       console.warn('CallKitCoordinator: No WebRTC call found for CallKit answer action', {
@@ -444,21 +440,6 @@ class CallKitCoordinator {
         ...realPushData.metadata,
         from_callkit: true,
       };
-      // Check if the user answered from CallKit before JS listeners were ready.
-      // The native CXAnswerCallAction handler persists the answer UUID in UserDefaults
-      // so we can detect it here even when the JS event was dropped.
-      try {
-        const pendingAnswer = await voice_pn_bridge_1.VoicePnBridge.getPendingCallKitAnswer();
-        if (pendingAnswer) {
-          console.log(
-            'CallKitCoordinator: Found pending CallKit answer from native (JS event was missed), setting auto-answer flag'
-          );
-          this.shouldAutoAnswerNextCall = true;
-          await voice_pn_bridge_1.VoicePnBridge.clearPendingCallKitAnswer();
-        }
-      } catch (e) {
-        // Ignore - method may not exist on older native versions
-      }
       // Check if auto-answer is set and add from_notification flag
       const shouldAddFromNotification = this.shouldAutoAnswerNextCall;
       let pushData;
@@ -736,10 +717,6 @@ class CallKitCoordinator {
   async cleanupPushNotificationState() {
     console.log('CallKitCoordinator: ✅ Cleared auto-answer flag');
     this.shouldAutoAnswerNextCall = false;
-    // Also clear native-side pending answer to prevent stale auto-answer
-    try {
-      await voice_pn_bridge_1.VoicePnBridge.clearPendingCallKitAnswer();
-    } catch (_) {}
   }
   /**
    * Get reference to the SDK client (for queuing actions when call doesn't exist yet)

package/lib/hooks/useAppStateHandler.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.useAppStateHandler = void 0;
 const react_1 = require('react');
 const react_native_1 = require('react-native');
-const expo_router_1 = require('expo-router');
 const async_storage_1 = __importDefault(require('@react-native-async-storage/async-storage'));
 const connection_state_1 = require('../models/connection-state');
 const call_state_1 = require('../models/call-state');
@@ -70,9 +69,6 @@ const useAppStateHandler = ({
               if (!stillInProgress) {
                 log('AppStateHandler: Push notification call completed, now disconnecting socket');
                 await voipClient.logout();
-                if (navigateToLoginOnDisconnect) {
-                  expo_router_1.router.replace('/');
-                }
               }
             }, 5000); // Wait 5 seconds
             appState.current = nextAppState;
@@ -83,14 +79,6 @@ const useAppStateHandler = ({
             // Disconnect the socket with background reason
             await voipClient.logout();
             log('AppStateHandler: Socket disconnected successfully');
-            // Navigate to login screen
-            if (navigateToLoginOnDisconnect) {
-              // Use a small delay to ensure the disconnect completes
-              setTimeout(() => {
-                log('AppStateHandler: Navigating to login screen');
-                expo_router_1.router.replace('/');
-              }, 100);
-            }
           } catch (error) {
             console.error('AppStateHandler: Error during background disconnect:', error);
           }

package/lib/index.d.ts

@@ -8,6 +8,7 @@
  * call state transitions, push notification processing, and native call UI
  * integration.
  */
+import 'react-native-url-polyfill/auto';
 export {
   TelnyxVoipClient,
   createTelnyxVoipClient,

package/lib/index.js

@@ -62,6 +62,7 @@ exports.useAppReadyNotifier =
   exports.createTelnyxVoipClient =
   exports.TelnyxVoipClient =
     void 0;
+require('react-native-url-polyfill/auto');
 // Main client
 var telnyx_voip_client_1 = require('./telnyx-voip-client');
 Object.defineProperty(exports, 'TelnyxVoipClient', {

package/lib/internal/CallKitHandler.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.CallKitHandler = void 0;
 const react_1 = require('react');
 const react_native_1 = require('react-native');
-const expo_router_1 = require('expo-router');
 const async_storage_1 = __importDefault(require('@react-native-async-storage/async-storage'));
 const TelnyxVoiceContext_1 = require('../context/TelnyxVoiceContext');
 // Global flag to ensure only one CallKitHandler is active
@@ -20,7 +19,6 @@ let isCallKitHandlerActive = false;
  * @internal - Users should not use this component directly
  */
 const CallKitHandler = ({ onLoginRequired, onNavigateToDialer, onNavigateBack }) => {
-  const router = (0, expo_router_1.useRouter)();
   const { voipClient } = (0, TelnyxVoiceContext_1.useTelnyxVoice)();
   // Store active calls by CallKit UUID for coordination
   const activeCallsRef = (0, react_1.useRef)(new Map());
@@ -90,11 +88,8 @@ const CallKitHandler = ({ onLoginRequired, onNavigateToDialer, onNavigateBack })
       callUUID: eventData.callUUID,
       isTrackedCall: activeCallsRef.current.has(eventData.callUUID),
     });
-    // Navigate to dialer after answering
     if (onNavigateToDialer) {
       onNavigateToDialer();
-    } else {
-      router.replace('/dialer');
     }
   };
   const handleEndCall = async (eventData) => {
@@ -105,11 +100,8 @@ const CallKitHandler = ({ onLoginRequired, onNavigateToDialer, onNavigateBack })
     // Clean up our local tracking info
     activeCallsRef.current.delete(eventData.callUUID);
     await async_storage_1.default.removeItem('@push_notification_payload');
-    // Navigate back after call ends
     if (onNavigateBack) {
       onNavigateBack();
-    } else {
-      router.replace('/dialer');
     }
   };
   // This component doesn't render anything, it just handles events

package/lib/internal/calls/call-state-controller.d.ts

@@ -71,6 +71,13 @@ export declare class CallStateController {
     isWaitingForInvite: () => boolean;
     onInviteAutoAccepted: () => void;
   }): void;
+  /**
+   * Clear all tracked calls. Called when the session disconnects so that
+   * calls left in non-terminal states (because the socket died before
+   * their ENDED/FAILED events could arrive) don't accumulate as ghosts
+   * across reconnect cycles.
+   */
+  clearAllCalls(): void;
   /**
    * Dispose of the controller and clean up resources
    */

package/lib/internal/calls/call-state-controller.js

@@ -161,6 +161,29 @@ class CallStateController {
     this._isWaitingForInvite = callbacks.isWaitingForInvite;
     this._onInviteAutoAccepted = callbacks.onInviteAutoAccepted;
   }
+  /**
+   * Clear all tracked calls. Called when the session disconnects so that
+   * calls left in non-terminal states (because the socket died before
+   * their ENDED/FAILED events could arrive) don't accumulate as ghosts
+   * across reconnect cycles.
+   */
+  clearAllCalls() {
+    if (this._callMap.size === 0) {
+      return;
+    }
+    console.log(
+      `CallStateController: Clearing ${this._callMap.size} tracked call(s) on disconnect`
+    );
+    for (const call of this._callMap.values()) {
+      try {
+        call.dispose();
+      } catch (error) {
+        console.warn('CallStateController: Error disposing call during clear:', error);
+      }
+    }
+    this._callMap.clear();
+    this._calls.next([]);
+  }
   /**
    * Dispose of the controller and clean up resources
    */

package/lib/internal/session/session-manager.d.ts

@@ -15,6 +15,7 @@ export declare class SessionManager {
   private _sessionId;
   private _disposed;
   private _onClientReady?;
+  private _onDisconnect?;
   constructor();
   /**
    * Observable stream of connection state changes
@@ -24,6 +25,11 @@ export declare class SessionManager {
    * Set callback to be called when the Telnyx client is ready
    */
   setOnClientReady(callback: () => void): void;
+  /**
+   * Set callback to be called when the session disconnects, so dependent
+   * subsystems (e.g. the call state controller) can clear their state.
+   */
+  setOnDisconnect(callback: () => void): void;
   /**
    * Current connection state (synchronous access)
    */
@@ -45,7 +51,14 @@ export declare class SessionManager {
    */
   connectWithToken(config: TokenConfig): Promise<void>;
   /**
-   * Disconnect from the Telnyx platform
+   * Disconnect from the Telnyx platform.
+   *
+   * The DISCONNECTED state is emitted BEFORE awaiting the underlying
+   * client teardown so that observers (including the auto-reconnect logic
+   * in TelnyxVoiceApp) cannot read a stale CONNECTED value during the
+   * short window while the socket is being torn down. Tracked calls are
+   * cleared here too, since a torn-down socket will never emit the
+   * ENDED/FAILED events that normally trigger per-call cleanup.
    */
   disconnect(): Promise<void>;
   /**

package/lib/internal/session/session-manager.js

@@ -85,6 +85,13 @@ class SessionManager {
   setOnClientReady(callback) {
     this._onClientReady = callback;
   }
+  /**
+   * Set callback to be called when the session disconnects, so dependent
+   * subsystems (e.g. the call state controller) can clear their state.
+   */
+  setOnDisconnect(callback) {
+    this._onDisconnect = callback;
+  }
   /**
    * Current connection state (synchronous access)
    */
@@ -124,13 +131,28 @@ class SessionManager {
     await this._connect();
   }
   /**
-   * Disconnect from the Telnyx platform
+   * Disconnect from the Telnyx platform.
+   *
+   * The DISCONNECTED state is emitted BEFORE awaiting the underlying
+   * client teardown so that observers (including the auto-reconnect logic
+   * in TelnyxVoiceApp) cannot read a stale CONNECTED value during the
+   * short window while the socket is being torn down. Tracked calls are
+   * cleared here too, since a torn-down socket will never emit the
+   * ENDED/FAILED events that normally trigger per-call cleanup.
    */
   async disconnect() {
     if (this._disposed) {
       return;
     }
     this._currentConfig = undefined;
+    this._connectionState.next(connection_state_1.TelnyxConnectionState.DISCONNECTED);
+    if (this._onDisconnect) {
+      try {
+        this._onDisconnect();
+      } catch (error) {
+        console.error('Error in onDisconnect callback:', error);
+      }
+    }
     if (this._telnyxClient) {
       try {
         await this._telnyxClient.disconnect();
@@ -138,7 +160,6 @@ class SessionManager {
         console.error('Error during disconnect:', error);
       }
     }
-    this._connectionState.next(connection_state_1.TelnyxConnectionState.DISCONNECTED);
   }
   /**
    * Disable push notifications for the current session.

package/lib/internal/voice-pn-bridge.d.ts

@@ -25,8 +25,6 @@ export interface VoicePnBridgeInterface {
   ): Promise<boolean>;
   hideOngoingCallNotification(): Promise<boolean>;
   hideIncomingCallNotification(): Promise<boolean>;
-  getPendingCallKitAnswer(): Promise<string | null>;
-  clearPendingCallKitAnswer(): Promise<boolean>;
   getVoipToken(): Promise<string | null>;
   getPendingVoipPush(): Promise<string | null>;
   clearPendingVoipPush(): Promise<boolean>;
@@ -89,16 +87,6 @@ export declare class VoicePnBridge {
    * Useful for dismissing notifications when call is answered/rejected in app
    */
   static hideIncomingCallNotification(): Promise<boolean>;
-  /**
-   * Get pending CallKit answer UUID from native storage (iOS only).
-   * When the user answers a CallKit call before JS listeners are ready,
-   * the native side persists the answer UUID in UserDefaults so JS can detect it.
-   */
-  static getPendingCallKitAnswer(): Promise<string | null>;
-  /**
-   * Clear pending CallKit answer from native storage (iOS only)
-   */
-  static clearPendingCallKitAnswer(): Promise<boolean>;
   /**
    * Get VoIP token from native storage
    */

package/lib/internal/voice-pn-bridge.js

@@ -124,32 +124,6 @@ class VoicePnBridge {
       return false;
     }
   }
-  /**
-   * Get pending CallKit answer UUID from native storage (iOS only).
-   * When the user answers a CallKit call before JS listeners are ready,
-   * the native side persists the answer UUID in UserDefaults so JS can detect it.
-   */
-  static async getPendingCallKitAnswer() {
-    if (react_native_1.Platform.OS !== 'ios') return null;
-    try {
-      return await NativeBridge.getPendingCallKitAnswer();
-    } catch (error) {
-      console.error('VoicePnBridge: Error getting pending CallKit answer:', error);
-      return null;
-    }
-  }
-  /**
-   * Clear pending CallKit answer from native storage (iOS only)
-   */
-  static async clearPendingCallKitAnswer() {
-    if (react_native_1.Platform.OS !== 'ios') return true;
-    try {
-      return await NativeBridge.clearPendingCallKitAnswer();
-    } catch (error) {
-      console.error('VoicePnBridge: Error clearing pending CallKit answer:', error);
-      return false;
-    }
-  }
   /**
    * Get VoIP token from native storage
    */

package/lib/telnyx-voip-client.js

@@ -66,6 +66,11 @@ class TelnyxVoipClient {
       );
       this._callStateController.initializeClientListeners();
     });
+    // Clear any tracked calls when the session disconnects, so ghosts
+    // don't accumulate across background → foreground reconnect cycles.
+    this._sessionManager.setOnDisconnect(() => {
+      this._callStateController.clearAllCalls();
+    });
     if (this._options.debug) {
       console.log('TelnyxVoipClient initialized with options:', this._options);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telnyx/react-voice-commons-sdk",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "A high-level, state-agnostic, drop-in module for the Telnyx React Native SDK that simplifies WebRTC voice calling integration",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -59,14 +59,13 @@
   "homepage": "https://github.com/team-telnyx/react-native-voice-commons",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/team-telnyx/react-native-voice-commons.git"
+    "url": "https://github.com/team-telnyx/react-native-voice-commons.git"
   },
   "bugs": {
     "url": "https://github.com/team-telnyx/react-native-voice-commons/issues"
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": "^2.1.0",
-    "expo-router": "^5.1.0",
     "react": ">=19.0.0 <20.0.0",
     "react-native": ">=0.79.0 <1.0.0",
     "react-native-webrtc": "^124.0.5"
@@ -75,9 +74,6 @@
     "@react-native-async-storage/async-storage": {
       "optional": false
     },
-    "expo-router": {
-      "optional": false
-    },
     "react": {
       "optional": false
     },
@@ -93,6 +89,7 @@
     "@telnyx/react-native-voice-sdk": ">=0.4.1",
     "eventemitter3": "^5.0.1",
     "expo": "~53.0.22",
+    "react-native-url-polyfill": "^3.0.0",
     "react-native-voip-push-notification": "^3.3.3",
     "rxjs": "^7.8.2"
   },
@@ -104,7 +101,6 @@
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.0.0",
-    "expo-router": "^5.1.0",
     "jest": "^29.5.0",
     "prettier": "^3.0.0",
     "ts-jest": "^29.1.0",
@@ -116,6 +112,7 @@
     "node": ">=16"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   }
 }

package/src/callkit/callkit-coordinator.ts

@@ -2,9 +2,9 @@ import { Platform, AppState } from 'react-native';
 import CallKit, { CallEndReason } from './callkit';
 import { Call } from '@telnyx/react-native-voice-sdk';
 import { VoicePnBridge } from '../internal/voice-pn-bridge';
-import { router } from 'expo-router';
 import { TelnyxVoipClient } from '../telnyx-voip-client';
 import { TelnyxConnectionState } from '../models/connection-state';
+import { act } from 'react';
 
 /**
  * CallKit Coordinator - Manages the proper CallKit-first flow for iOS
@@ -253,11 +253,6 @@ class CallKitCoordinator {
       return;
     }
 
-    // Clear native-side pending answer since JS received the event normally
-    try {
-      await VoicePnBridge.clearPendingCallKitAnswer();
-    } catch (_) {}
-
     const call = this.callMap.get(callKitUUID);
 
     if (!call) {
@@ -473,22 +468,6 @@ class CallKitCoordinator {
         from_callkit: true,
       };
 
-      // Check if the user answered from CallKit before JS listeners were ready.
-      // The native CXAnswerCallAction handler persists the answer UUID in UserDefaults
-      // so we can detect it here even when the JS event was dropped.
-      try {
-        const pendingAnswer = await VoicePnBridge.getPendingCallKitAnswer();
-        if (pendingAnswer) {
-          console.log(
-            'CallKitCoordinator: Found pending CallKit answer from native (JS event was missed), setting auto-answer flag'
-          );
-          this.shouldAutoAnswerNextCall = true;
-          await VoicePnBridge.clearPendingCallKitAnswer();
-        }
-      } catch (e) {
-        // Ignore - method may not exist on older native versions
-      }
-
       // Check if auto-answer is set and add from_notification flag
       const shouldAddFromNotification = this.shouldAutoAnswerNextCall;
 
@@ -809,10 +788,6 @@ class CallKitCoordinator {
   private async cleanupPushNotificationState(): Promise<void> {
     console.log('CallKitCoordinator: ✅ Cleared auto-answer flag');
     this.shouldAutoAnswerNextCall = false;
-    // Also clear native-side pending answer to prevent stale auto-answer
-    try {
-      await VoicePnBridge.clearPendingCallKitAnswer();
-    } catch (_) {}
   }
 
   /**

package/src/hooks/useAppStateHandler.ts

@@ -1,6 +1,5 @@
 import { useEffect, useRef } from 'react';
 import { AppState, AppStateStatus } from 'react-native';
-import { router } from 'expo-router';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { TelnyxVoipClient } from '../telnyx-voip-client';
 import { TelnyxConnectionState } from '../models/connection-state';
@@ -76,9 +75,6 @@ export const useAppStateHandler = ({
               if (!stillInProgress) {
                 log('AppStateHandler: Push notification call completed, now disconnecting socket');
                 await voipClient.logout();
-                if (navigateToLoginOnDisconnect) {
-                  router.replace('/');
-                }
               }
             }, 5000); // Wait 5 seconds
             appState.current = nextAppState;
@@ -92,15 +88,6 @@ export const useAppStateHandler = ({
             await voipClient.logout();
 
             log('AppStateHandler: Socket disconnected successfully');
-
-            // Navigate to login screen
-            if (navigateToLoginOnDisconnect) {
-              // Use a small delay to ensure the disconnect completes
-              setTimeout(() => {
-                log('AppStateHandler: Navigating to login screen');
-                router.replace('/');
-              }, 100);
-            }
           } catch (error) {
             console.error('AppStateHandler: Error during background disconnect:', error);
           }

package/src/index.ts

@@ -9,6 +9,8 @@
  * integration.
  */
 
+import 'react-native-url-polyfill/auto';
+
 // Main client
 export {
   TelnyxVoipClient,

package/src/internal/CallKitHandler.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useRef } from 'react';
 import { Platform, DeviceEventEmitter } from 'react-native';
-import { useRouter } from 'expo-router';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useTelnyxVoice } from '../context/TelnyxVoiceContext';
 import { callKitCoordinator } from '../callkit';
@@ -36,7 +35,6 @@ export const CallKitHandler: React.FC<CallKitHandlerProps> = ({
   onNavigateToDialer,
   onNavigateBack,
 }) => {
-  const router = useRouter();
   const { voipClient } = useTelnyxVoice();
 
   // Store active calls by CallKit UUID for coordination
@@ -118,11 +116,8 @@ export const CallKitHandler: React.FC<CallKitHandlerProps> = ({
       isTrackedCall: activeCallsRef.current.has(eventData.callUUID),
     });
 
-    // Navigate to dialer after answering
     if (onNavigateToDialer) {
       onNavigateToDialer();
-    } else {
-      router.replace('/dialer');
     }
   };
 
@@ -136,11 +131,8 @@ export const CallKitHandler: React.FC<CallKitHandlerProps> = ({
     activeCallsRef.current.delete(eventData.callUUID);
     await AsyncStorage.removeItem('@push_notification_payload');
 
-    // Navigate back after call ends
     if (onNavigateBack) {
       onNavigateBack();
-    } else {
-      router.replace('/dialer');
     }
   };
 

package/src/internal/calls/call-state-controller.ts

@@ -190,6 +190,32 @@ export class CallStateController {
     this._onInviteAutoAccepted = callbacks.onInviteAutoAccepted;
   }
 
+  /**
+   * Clear all tracked calls. Called when the session disconnects so that
+   * calls left in non-terminal states (because the socket died before
+   * their ENDED/FAILED events could arrive) don't accumulate as ghosts
+   * across reconnect cycles.
+   */
+  clearAllCalls(): void {
+    if (this._callMap.size === 0) {
+      return;
+    }
+
+    console.log(
+      `CallStateController: Clearing ${this._callMap.size} tracked call(s) on disconnect`
+    );
+
+    for (const call of this._callMap.values()) {
+      try {
+        call.dispose();
+      } catch (error) {
+        console.warn('CallStateController: Error disposing call during clear:', error);
+      }
+    }
+    this._callMap.clear();
+    this._calls.next([]);
+  }
+
   /**
    * Dispose of the controller and clean up resources
    */

package/src/internal/session/session-manager.ts

@@ -26,6 +26,7 @@ export class SessionManager {
   private _sessionId: string;
   private _disposed = false;
   private _onClientReady?: () => void;
+  private _onDisconnect?: () => void;
 
   constructor() {
     this._sessionId = this._generateSessionId();
@@ -45,6 +46,14 @@ export class SessionManager {
     this._onClientReady = callback;
   }
 
+  /**
+   * Set callback to be called when the session disconnects, so dependent
+   * subsystems (e.g. the call state controller) can clear their state.
+   */
+  setOnDisconnect(callback: () => void): void {
+    this._onDisconnect = callback;
+  }
+
   /**
    * Current connection state (synchronous access)
    */
@@ -91,7 +100,14 @@ export class SessionManager {
   }
 
   /**
-   * Disconnect from the Telnyx platform
+   * Disconnect from the Telnyx platform.
+   *
+   * The DISCONNECTED state is emitted BEFORE awaiting the underlying
+   * client teardown so that observers (including the auto-reconnect logic
+   * in TelnyxVoiceApp) cannot read a stale CONNECTED value during the
+   * short window while the socket is being torn down. Tracked calls are
+   * cleared here too, since a torn-down socket will never emit the
+   * ENDED/FAILED events that normally trigger per-call cleanup.
    */
   async disconnect(): Promise<void> {
     if (this._disposed) {
@@ -99,6 +115,15 @@ export class SessionManager {
     }
 
     this._currentConfig = undefined;
+    this._connectionState.next(TelnyxConnectionState.DISCONNECTED);
+
+    if (this._onDisconnect) {
+      try {
+        this._onDisconnect();
+      } catch (error) {
+        console.error('Error in onDisconnect callback:', error);
+      }
+    }
 
     if (this._telnyxClient) {
       try {
@@ -107,8 +132,6 @@ export class SessionManager {
         console.error('Error during disconnect:', error);
       }
     }
-
-    this._connectionState.next(TelnyxConnectionState.DISCONNECTED);
   }
 
   /**

package/src/internal/voice-pn-bridge.ts

@@ -32,10 +32,6 @@ export interface VoicePnBridgeInterface {
   hideOngoingCallNotification(): Promise<boolean>;
   hideIncomingCallNotification(): Promise<boolean>;
 
-  // CallKit answer persistence (iOS only)
-  getPendingCallKitAnswer(): Promise<string | null>;
-  clearPendingCallKitAnswer(): Promise<boolean>;
-
   // Additional UserDefaults methods
   getVoipToken(): Promise<string | null>;
   getPendingVoipPush(): Promise<string | null>;
@@ -183,34 +179,6 @@ export class VoicePnBridge {
     }
   }
 
-  /**
-   * Get pending CallKit answer UUID from native storage (iOS only).
-   * When the user answers a CallKit call before JS listeners are ready,
-   * the native side persists the answer UUID in UserDefaults so JS can detect it.
-   */
-  static async getPendingCallKitAnswer(): Promise<string | null> {
-    if (Platform.OS !== 'ios') return null;
-    try {
-      return await NativeBridge.getPendingCallKitAnswer();
-    } catch (error) {
-      console.error('VoicePnBridge: Error getting pending CallKit answer:', error);
-      return null;
-    }
-  }
-
-  /**
-   * Clear pending CallKit answer from native storage (iOS only)
-   */
-  static async clearPendingCallKitAnswer(): Promise<boolean> {
-    if (Platform.OS !== 'ios') return true;
-    try {
-      return await NativeBridge.clearPendingCallKitAnswer();
-    } catch (error) {
-      console.error('VoicePnBridge: Error clearing pending CallKit answer:', error);
-      return false;
-    }
-  }
-
   /**
    * Get VoIP token from native storage
    */

package/src/telnyx-voip-client.ts

@@ -82,6 +82,12 @@ export class TelnyxVoipClient {
       this._callStateController.initializeClientListeners();
     });
 
+    // Clear any tracked calls when the session disconnects, so ghosts
+    // don't accumulate across background → foreground reconnect cycles.
+    this._sessionManager.setOnDisconnect(() => {
+      this._callStateController.clearAllCalls();
+    });
+
     if (this._options.debug) {
       console.log('TelnyxVoipClient initialized with options:', this._options);
     }