update speech util verbsion

2026-02-11 17:01:30 +00:00 · 2025-08-14 19:26:02 +07:00
40 changed files with 1791 additions and 4286 deletions
--- a/app.js
+++ b/app.js
@@ -29,12 +29,6 @@ const {LifeCycleEvents, FS_UUID_SET_NAME, SystemState, FEATURE_SERVER} = require
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 const createHttpListener = require('./lib/utils/http-listener');
 const healthCheck = require('@jambonz/http-health-check');
-const ProcessMonitor = require('./lib/utils/process-monitor');
-const monitor = new ProcessMonitor(logger);
-
-// Log startup
-monitor.logStartup();
-monitor.setupSignalHandlers();

 logger.on('level-change', (lvl, _val, prevLvl, _prevVal, instance) => {
  if (logger !== instance) {
--- a/data/example-voicemail-greetings.json
+++ b/data/example-voicemail-greetings.json
@@ -174,61 +174,5 @@
    "non è raggiungibile",
    "lascia pure un messaggio",
    "puoi lasciare un messaggio"
-  ],
-  "ja-JP": [
-    "この通話は留守番電話に転送されました",
-    "発信先は現在電話に出ることができません",
-    "発信音の後でメッセージを録音してください",
-    "録音を完了したら電話を切ることができます",
-    "只今電話に出ることができません",
-    "ただ今電話に出ることができません",
-    "ただいま電話に出ることができません",
-    "ピーという発信音の後にお名前とご用件をお話しください",
-    "ファックスを送られる方はスタートボタンを押してください",
-    "FAXを送られる方はスタートボタンを押してください",
-    "おかけになった電話をお呼びしましたが",
-    "お出になりません",
-    "おでになりません",
-    "お掛けになった電話番号は",
-    "おかけになった電話番号は",
-    "お掛けになった電話は",
-    "おかけになった電話は",
-    "現在使われておりません",
-    "番号をお確かめになって",
-    "お掛け直し下さい",
-    "おかけ直し下さい",
-    "おかけ直しください",
-    "こちらはNTTドコモです",
-    "こちらはエーユーです",
-    "こちらはソフトバンクです",
-    "電波の届かない",
-    "電源が入っていない",
-    "掛かりません",
-    "かかりません",
-    "お繋ぎすることが出来ません",
-    "お繋ぎ出来ません",
-    "お繋ぎすることができません",
-    "お繋ぎできません",
-    "おつなぎすることができません",
-    "おつなぎできません",
-    "メッセージを録音",
-    "留守番電話",
-    "お留守番サービス",
-    "留守番",
-    "留守電",
-    "留守",
-    "接続します",
-    "合図の音",
-    "ピーと",
-    "発信音",
-    "ご用件",
-    "伝言",
-    "お話しください",
-    "ファックス",
-    "FAX",
-    "終了",
-    "終了しました",
-    "終了いたしました",
-    "営業時間"
  ]
 }
--- a/lib/config.js
+++ b/lib/config.js
@@ -119,7 +119,7 @@ const ENCRYPTION_SECRET = process.env.ENCRYPTION_SECRET;
 const HTTP_POOL = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
 const HTTP_POOLSIZE = parseInt(process.env.HTTP_POOLSIZE, 10) || 10;
 const HTTP_PIPELINING = parseInt(process.env.HTTP_PIPELINING, 10) || 1;
-const HTTP_TIMEOUT = parseInt(process.env.JAMBONES_HTTP_TIMEOUT, 10) || 10000;
+const HTTP_TIMEOUT = 10000;
 const HTTP_PROXY_IP = process.env.JAMBONES_HTTP_PROXY_IP;
 const HTTP_PROXY_PORT = process.env.JAMBONES_HTTP_PROXY_PORT;
 const HTTP_PROXY_PROTOCOL = process.env.JAMBONES_HTTP_PROXY_PROTOCOL || 'http';
@@ -139,11 +139,6 @@ const JAMBONES_USE_FREESWITCH_TIMER_FD = process.env.JAMBONES_USE_FREESWITCH_TIM
 const JAMBONES_DIAL_SBC_FOR_REGISTERED_USER = process.env.JAMBONES_DIAL_SBC_FOR_REGISTERED_USER || false;
 const JAMBONES_MEDIA_TIMEOUT_MS = process.env.JAMBONES_MEDIA_TIMEOUT_MS || 0;
 const JAMBONES_MEDIA_HOLD_TIMEOUT_MS = process.env.JAMBONES_MEDIA_HOLD_TIMEOUT_MS || 0;
-const JAMBONES_WEBHOOK_ERROR_RETURN = parseInt(process.env.JAMBONES_WEBHOOK_ERROR_RETURN, 10) || 480;
-
-/* say / tts */
-const JAMBONES_SAY_CHUNK_SIZE = parseInt(process.env.JAMBONES_SAY_CHUNK_SIZE, 10) || 900;
-
 // jambonz
 const JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS =
  process.env.JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS;
@@ -236,7 +231,5 @@ module.exports = {
  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER,
  JAMBONES_MEDIA_TIMEOUT_MS,
  JAMBONES_MEDIA_HOLD_TIMEOUT_MS,
-  JAMBONES_SAY_CHUNK_SIZE,
  JAMBONES_TRANSCRIBE_EP_DESTROY_DELAY_MS,
-  JAMBONES_WEBHOOK_ERROR_RETURN
 };
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -147,7 +147,7 @@ router.post('/',

      // find handling sbc sip for called user
      if (JAMBONES_DIAL_SBC_FOR_REGISTERED_USER && target.type === 'user') {
-        const { registrar}  = srf.locals.dbHelpers;
+        const { registrar }  = srf.locals.dbHelpers;
        const reg = await registrar.query(target.name);
        if (reg) {
          sbcAddress = selectHostPort(logger, reg.sbcAddress, 'tcp')[1];
@@ -159,9 +159,7 @@ router.post('/',
     * trunk isn't specified,
     * check if from-number matches any existing numbers on Jambonz
     *  */
-      const { lookupLcrByAccount}  = srf.locals.dbHelpers;
-      const lcrs = await lookupLcrByAccount(req.body.account_sid);
-      if (target.type === 'phone' && !target.trunk && lcrs.length == 0) {
+      if (target.type === 'phone' && !target.trunk) {
        const str = restDial.from || '';
        const callingNumber = str.startsWith('+') ? str.substring(1) : str;
        const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, callingNumber);
@@ -291,7 +289,7 @@ router.post('/',
            }, {
              ...(account.enable_debug_log && {level: 'debug'})
            });
-            app.requestor.logger = app.notifier.logger = restDial.logger = sipLogger;
+            app.requestor.logger = app.notifier.logger = sipLogger;
            const callInfo = new CallInfo({
              direction: CallDirection.Outbound,
              req: inviteReq,
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -12,8 +12,7 @@ const RootSpan = require('./utils/call-tracer');
 const listTaskNames = require('./utils/summarize-tasks');
 const {
  JAMBONES_MYSQL_REFRESH_TTL,
-  JAMBONES_DISABLE_DIRECT_P2P_CALL,
-  JAMBONES_WEBHOOK_ERROR_RETURN
+  JAMBONES_DISABLE_DIRECT_P2P_CALL
 } = require('./config');
 const { createJambonzApp } = require('./dynamic-apps');
 const { decrypt } = require('./utils/encrypt-decrypt');
@@ -113,14 +112,6 @@ module.exports = function(srf, logger) {
        req.locals.callingNumber = sipURIs[1];
      }
    }
-
-    // Feature server INVITE request pipelines taking time to finish,
-    // while connecting and fetch application from db and invoking webhook.
-    // call can be canceled without any handling, so we add a listener here
-    req.once('cancel', (sipMsg) => {
-      logger.info(`${callId} got CANCEL request`);
-      req.locals.canceled = true;
-    });
    next();
  }

@@ -371,14 +362,13 @@ module.exports = function(srf, logger) {
      });
      // if transferred call contains callInfo, let update original data to newly created callInfo in this instance.
      if (app.transferredCall && app.callInfo) {
-        const {direction, callerName, from, to, originatingSipIp, originatingSipTrunkName, customerData} = app.callInfo;
+        const {direction, callerName, from, to, originatingSipIp, originatingSipTrunkName} = app.callInfo;
        req.locals.callInfo.direction = direction;
        req.locals.callInfo.callerName = callerName;
        req.locals.callInfo.from = from;
        req.locals.callInfo.to = to;
        req.locals.callInfo.originatingSipIp = originatingSipIp;
        req.locals.callInfo.originatingSipTrunkName = originatingSipTrunkName;
-        if (customerData) req.locals.callInfo.customerData = customerData;
        delete app.callInfo;
      }
      next();
@@ -481,7 +471,7 @@ module.exports = function(srf, logger) {
        message: `${err?.message}`.trim()
      }).catch((err) => this.logger.info({err}, 'Error generating alert for parsing application'));
      logger.info({err}, `Error retrieving or parsing application: ${err?.message}`);
-      res.send(JAMBONES_WEBHOOK_ERROR_RETURN, {headers: {'X-Reason': err?.message || 'unknown'}});
+      res.send(480, {headers: {'X-Reason': err?.message || 'unknown'}});
      app.requestor.close(WS_CLOSE_CODES.GoingAway);
    }
  }
--- a/lib/session/call-info.js
+++ b/lib/session/call-info.js
@@ -12,7 +12,6 @@ class CallInfo {
    let srf;
    this.direction = opts.direction;
    this.traceId = opts.traceId;
-    this.hasRecording = false;
    this.callTerminationBy = undefined;
    if (opts.req) {
      const u = opts.req.getParsedHeader('from');
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -504,12 +504,7 @@ class CallSession extends Emitter {
  }

  get isTtsStreamEnabled() {
-    // 1st background tts stream
-    return this.backgroundTaskManager.isTaskRunning('ttsStream') ||
-    // 2nd current task streaming tts
-    TaskName.Say === this.currentTask?.name && this.currentTask?.isStreamingTts ||
-    // 3rd nested verb is streaming tts
-    TaskName.Gather === this.currentTask?.name && this.currentTask.sayTask?.isStreamingTts;
+    return this.backgroundTaskManager.isTaskRunning('ttsStream');
  }

  get isListenEnabled() {
@@ -663,15 +658,6 @@ class CallSession extends Emitter {
    }
  }

-  // disableTtsCache
-  get disableTtsCache() {
-    return this._disableTtsCache || false;
-  }
-
-  set disableTtsCache(d) {
-    this._disableTtsCache = d;
-  }
-
  getTsStreamingVendor() {
    let v;
    if (this.currentTask?.isStreamingTts) {
@@ -724,7 +710,7 @@ class CallSession extends Emitter {
  }


-  get hasGlobalSttPunctuation() {
+  hasGlobalSttPunctuation() {
    return this._globalSttPunctuation !== undefined;
  }

@@ -756,101 +742,69 @@ class CallSession extends Emitter {
    return this._fillerNoise;
  }

+  async pauseOrResumeBackgroundListenIfRequired(action, silence = false) {
+    if ((action == 'pauseCallRecording' || action == 'resumeCallRecording') &&
+    this.backgroundTaskManager.isTaskRunning('record')) {
+      this.logger.debug({action, silence}, 'CallSession:pauseOrResumeBackgroundListenIfRequired');
+      const backgroundListenTask = this.backgroundTaskManager.getTask('record');
+      const status = action === 'pauseCallRecording' ? ListenStatus.Pause : ListenStatus.Resume;
+      backgroundListenTask.updateListen(
+        status,
+        silence
+      );
+    }
+  }

  async notifyRecordOptions(opts) {
-    const {action, silence = false, type = 'siprec'} = opts;
+    const {action, silence} = opts;
    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');

-    if (type == 'cloud') {
-      switch (action) {
-        case 'pauseCallRecording':
-          if (this.backgroundTaskManager.isTaskRunning('record')) {
-            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
-            const backgroundListenTask = this.backgroundTaskManager.getTask('record');
-            backgroundListenTask.updateListen(
-              ListenStatus.Pause,
-              silence
-            );
-            return true;
-          } else { return false; }
-        case 'resumeCallRecording':
-          if (this.backgroundTaskManager.isTaskRunning('record')) {
-            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
-            const backgroundListenTask = this.backgroundTaskManager.getTask('record');
-            backgroundListenTask.updateListen(
-              ListenStatus.Resume,
-              silence
-            );
-            return true;
-          } else { return false; }
-        case 'startCallRecording':
-          if (!this.backgroundTaskManager.isTaskRunning('record')) {
-            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
-            this.callInfo.hasRecording = true;
-            this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
-              .catch((err) => this.logger.error(err, 'redis error'));
-            if (!this.dlg) {
-              // Call not yet answered so set flag to record on status change
-              this.application.record_all_calls = true;
-            } else {
-              this.backgroundTaskManager.newTask('record');
-            }
-            return true;
-          } else { return false; }
-        case 'stopCallRecording':
-          if (this.backgroundTaskManager.isTaskRunning('record')) {
-            this.logger.debug({action, silence, type}, 'CallSession:cloudRecording');
-            this.backgroundTaskManager.stop('record');
-            return true;
-          } else { return false; }
-      }
-    } else {
-      // SIPREC
-      /* if we have not answered yet, just save the details for later */
-      if (!this.dlg) {
-        if (action === 'startCallRecording') {
-          this.recordOptions = opts;
-          return true;
-        }
-        return false;
-      }
+    this.pauseOrResumeBackgroundListenIfRequired(action, silence);

-      /* check validity of request */
-      if (action == 'startCallRecording' && this.recordState !== RecordState.RecordingOff) {
-        this.logger.info({recordState: this.recordState},
-          'CallSession:notifyRecordOptions: recording is already started, ignoring request');
-        return false;
-      }
-      if (action == 'stopCallRecording' && this.recordState === RecordState.RecordingOff) {
-        this.logger.info({recordState: this.recordState},
-          'CallSession:notifyRecordOptions: recording is already stopped, ignoring request');
-        return false;
-      }
-      if (action == 'pauseCallRecording' && this.recordState !== RecordState.RecordingOn) {
-        this.logger.info({recordState: this.recordState},
-          'CallSession:notifyRecordOptions: cannot pause recording, ignoring request ');
-        return false;
-      }
-      if (action == 'resumeCallRecording' && this.recordState !== RecordState.RecordingPaused) {
-        this.logger.info({recordState: this.recordState},
-          'CallSession:notifyRecordOptions: cannot resume recording, ignoring request ');
-        return false;
+    /* if we have not answered yet, just save the details for later */
+    if (!this.dlg) {
+      if (action === 'startCallRecording') {
+        this.recordOptions = opts;
+        return true;
      }
+      return false;
+    }

-      this.recordOptions = opts;
+    /* check validity of request */
+    if (action == 'startCallRecording' && this.recordState !== RecordState.RecordingOff) {
+      this.logger.info({recordState: this.recordState},
+        'CallSession:notifyRecordOptions: recording is already started, ignoring request');
+      return false;
+    }
+    if (action == 'stopCallRecording' && this.recordState === RecordState.RecordingOff) {
+      this.logger.info({recordState: this.recordState},
+        'CallSession:notifyRecordOptions: recording is already stopped, ignoring request');
+      return false;
+    }
+    if (action == 'pauseCallRecording' && this.recordState !== RecordState.RecordingOn) {
+      this.logger.info({recordState: this.recordState},
+        'CallSession:notifyRecordOptions: cannot pause recording, ignoring request ');
+      return false;
+    }
+    if (action == 'resumeCallRecording' && this.recordState !== RecordState.RecordingPaused) {
+      this.logger.info({recordState: this.recordState},
+        'CallSession:notifyRecordOptions: cannot resume recording, ignoring request ');
+      return false;
+    }

-      switch (action) {
-        case 'startCallRecording':
-          return await this.startRecording();
-        case 'stopCallRecording':
-          return await this.stopRecording();
-        case 'pauseCallRecording':
-          return await this.pauseRecording();
-        case 'resumeCallRecording':
-          return await this.resumeRecording();
-        default:
-          throw new Error(`invalid record action ${action}`);
-      }
+    this.recordOptions = opts;
+
+    switch (action) {
+      case 'startCallRecording':
+        return await this.startRecording();
+      case 'stopCallRecording':
+        return await this.stopRecording();
+      case 'pauseCallRecording':
+        return await this.pauseRecording();
+      case 'resumeCallRecording':
+        return await this.resumeRecording();
+      default:
+        throw new Error(`invalid record action ${action}`);
    }
  }

@@ -964,7 +918,7 @@ class CallSession extends Emitter {
        this.logger.debug('CallSession:enableBackgroundTtsStream - ttsStream enabled');
      } else {
        this.logger.debug(
-          'CallSession:enableBackgroundTtsStream - ignoring request; conditions not met (probably not using ws api)');
+          'CallSession:enableBackgroundTtsStream - ignoring request as call does not have required conditions');
      }
    }  catch (err) {
      this.logger.info({err, say}, 'CallSession:enableBackgroundTtsStream - Error creating background tts stream task');
@@ -978,25 +932,15 @@ class CallSession extends Emitter {
    }
  }
  clearTtsStream() {
-    if (this.isTtsStreamEnabled) {
-      this.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'user_interruption'})
-        .catch((err) => this.logger.info({err}, 'CallSession:clearTtsStream - Error sending user_interruption'));
-      this.ttsStreamingBuffer?.clear();
-    }
+    this.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'user_interruption'})
+      .catch((err) => this.logger.info({err}, 'CallSession:clearTtsStream - Error sending user_interruption'));
+    this.ttsStreamingBuffer?.clear();
  }

  startTtsStream() {
    this.ttsStreamingBuffer?.start();
  }

-  stopTtsStream() {
-    if (this.isTtsStreamEnabled) {
-      this.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_closed'})
-        .catch((err) => this.logger.info({err}, 'CallSession:clearTtsStream - Error sending user_interruption'));
-      this.ttsStreamingBuffer?.stop();
-    }
-  }
-
  async enableBotMode(gather, autoEnable) {
    try {
      let task;
@@ -1020,7 +964,7 @@ class CallSession extends Emitter {
      task.sticky = autoEnable;
      // listen to the bargein-done from background manager
      this.backgroundTaskManager.on('bargeIn-done', () => {
-        if (this.appIsUsingWebsockets) {
+        if (this.requestor instanceof WsRequestor) {
          try {
            this.kill(true);
          } catch (err) {}
@@ -1073,6 +1017,8 @@ class CallSession extends Emitter {
        (type === 'tts' && credential.use_for_tts) ||
        (type === 'stt' && credential.use_for_stt)
      )) {
+        this.logger.debug(
+          `${type}: ${credential.vendor} ${credential.label ? `, label: ${credential.label}` : ''}  `);
        if ('google' === vendor) {
          if (type === 'tts' && !credential.tts_tested_ok ||
            type === 'stt' && !credential.stt_tested_ok) {
@@ -1082,7 +1028,7 @@ class CallSession extends Emitter {
            const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));
            return {
              speech_credential_sid: credential.speech_credential_sid,
-              credentials: cred,
+              credentials: cred
            };
          } catch (err) {
            const sid = this.accountInfo.account.account_sid;
@@ -1142,13 +1088,6 @@ class CallSession extends Emitter {
            deepgram_stt_use_tls: credential.deepgram_stt_use_tls
          };
        }
-        else if ('gladia' === vendor) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            api_key: credential.api_key,
-            region: credential.region,
-          };
-        }
        else if ('soniox' === vendor) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
@@ -1180,7 +1119,6 @@ class CallSession extends Emitter {
          return {
            api_key: credential.api_key,
            model_id: credential.model_id,
-            api_uri: credential.api_uri,
            options: credential.options
          };
        }
@@ -1229,16 +1167,7 @@ class CallSession extends Emitter {
            service_version: credential.service_version
          };
        }
-        else if ('houndify' === vendor) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            client_id: credential.client_id,
-            client_key: credential.client_key,
-            user_id: credential.user_id,
-            houndify_server_uri: credential.houndify_server_uri
-          };
-        }
-        else if ('deepgramflux' === vendor) {
+        else if ('deepgramriver' === vendor) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
            api_key: credential.api_key,
@@ -1287,10 +1216,9 @@ class CallSession extends Emitter {
      }
      else {
        writeAlerts({
-          alert_type: type === 'tts' ? AlertType.TTS_NOT_PROVISIONED : AlertType.STT_NOT_PROVISIONED,
+          alert_type: AlertType.STT_NOT_PROVISIONED,
          account_sid: this.accountSid,
          vendor,
-          label,
          target_sid: this.callSid
        }).catch((err) => this.logger.error({err}, 'Error writing tts alert'));
      }
@@ -1321,7 +1249,6 @@ class CallSession extends Emitter {
      this.ttsStreamingBuffer.on(TtsStreamingEvents.Pause, this._onTtsStreamingPause.bind(this));
      this.ttsStreamingBuffer.on(TtsStreamingEvents.Resume, this._onTtsStreamingResume.bind(this));
      this.ttsStreamingBuffer.on(TtsStreamingEvents.ConnectFailure, this._onTtsStreamingConnectFailure.bind(this));
-      this.ttsStreamingBuffer.on(TtsStreamingEvents.Connected, this._onTtsStreamingConnected.bind(this));
    }
    else {
      this.logger.info(`CallSession:exec - not a normal call session: ${this.constructor.name}`);
@@ -1380,7 +1307,7 @@ class CallSession extends Emitter {
      }

      if (0 === this.tasks.length &&
-        this.appIsUsingWebsockets &&
+        this.requestor instanceof WsRequestor &&
        !this.requestor.closedGracefully &&
        !this.callGone &&
        !this.isConfirmCallSession
@@ -1490,11 +1417,7 @@ class CallSession extends Emitter {
      }
      else {
        if (this.req && !this.dlg) {
-          try {
-            this.req.cancel();
-          } catch (err) {
-            this.logger.error({err}, 'CallSession:_lccCallStatus error cancelling request');
-          }
+          this.req.cancel();
          this._callReleased();
        }
      }
@@ -1941,7 +1864,7 @@ Duration=${duration} `
      return;
    }
    else if (tokens === undefined) {
-      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since tokens is missing');
+      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since id is missing');
      return this.requestor.request('tts:tokens-result', '/tokens-result', {
        id,
        status: 'failed',
@@ -2028,7 +1951,7 @@ Duration=${duration} `
        return this._lccDub(opts.dub, callSid);
      }
      else if (opts.boostAudioSignal) {
-        return this._lccBoostAudioSignal(opts.boostAudioSignal, callSid);
+        return this._lccBoostAudioSignal(opts, callSid);
      }
      else if (opts.media_path) {
        return this._lccMediaPath(opts.media_path, callSid);
@@ -2474,7 +2397,7 @@ Duration=${duration} `
        this.logger.debug(`endpoint was destroyed!! ${this.ep.uuid}`);
      });

-      if (this.direction === CallDirection.Inbound || this.application?.transferredCall) {
+      if (this.direction === CallDirection.Inbound) {
        if (task.earlyMedia && !this.req.finalResponseSent) {
          this.res.send(183, {body: ep.local.sdp});
          return {ep};
@@ -2500,36 +2423,6 @@ Duration=${duration} `
      }
      else {
        this.logger.error(err, `Error attempting to allocate endpoint for for task ${task.name}`);
-        // Check for SipError type (e.g., 488 codec incompatibility)
-        const isSipError = err.name === 'SipError';
-        if (isSipError && err.status) {
-          // Extract Reason header from SIP response if available (e.g., Q.850;cause=88;text="INCOMPATIBLE_DESTINATION")
-          const sipReasonHeader = err.res?.msg?.headers?.reason;
-          this._endpointAllocationError = {
-            status: err.status,
-            reason: err.reason || 'Endpoint Allocation Failed',
-            sipReasonHeader
-          };
-          this.logger.info({endpointAllocationError: this._endpointAllocationError},
-            'Captured SipError for propagation to SBC');
-
-          // Send SIP error response immediately for inbound calls
-          if (this.res && !this.res.finalResponseSent) {
-            this.logger.info(`Sending ${err.status} response to SBC due to SipError`);
-            this.res.send(err.status, {
-              headers: {
-                'X-Reason': `endpoint allocation failure: ${err.reason || 'Endpoint Allocation Failed'}`,
-                ...(sipReasonHeader && {'Reason': sipReasonHeader})
-              }
-            });
-            this._notifyCallStatusChange({
-              callStatus: CallStatus.Failed,
-              sipStatus: err.status,
-              sipReason: err.reason || 'Endpoint Allocation Failed'
-            });
-            this._callReleased();
-          }
-        }
        throw new Error(`${BADPRECONDITIONS}: unable to allocate endpoint`);
      }
    }
@@ -2636,7 +2529,7 @@ Duration=${duration} `
    this.backgroundTaskManager.stopAll();
    this.clearOrRestoreActionHookDelayProcessor().catch((err) => {});

-    this.stopTtsStream();
+    this.ttsStreamingBuffer?.stop();

    this.sttLatencyCalculator?.stop();
  }
@@ -2790,7 +2683,7 @@ Duration=${duration} `
   */
  _onRefer(req, res) {
    const task = this.currentTask;
-    const sd = task?.sd;
+    const sd = task.sd;
    if (task && TaskName.Dial === task.name && sd && task.referHook) {
      task.handleRefer(this, req, res);
    }
@@ -3042,7 +2935,8 @@ Duration=${duration} `

    // manage record all call.
    if (callStatus === CallStatus.InProgress) {
-      if (this.accountInfo.account.record_all_calls || this.application.record_all_calls) {
+      if (this.accountInfo.account.record_all_calls ||
+        this.application.record_all_calls) {
        this.backgroundTaskManager.newTask('record');
      }
    } else if (callStatus == CallStatus.Completed) {
@@ -3095,14 +2989,14 @@ Duration=${duration} `
   */

  _notifyTaskError(obj) {
-    if (this.appIsUsingWebsockets) {
+    if (this.requestor instanceof WsRequestor) {
      this.requestor.request('jambonz:error', '/error', obj)
        .catch((err) => this.logger.debug({err}, 'CallSession:_notifyTaskError - Error sending'));
    }
  }

  _notifyTaskStatus(task, evt) {
-    if (this.notifyEvents && this.appIsUsingWebsockets) {
+    if (this.notifyEvents && this.requestor instanceof WsRequestor) {
      const obj = {...evt, id: task.id, name: task.name};
      this.requestor.request('verb:status', '/status', obj)
        .catch((err) => this.logger.debug({err}, 'CallSession:_notifyTaskStatus - Error sending'));
@@ -3154,7 +3048,7 @@ Duration=${duration} `
  }

  _clearTasks(backgroundGather, evt) {
-    if (this.appIsUsingWebsockets && !backgroundGather.cleared) {
+    if (this.requestor instanceof WsRequestor && !backgroundGather.cleared) {
      this.logger.debug({evt}, 'CallSession:_clearTasks on event from background gather');
      try {
        backgroundGather.cleared = true;
@@ -3182,18 +3076,13 @@ Duration=${duration} `
    }
  }

-  _onTtsStreamingConnected() {
-    this.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_open'})
-      .catch((err) => this.logger.info({err}, 'CallSession:_onTtsStreamingConnected - Error sending'));
-  }
-
  _onTtsStreamingEmpty() {
    const task = this.currentTask;
    if (task && TaskName.Say === task.name) {
      task.notifyTtsStreamIsEmpty();
    } else if (
      // If Gather nested say task is streaming
-      task && TaskName.Gather === task.name && task.sayTask && task.sayTask.isStreamingTts) {
+      TaskName.Gather === task.name && task.sayTask && task.sayTask.isStreamingTts) {
      const sayTask = task.sayTask;
      sayTask.notifyTtsStreamIsEmpty();
    }
--- a/lib/session/inbound-call-session.js
+++ b/lib/session/inbound-call-session.js
@@ -22,12 +22,6 @@ class InboundCallSession extends CallSession {
    this.req = req;
    this.res = res;

-    // if the call was canceled before we got here, handle it
-    if (this.req.locals.canceled) {
-      req.locals.logger.info('InboundCallSession: constructor - call was already canceled');
-      this._onCancel();
-    }
-
    req.once('cancel', this._onCancel.bind(this));

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
@@ -60,19 +54,6 @@ class InboundCallSession extends CallSession {
          }
        });
      }
-      else if (this._endpointAllocationError) {
-        // Propagate SIP error from endpoint allocation failure back to the client
-        const {status, reason, sipReasonHeader} = this._endpointAllocationError;
-        this.rootSpan.setAttributes({'call.termination': `endpoint allocation SIP error ${status}`});
-        this.logger.info({endpointAllocationError: this._endpointAllocationError},
-          `InboundCallSession:_onTasksDone generating ${status} due to endpoint allocation failure`);
-        this.res.send(status, {
-          headers: {
-            'X-Reason': `endpoint allocation failure: ${reason}`,
-            ...(sipReasonHeader && {'Reason': sipReasonHeader})
-          }
-        });
-      }
      else {
        this.rootSpan.setAttributes({'call.termination': 'tasks completed without answering call'});
        this.logger.info('InboundCallSession:_onTasksDone auto-generating non-success response to invite');
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -49,8 +49,7 @@ class Conference extends Task {
    this.confName = this.data.name;
    [
      'beep', 'startConferenceOnEnter', 'endConferenceOnExit', 'joinMuted',
-      'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook',
-      'endConferenceDuration', 'distributeDtmf'
+      'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook', 'endConferenceDuration'
    ].forEach((attr) => this[attr] = this.data[attr]);
    this.record = this.data.record || {};
    this.statusEvents = [];
@@ -357,7 +356,6 @@ class Conference extends Task {
        //https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Modules/mod_conference_3965534/
        // mute |	Enter conference muted
        ...((this.joinMuted || this.speakOnlyTo) && {mute: true}),
-        ...(this.distributeDtmf && {'dist-dtmf': true})
      }});

      /**
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -18,8 +18,7 @@ class TaskConfig extends Task {
      'boostAudioSignal',
      'vad',
      'ttsStream',
-      'autoStreamTts',
-      'disableTtsCache'
+      'autoStreamTts'
    ].forEach((k) => this[k] = this.data[k] || {});

    if ('notifyEvents' in this.data) {
@@ -89,7 +88,6 @@ class TaskConfig extends Task {
  get hasReferHook() { return Object.keys(this.data).includes('referHook'); }
  get hasNotifySttLatency() { return Object.keys(this.data).includes('notifySttLatency'); }
  get hasTtsStream() { return Object.keys(this.ttsStream).length; }
-  get hasDisableTtsCache() { return Object.keys(this.data).includes('disableTtsCache'); }

  get summary() {
    const phrase = [];
@@ -127,7 +125,6 @@ class TaskConfig extends Task {
      phrase.push(`${this.ttsStream.enable ? 'enable' : 'disable'} ttsStream`);
    }
    if ('autoStreamTts' in this.data) phrase.push(`enable Say.stream value ${this.data.autoStreamTts ? 'on' : 'off'}`);
-    if (this.hasDisableTtsCache) phrase.push(`disableTtsCache ${this.data.disableTtsCache ? 'on' : 'off'}`);
    return `${this.name}{${phrase.join(',')}}`;
  }

@@ -360,11 +357,6 @@ class TaskConfig extends Task {
      this.logger.info('Config: disabling ttsStream');
      cs.disableTtsStream();
    }
-
-    if (this.hasDisableTtsCache) {
-      this.logger.info(`set disableTtsCache = ${this.disableTtsCache}`);
-      cs.disableTtsCache = this.data.disableTtsCache;
-    }
  }

  async kill(cs) {
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -21,7 +21,7 @@ const {parseUri} = require('drachtio-srf');
 const {ANCHOR_MEDIA_ALWAYS,
  JAMBONZ_DIAL_PAI_HEADER,
  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER} = require('../config');
-const { isOnhold, isOpusFirst, getLeadingCodec } = require('../utils/sdp-utils');
+const { isOnhold, isOpusFirst } = require('../utils/sdp-utils');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
 const { selectHostPort } = require('../utils/network');
 const { sleepFor } = require('../utils/helpers');
@@ -158,7 +158,6 @@ class TaskDial extends Task {

  get canReleaseMedia() {
    const keepAnchor = this.data.anchorMedia ||
-      this.isTranscoding ||
      this.cs.isBackGroundListen ||
      this.cs.onHoldMusic ||
      ANCHOR_MEDIA_ALWAYS ||
@@ -195,9 +194,6 @@ class TaskDial extends Task {
  async exec(cs) {
    await super.exec(cs);

-    /* capture whether A leg was already answered before this dial task started */
-    this._aLegAlreadyAnswered = !!cs.dlg;
-
    if (this.data.anchorMedia && this.data.exitMediaPath) {
      this.logger.info('Dial:exec - incompatible anchorMedia and exitMediaPath are both set, will obey anchorMedia');
      delete this.data.exitMediaPath;
@@ -553,7 +549,7 @@ class TaskDial extends Task {
    let sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;
-    const forwardPAI = this.forwardPAI ?? !JAMBONZ_DIAL_PAI_HEADER; // dial verb overides env var
+    const forwardPAI = this.forwardPAI ?? JAMBONZ_DIAL_PAI_HEADER; // dial verb overides env var
    this.logger.debug(forwardPAI, 'forwardPAI value');
    if (!sbcAddress) throw new Error('no SBC found for outbound call');
    this.headers = {
@@ -579,7 +575,7 @@ class TaskDial extends Task {
      proxy: `sip:${sbcAddress}`,
      callingNumber: this.callerId || fromUri.user,
      ...(this.callerName && {callingName: this.callerName}),
-      opusFirst: isOpusFirst(this.cs.ep.local.sdp),
+      opusFirst: isOpusFirst(this.cs.ep.remote.sdp),
      isVideoCall: this.cs.ep.remote.sdp.includes('m=video')
    };

@@ -645,9 +641,7 @@ class TaskDial extends Task {
         * trunk isn't specified,
         * check if number matches any existing numbers
         *  */
-        const { lookupLcrByAccount}  = srf.locals.dbHelpers;
-        const lcrs = await lookupLcrByAccount(cs.accountSid);
-        if (t.type === 'phone' && !t.trunk && lcrs.length == 0) {
+        if (t.type === 'phone' && !t.trunk) {
          const str = this.callerId || req.callingNumber || '';
          const callingNumber = str.startsWith('+') ? str.substring(1) : str;
          const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
@@ -680,8 +674,7 @@ class TaskDial extends Task {
          rootSpan: cs.rootSpan,
          startSpan: this.startSpan.bind(this),
          dialTask: this,
-          onHoldMusic: this.cs.onHoldMusic,
-          tmpFiles: this.cs.tmpFiles,
+          onHoldMusic: this.cs.onHoldMusic
        });
        this.dials.set(sd.callSid, sd);

@@ -776,24 +769,12 @@ class TaskDial extends Task {
  }

  async _connectSingleDial(cs, sd) {
-    // start connect with dialed leg, this is the soonest we can identify transcoding
-    if (this.epOther && sd.ep) {
-      const codecA = getLeadingCodec(this.epOther.local.sdp);
-      const codecB = getLeadingCodec(sd.ep.remote.sdp);
-      this.isTranscoding = (codecA !== codecB);
-      if (this.isTranscoding) {
-        this.logger.info(`Dial:_connectSingleDial - transcoding from ${codecA} (A leg) to ${codecB} (B leg)`);
-      }
-    }
    if (!this.bridged && !this.canReleaseMedia) {
      this.logger.debug('Dial:_connectSingleDial bridging endpoints');
      if (this.epOther) {
        this.epOther.api('uuid_break', this.epOther.uuid);
        this.epOther.bridge(sd.ep);
      }
-      else {
-        this.logger.error('Dial:_connectSingleDial - no other endpoint to bridge!');
-      }
      this.bridged = true;
    }

@@ -875,12 +856,8 @@ class TaskDial extends Task {
    this.sd = sd;
    this.callSid = sd.callSid;
    if (this.earlyMedia) {
-      if (this._aLegAlreadyAnswered) {
-        debug('Dial:_selectSingleDial A leg was already answered, skipping propagateAnswer');
-      } else {
-        debug('Dial:_selectSingleDial propagating answer supervision on A leg now that B is connected');
-        await cs.propagateAnswer();
-      }
+      debug('Dial:_selectSingleDial propagating answer supervision on A leg now that B is connected');
+      await cs.propagateAnswer();
    }
    if (this.timeLimit) {
      this.timerMaxCallDuration = setTimeout(this._onMaxCallDuration.bind(this, cs), this.timeLimit * 1000);
@@ -946,6 +923,7 @@ class TaskDial extends Task {
        this.logger.info({err}, 'Dial:_selectSingleDial - Error boosting audio signal');
      }
    }
+
    /* if we can release the media back to the SBC, do so now */
    if (this.canReleaseMedia || this.shouldExitMediaPathEntirely) {
      setTimeout(this._releaseMedia.bind(this, cs, sd, this.shouldExitMediaPathEntirely), 200);
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -5,15 +5,13 @@ const {
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
  DeepgramTranscriptionEvents,
-  GladiaTranscriptionEvents,
  SonioxTranscriptionEvents,
  CobaltTranscriptionEvents,
  IbmTranscriptionEvents,
  NvidiaTranscriptionEvents,
  JambonzTranscriptionEvents,
  AssemblyAiTranscriptionEvents,
-  HoundifyTranscriptionEvents,
-  DeepgramfluxTranscriptionEvents,
+  DeepgramRiverTranscriptionEvents,
  VoxistTranscriptionEvents,
  CartesiaTranscriptionEvents,
  OpenAITranscriptionEvents,
@@ -95,8 +93,6 @@ class TaskGather extends SttTask {

  get needsStt() { return this.input.includes('speech'); }

-  get isBackgroundGather() { return this.bugname_prefix === 'background_bargeIn_'; }
-
  get wantsSingleUtterance() {
    return this.data.recognizer?.singleUtterance === true;
  }
@@ -231,9 +227,7 @@ class TaskGather extends SttTask {

    const startListening = async(cs, ep) => {
      this._startTimer();
-      if (this.isContinuousAsr && 0 === this.timeout && !this.isBackgroundGather) {
-        this._startAsrTimer();
-      }
+      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
      if (this.input.includes('speech') && !this.listenDuringPrompt) {
        try {
          await this._setSpeechHandlers(cs, ep);
@@ -258,7 +252,7 @@ class TaskGather extends SttTask {
            startDtmfListener();
          }
          this._stopVad();
-          if (!this.killed && !this.resolved) {
+          if (!this.killed) {
            startListening(cs, ep);
            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
              this.logger.debug('Gather:exec - starting transcription timers after say completes');
@@ -270,21 +264,19 @@ class TaskGather extends SttTask {
        };
        this.sayTask.span = span;
        this.sayTask.ctx = ctx;
-        this.sayTask
-          .exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
-          .then(() => {
-            if (this.sayTask.isStreamingTts) return;
-            this.logger.debug('Gather:exec - nested say task completed');
-            span.end();
-            process();
-            return;
-          })
+        this.sayTask.exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
          .catch((err) => {
            process();
          });
        if (this.sayTask.isStreamingTts && !this.sayTask.closeOnStreamEmpty) {
          // if streaming tts, we do not wait for it to complete if it is not closing the stream automatically
          process();
+        } else {
+          this.sayTask.on('playDone', (err) => {
+            span.end();
+            if (err) this.logger.error({err}, 'Gather:exec Error playing tts');
+            process();
+          });
        }
      }
      else if (this.playTask) {
@@ -296,7 +288,7 @@ class TaskGather extends SttTask {
            startDtmfListener();
          }
          this._stopVad();
-          if (!this.killed && !this.resolved) {
+          if (!this.killed) {
            startListening(cs, ep);
            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
              this.logger.debug('Gather:exec - starting transcription timers after play completes');
@@ -308,17 +300,15 @@ class TaskGather extends SttTask {
        };
        this.playTask.span = span;
        this.playTask.ctx = ctx;
-        this.playTask
-          .exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
-          .then(() => {
-            this.logger.debug('Gather:exec - nested play task completed');
-            span.end();
-            process();
-            return;
-          })
+        this.playTask.exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
          .catch((err) => {
            process();
          });
+        this.playTask.on('playDone', (err) => {
+          span.end();
+          if (err) this.logger.error({err}, 'Gather:exec Error playing url');
+          process();
+        });
      }
      else {
        if (this.killed) {
@@ -378,9 +368,6 @@ class TaskGather extends SttTask {

  _onDtmf(cs, ep, evt) {
    this.logger.debug(evt, 'TaskGather:_onDtmf');
-    if (!this._timeoutTimer && this.timeout > 0) {
-      this._startTimer();
-    }
    clearTimeout(this.interDigitTimer);
    let resolved = false;
    if (this.dtmfBargein) {
@@ -405,7 +392,6 @@ class TaskGather extends SttTask {
      if (this.digitBuffer.length === 0 && this.needsStt) {
        // DTMF is higher priority than STT.
        this.removeCustomEventListeners();
-        this._clearAsrTimer(); //clear ASR timer as we're now using dtmf
        this._stopTranscribing(ep);
      }
      this.digitBuffer += evt.dtmf;
@@ -420,7 +406,6 @@ class TaskGather extends SttTask {
      const ms = this.interDigitTimeout * 1000;
      this.logger.debug(`starting interdigit timer of ${ms}`);
      this.interDigitTimer = setTimeout(() => this._resolve('dtmf-interdigit-timeout'), ms);
-      this._clearTimer(); //clear main timer as we're now using interdigit dtmf timer
    }
  }

@@ -478,32 +463,16 @@ class TaskGather extends SttTask {
        this.addCustomEventListener(ep, DeepgramTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
        this.addCustomEventListener(ep, DeepgramTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, DeepgramTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
        break;

-      case 'deepgramflux':
-        this.bugname = `${this.bugname_prefix}deepgramflux_transcribe`;
+      case 'deepgramriver':
+        this.bugname = `${this.bugname_prefix}deepgramriver_transcribe`;
        this.addCustomEventListener(
-          ep, DeepgramfluxTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+          ep, DeepgramRiverTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
        this.addCustomEventListener(
-          ep, DeepgramfluxTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.ConnectFailure,
+          ep, DeepgramRiverTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
+        this.addCustomEventListener(ep, DeepgramRiverTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-        break;
-
-      case 'gladia':
-        this.bugname = `${this.bugname_prefix}gladia_transcribe`;
-        this.addCustomEventListener(
-          ep, GladiaTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Connect, this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-        // gladia require unique url for each session
-        const {host, path} = await this.createGladiaLiveSession();
-        opts.GLADIA_SPEECH_HOST = host;
-        opts.GLADIA_SPEECH_PATH = path;
        break;

      case 'soniox':
@@ -583,18 +552,6 @@ class TaskGather extends SttTask {
          this._onVendorConnectFailure.bind(this, cs, ep));
        break;

-      case 'houndify':
-        this.bugname = `${this.bugname_prefix}houndify_transcribe`;
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Error,
-          this._onVendorError.bind(this, cs, ep));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        break;
-
      case 'voxist':
        this.bugname = `${this.bugname_prefix}voxist_transcribe`;
        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Transcription,
@@ -739,11 +696,10 @@ class TaskGather extends SttTask {

  _startTimer() {
    if (0 === this.timeout) return;
-    this.logger.debug(`Starting timoutTimer of ${this.timeout}ms`);
    this._clearTimer();
    this._timeoutTimer = setTimeout(() => {
-      // If continuousASR in use then extend by the asr window for more transcripts.
      if (this.isContinuousAsr) this._startAsrTimer();
+      if (this.interDigitTimer) return; // let the inter-digit timer complete
      else {
        this._resolve(this.digitBuffer.length >= this.minDigits ? 'dtmf-num-digits' : 'timeout');
      }
@@ -885,15 +841,17 @@ class TaskGather extends SttTask {
        this._fillerNoiseOn = false;  // in a race, if we just started audio it may sneak through here
        this.ep.api('uuid_break', this.ep.uuid)
          .catch((err) => this.logger.info(err, 'Error killing audio'));
-        if (cs.isTtsStreamEnabled) cs.clearTtsStream();
+        cs.clearTtsStream();
      }
      return;
    }
    if (this.sayTask && !this.sayTask.killed) {
+      this.sayTask.removeAllListeners('playDone');
      this.sayTask.kill(cs);
      this.sayTask = null;
    }
    if (this.playTask && !this.playTask.killed) {
+      this.playTask.removeAllListeners('playDone');
      this.playTask.kill(cs);
      this.playTask = null;
    }
@@ -948,7 +906,7 @@ class TaskGather extends SttTask {

    evt = this.normalizeTranscription(evt, this.vendor, 1, this.language,
      this.shortUtterance, this.data.recognizer.punctuation);
-    this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription normalized transcript');
+    //this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription normalized transcript');

    if (evt.alternatives.length === 0) {
      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
@@ -1114,11 +1072,6 @@ class TaskGather extends SttTask {
        this.cs.requestor.request('verb:hook', this.partialResultHook,  Object.assign({speech: evt},
          this.cs.callInfo, httpHeaders));
      }
-      else if (this.vendor === 'deepgramflux' &&
-        ['EagerEndOfTurn', 'TurnResumed'].includes(evt.vendor.evt?.event)) {
-        this.logger.debug(`Gather:_onTranscription - deepgramflux event detected: ${evt.event}`);
-        this.performAction({speech: evt, reason: 'speechDetected'}, false);
-      }
      if (this.vendor === 'soniox') {
        if (evt.vendor.finalWords.length) {
          this.logger.debug({evt}, 'TaskGather:_onTranscription - buffering soniox transcript');
@@ -1165,7 +1118,7 @@ class TaskGather extends SttTask {
  }

  async _startFallback(cs, ep, evt) {
-    if (this.canFallback()) {
+    if (this.canFallback) {
      this._stopTranscribing(ep);
      try {
        this.logger.debug('gather:_startFallback');
@@ -1322,8 +1275,6 @@ class TaskGather extends SttTask {
    }

    this.resolved = true;
-    // gather is resolved, prevent any further transcription events while resolve in progress
-    this.removeCustomEventListeners();
    // If bargin is false and ws application return ack to verb:hook
    // the gather should not play any audio
    this._killAudio(this.cs);
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -5,17 +5,6 @@ const moment = require('moment');
 const MAX_PLAY_AUDIO_QUEUE_SIZE = 10;
 const DTMF_SPAN_NAME = 'dtmf';

-function escapeString(str) {
-  return str
-    .replace(/\\/g, '\\\\')   // Escape backslashes
-    .replace(/"/g, '\\"')     // Escape double quotes
-    .replace(/[\b]/g, '\\b')  // Escape backspace (NOTE: [\b] not \b)
-    .replace(/\f/g, '\\f')    // Escape formfeed
-    .replace(/\n/g, '\\n')    // Escape newlines
-    .replace(/\r/g, '\\r')    // Escape carriage returns
-    .replace(/\t/g, '\\t');   // Escape tabs
-}
-
 class TaskListen extends Task {
  constructor(logger, opts, parentTask) {
    super(logger, opts);
@@ -27,21 +16,10 @@ class TaskListen extends Task {
    this.preconditions = TaskPreconditions.Endpoint;

    [
-      'action', 'auth', 'method', 'url', 'finishOnKey', 'maxLength', 'mixType', 'passDtmf', 'playBeep',
+      'action', 'auth', 'method', 'url', 'finishOnKey', 'maxLength', 'metadata', 'mixType', 'passDtmf', 'playBeep',
      'sampleRate', 'timeout', 'transcribe', 'wsAuth', 'disableBidirectionalAudio', 'channel'
    ].forEach((k) => this[k] = this.data[k]);

-    //Escape JSON special characters in metadata
-    if (this.data.metadata) {
-      this.metadata = {};
-      for (const key in this.data.metadata) {
-        if (this.data.metadata.hasOwnProperty(key)) {
-          const value = this.data.metadata[key];
-          this.metadata[key] = typeof value === 'string' ? escapeString(value) : value;
-        }
-      }
-    }
-
    this.mixType = this.mixType || 'mono';
    this.sampleRate = this.sampleRate || 8000;
    this.earlyMedia = this.data.earlyMedia === true;
@@ -152,17 +130,9 @@ class TaskListen extends Task {

  async _startListening(cs, ep) {
    this._initListeners(ep);
-    const tempci = this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON();
-    const ci = structuredClone(tempci);
+    const ci = this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON();
    if (this._ignoreCustomerData) {
      delete ci.customerData;
-    } else {
-      for (const key in ci.customerData) {
-        if (ci.customerData.hasOwnProperty(key)) {
-          const value = ci.customerData[key];
-          ci.customerData[key] = typeof value === 'string' ? escapeString(value) : value;
-        }
-      }
    }
    const metadata = Object.assign(
      {sampleRate: this.sampleRate, mixType: this.mixType},
--- a/lib/tasks/llm/llms/google_s2s.js
+++ b/lib/tasks/llm/llms/google_s2s.js
@@ -36,9 +36,6 @@ class TaskLlmGoogle_S2S extends Task {
    this.model = this.parent.model || 'models/gemini-2.0-flash-live-001';
    this.auth = this.parent.auth;
    this.connectionOptions = this.parent.connectOptions;
-    const {host, version} = this.connectionOptions || {};
-    this.host = host;
-    this.version = version;

    const {apiKey} = this.auth || {};
    if (!apiKey) throw new Error('auth.apiKey is required for Google S2S');
@@ -49,7 +46,7 @@ class TaskLlmGoogle_S2S extends Task {
    this.eventHook = this.data.eventHook;
    this.toolHook = this.data.toolHook;

-    const {setup, sessionResumption} = this.data.llmOptions;
+    const {setup} = this.data.llmOptions;

    if (typeof setup !== 'object') {
      throw new Error('llmOptions with an initial setup is required for Google S2S');
@@ -57,7 +54,6 @@ class TaskLlmGoogle_S2S extends Task {
    this.setup = {
      ...setup,
      model: this.model,
-      ...(sessionResumption && {sessionResumption}),
      // make sure output is always audio
      generationConfig: {
        ...(setup.generationConfig || {}),
@@ -142,10 +138,6 @@ class TaskLlmGoogle_S2S extends Task {

    try {
      const args = [ep.uuid, 'session.create', this.apiKey];
-      if (this.host) {
-        args.push(this.host);
-        if (this.version) args.push(this.version);
-      }
      await this._api(ep, args);
    } catch (err) {
      this.logger.error({err}, 'TaskLlmGoogle_S2S:_startListening');
--- a/lib/tasks/llm/llms/ultravox_s2s.js
+++ b/lib/tasks/llm/llms/ultravox_s2s.js
@@ -146,9 +146,8 @@ class TaskLlmUltravox_S2S extends Task {
    return data;
  }

-  _unregisterHandlers(ep) {
+  _unregisterHandlers() {
    this.removeCustomEventListeners();
-    ep.removeAllListeners('dtmf');
  }

  _registerHandlers(ep) {
@@ -156,7 +155,6 @@ class TaskLlmUltravox_S2S extends Task {
    this.addCustomEventListener(ep, LlmEvents_Ultravox.ConnectFailure, this._onConnectFailure.bind(this, ep));
    this.addCustomEventListener(ep, LlmEvents_Ultravox.Disconnect, this._onDisconnect.bind(this, ep));
    this.addCustomEventListener(ep, LlmEvents_Ultravox.ServerEvent, this._onServerEvent.bind(this, ep));
-    ep.on('dtmf', this._onDtmf.bind(this, ep));
  }

  async _startListening(cs, ep) {
@@ -191,7 +189,7 @@ class TaskLlmUltravox_S2S extends Task {
    /* note: the parent llm verb started the span, which is why this is necessary */
    await this.parent.performAction(this.results);

-    this._unregisterHandlers(ep);
+    this._unregisterHandlers();
  }

  async kill(cs) {
@@ -220,7 +218,7 @@ class TaskLlmUltravox_S2S extends Task {
  async _onServerEvent(_ep, evt) {
    let endConversation = false;
    const type = evt.type;
-    //this.logger.debug({evt}, 'TaskLlmUltravox_S2S:_onServerEvent');
+    this.logger.debug({evt}, 'TaskLlmUltravox_S2S:_onServerEvent');

    /* server errors of some sort */
    if (type === 'error') {
@@ -348,18 +346,6 @@ class TaskLlmUltravox_S2S extends Task {
      excludeEvents: this.excludeEvents
    }, 'TaskLlmUltravox_S2S:_populateEvents');
  }
-
-  _onDtmf(ep, evt) {
-    this.logger.info({evt}, 'TaskLlmUltravox_S2S:_onDtmf - DTMF received');
-    const {dtmf} = evt;
-    const data = {
-      type: 'user_text_message',
-      text: `DTMF received: ${dtmf}`,
-      urgency: 'immediate'
-    };
-    this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)])
-      .catch((err) => this.logger.info({err, evt}, 'TaskLlmUltravox_S2S:_onDtmf - Error sending DTMF as text message'));
-  }
 }

 module.exports = TaskLlmUltravox_S2S;
--- a/lib/tasks/play.js
+++ b/lib/tasks/play.js
@@ -6,21 +6,9 @@ class TaskPlay extends Task {
    super(logger, opts);
    this.preconditions = TaskPreconditions.Endpoint;

-    //Cleanup URLs that contain a querystring with a . unless that querystring is the filename
-    // see https://github.com/jambonz/jambonz-feature-server/pull/1293
-    // and https://github.com/jambonz/jambonz-feature-server/issues/1394 for background
-    if (this.data.url.includes('?')) {
-      if (['.mp3', '.wav'].includes(this.data.url.slice(-4))) {
-        this.url = this.data.url;
-      }
-      else {
-        this.url =  this.data.url.split('?')[0] + '?' + this.data.url.split('?')[1].replaceAll('.', '%2E');
-      }
-    }
-    else {
-      this.url = this.data.url;
-    }
-
+    this.url = this.data.url.includes('?')
+      ? this.data.url.split('?')[0] + '?' + this.data.url.split('?')[1].replaceAll('.', '%2E')
+      : this.data.url;
    this.seekOffset = this.data.seekOffset || -1;
    this.timeoutSecs = this.data.timeoutSecs || -1;
    this.loop = this.data.loop || 1;
--- a/lib/tasks/redirect.js
+++ b/lib/tasks/redirect.js
@@ -1,6 +1,7 @@
 const Task = require('./task');
 const {TaskName} = require('../utils/constants');
 const WsRequestor = require('../utils/ws-requestor');
+const URL = require('url');
 const HttpRequestor = require('../utils/http-requestor');

 /**
@@ -9,7 +10,6 @@ const HttpRequestor = require('../utils/http-requestor');
 class TaskRedirect extends Task {
  constructor(logger, opts) {
    super(logger, opts);
-    this.statusHook = opts.statusHook || false;
  }

  get name() { return TaskName.Redirect; }
@@ -33,7 +33,7 @@ class TaskRedirect extends Task {
      }
      else {
        const baseUrl =  this.cs.application.requestor.baseUrl;
-        const newUrl = new URL(this.actionHook);
+        const newUrl = URL.parse(this.actionHook);
        const newBaseUrl = newUrl.protocol + '//' + newUrl.host;
        if (baseUrl != newBaseUrl) {
          try {
@@ -47,30 +47,6 @@ class TaskRedirect extends Task {
        }
      }
    }
-
-    /* update the notifier if a new statusHook was provided */
-    if (this.statusHook) {
-      this.logger.info(`TaskRedirect updating statusHook to ${this.statusHook}`);
-      try {
-        const oldNotifier = cs.application.notifier;
-        const isStatusHookAbsolute = cs.notifier?._isAbsoluteUrl(this.statusHook);
-        if (isStatusHookAbsolute) {
-          if (cs.notifier instanceof WsRequestor) {
-            cs.application.notifier = new WsRequestor(this.logger, cs.accountSid, {url: this.statusHook},
-              cs.accountInfo.account.webhook_secret);
-          } else {
-            cs.application.notifier = new HttpRequestor(this.logger, cs.accountSid, {url: this.statusHook},
-              cs.accountInfo.account.webhook_secret);
-          }
-          if (oldNotifier?.close) oldNotifier.close();
-        }
-        /* update the call_status_hook URL that gets passed to the notifier */
-        cs.application.call_status_hook = this.statusHook;
-      } catch (err) {
-        this.logger.info(err, `TaskRedirect error updating statusHook to ${this.statusHook}`);
-      }
-    }
-
    await this.performAction();
  }
 }
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -19,7 +19,6 @@ class TaskRestDial extends Task {
    this.timeout = this.data.timeout || 60;
    this.sipRequestWithinDialogHook = this.data.sipRequestWithinDialogHook;
    this.referHook = this.data.referHook;
-    this.recentCallStatus = 0;

    this.on('connect', this._onConnect.bind(this));
    this.on('callStatus', this._onCallStatus.bind(this));
@@ -58,11 +57,7 @@ class TaskRestDial extends Task {
    this._clearCallTimer();
    if (this.canCancel) {
      this.canCancel = false;
-      try {
-        cs?.req?.cancel();
-      } catch (err) {
-        this.logger.error({err}, 'TaskRestDial: error cancelling call');
-      }
+      cs?.req?.cancel();
    }
    this.notifyTaskDone();
  }
@@ -123,8 +118,7 @@ class TaskRestDial extends Task {
  }

  _onCallStatus(status) {
-    this.logger.debug(`RestDial CallStatus: ${status}`);
-    this.recentCallStatus = status;
+    this.logger.debug(`CallStatus: ${status}`);
    if (status >= 200) {
      this.canCancel = false;
      this._clearCallTimer();
@@ -142,16 +136,11 @@ class TaskRestDial extends Task {
  }

  _onCallTimeout() {
-    this.logger.debug(`TaskRestDial: timeout expired without answer, last status ${this.recentCallStatus}`);
+    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
    this.timer = null;
-    if (this.canCancel && this.recentCallStatus < 200) {
-      this.logger.debug('TaskRestDial: cancelling call attempt');
+    if (this.canCancel) {
      this.canCancel = false;
-      try {
-        this.cs?.req?.cancel();
-      } catch (err) {
-        this.logger.error({err}, 'TaskRestDial: error cancelling call');
-      }
+      this.cs?.req?.cancel();
    }
  }

--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -1,38 +1,14 @@
 const assert = require('assert');
 const TtsTask = require('./tts-task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const {JAMBONES_SAY_CHUNK_SIZE} = require('../config');
 const pollySSMLSplit = require('polly-ssml-split');
-const { SpeechCredentialError, NonFatalTaskError } = require('../utils/error');
+const { SpeechCredentialError } = require('../utils/error');
 const { sleepFor } = require('../utils/helpers');
-const { NON_FANTAL_ERRORS } = require('../utils/constants.json');
-
-/**
- * Discard unmatching responses:
- * (1) I sent a playback id but get a response with a different playback id
- * (2) I sent a playback id but get a response with no playback id
- * (3) I did not send a playback id but get a response with a playback id
- * (4) I sent a cache file but get a response with a different cache file
- */
-
-const isMatchingEvent = (logger, filename, playbackId, evt) => {
-
-  if (!!playbackId && !!evt.variable_tts_playback_id && evt.variable_tts_playback_id === playbackId) {
-    //logger.debug({filename, playbackId, evt}, 'Say:isMatchingEvent - playbackId matched');
-    return true;
-  }
-  if (!!filename && !!evt.file && evt.file === filename) {
-    //logger.debug({filename, playbackId, evt}, 'Say:isMatchingEvent - filename matched');
-    return true;
-  }
-  logger.info({filename, playbackId, evt}, 'Say:isMatchingEvent - no match');
-  return false;
-};

 const breakLengthyTextIfNeeded = (logger, text) => {
  // As The text can be used for tts streaming, we need to break lengthy text into smaller chunks
 // HIGH_WATER_BUFFER_SIZE defined in tts-streaming-buffer.js
-  const chunkSize = JAMBONES_SAY_CHUNK_SIZE;
+  const chunkSize = 900;
  const isSSML = text.startsWith('<speak>');
  const options = {
    softLimit: 100,
@@ -122,11 +98,13 @@ class TaskSay extends TtsTask {
      }
      if (this.isStreamingTts) await this.handlingStreaming(cs, obj);
      else await this.handling(cs, obj);
+      this.emit('playDone');
    } catch (error) {
      if (error instanceof SpeechCredentialError) {
        // if say failed due to speech credentials, alarm is writtern and error notification is sent
        // finished this say to move to next task.
        this.logger.info({error}, 'Say failed due to SpeechCredentialError, finished!');
+        this.emit('playDone');
        return;
      }
      throw error;
@@ -147,6 +125,9 @@ class TaskSay extends TtsTask {

      await cs.startTtsStream();

+      cs.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_open'})
+        .catch((err) => this.logger.info({err}, 'TaskSay:handlingStreaming - Error sending'));
+
      if (this.text.length !== 0) {
        this.logger.info('TaskSay:handlingStreaming - sending text to TTS stream');
        for (const t of this.text) {
@@ -278,32 +259,40 @@ class TaskSay extends TtsTask {
    while (!this.killed && (this.loop === 'forever' || this.loop--) && ep?.connected) {
      let segment = 0;
      while (!this.killed && segment < filepath.length) {
-        const filename = filepath[segment];
        if (cs.isInConference) {
          const {memberId, confName, confUuid} = cs;
-          await this.playToConfMember(ep, memberId, confName, confUuid, filename);
+          await this.playToConfMember(ep, memberId, confName, confUuid, filepath[segment]);
        }
        else {
-          const isStreaming = filename.startsWith('say:{');
+          let playbackId;
+          const isStreaming = filepath[segment].startsWith('say:{');
          if (isStreaming) {
-            const arr = /^say:\{.*\}\s*(.*)$/.exec(filename);
-            if (arr) this.logger.debug(`Say:exec sending streaming tts request ${arr[1].substring(0, 64)}..`);
-            else this.logger.debug(`Say:exec sending ${filename.substring(0, 64)}`);
+            const arr = /^say:\{.*\}\s*(.*)$/.exec(filepath[segment]);
+            if (arr) this.logger.debug(`Say:exec sending streaming tts request: ${arr[1].substring(0, 64)}..`);
+          }
+          else {
+            this.logger.debug(`Say:exec sending ${filepath[segment].substring(0, 64)}`);
          }

          const onPlaybackStop = (evt) => {
            try {
-              const playbackId = this.getPlaybackId(segment);
-              const isMatch = isMatchingEvent(this.logger, filename, playbackId, evt);
-              if (!isMatch) {
-                this.logger.info({currentPlaybackId: playbackId, stopPlaybackId: evt.variable_tts_playback_id},
+              this.logger.debug({evt},
+                `Say got playback-stop ${evt.variable_tts_playback_id ? evt.variable_tts_playback_id : ''}`);
+
+              /**
+               * If we got a playback id on both the start and stop events, and they don't match,
+               * then we must have received a playback-stop event for an earlier play request.
+               */
+              const unmatchedResponse = (!!playbackId && !!evt.variable_tts_playback_id) &&
+                evt.variable_tts_playback_id !== playbackId;
+              if (unmatchedResponse) {
+                this.logger.info({currentPlaybackId: playbackId, stopPPlaybackId: evt.variable_tts_playback_id},
                  'Say:exec discarding playback-stop for earlier play');
                ep.once('playback-stop',  this._boundOnPlaybackStop);

                return;
              }
-              this.logger.debug({evt},
-                `Say got playback-stop ${evt.variable_tts_playback_id ? evt.variable_tts_playback_id : ''}`);
+
              this.notifyStatus({event: 'stop-playback'});
              this.notifiedPlayBackStop = true;
              const tts_error = evt.variable_tts_error;
@@ -342,7 +331,6 @@ class TaskSay extends TtsTask {
                !this.disableTtsCache
              ) {
                const text = parseTextFromSayString(this.text[segment]);
-                this.logger.debug({text, cacheFile: evt.variable_tts_cache_filename}, 'Say:exec cache tts');
                addFileToCache(evt.variable_tts_cache_filename, {
                  account_sid,
                  vendor,
@@ -370,17 +358,9 @@ class TaskSay extends TtsTask {
          };
          this._boundOnPlaybackStop = onPlaybackStop.bind(this);

-          const onPlaybackStart = (evt) => {
+          ep.once('playback-start', (evt) => {
            try {
-              const playbackId = this.getPlaybackId(segment);
-              const isMatch = isMatchingEvent(this.logger, filename, playbackId, evt);
-              if (!isMatch) {
-                this.logger.info({currentPlaybackId: playbackId, startPlaybackId: evt.variable_tts_playback_id},
-                  'Say:exec playback-start - unmatched playback_id');
-                ep.once('playback-start',  this._boundOnPlaybackStart);
-                return;
-              }
-              ep.once('playback-stop',  this._boundOnPlaybackStop);
+              playbackId = evt.variable_tts_playback_id;
              this.logger.debug({evt},
                `Say got playback-start ${evt.variable_tts_playback_id ? evt.variable_tts_playback_id : ''}`);
              if (this.otelSpan) {
@@ -394,29 +374,16 @@ class TaskSay extends TtsTask {
            } catch (err) {
              this.logger.info({err}, 'Error handling playback-start event');
            }
-          };
-          this._boundOnPlaybackStart = onPlaybackStart.bind(this);
-
-          ep.once('playback-start',  this._boundOnPlaybackStart);
+          });
+          ep.once('playback-stop',  this._boundOnPlaybackStop);

          // wait for playback-stop event received to confirm if the playback is successful
          this._playPromise = new Promise((resolve, reject) => {
            this._playResolve = resolve;
            this._playReject = reject;
          });
-          try {
-            const r = await ep.play(filename);
-            this.logger.debug({r}, 'Say:exec play result');
-            if (r.playbackSeconds == null && r.playbackMilliseconds == null && r.playbackLastOffsetPos == null) {
-              this._playReject(new Error('Playback failed to start'));
-            }
-          } catch (err) {
-            if (NON_FANTAL_ERRORS.includes(err.message)) {
-              throw new NonFatalTaskError(err.message);
-            }
-            throw err;
-          }
-
+          const r = await ep.play(filepath[segment]);
+          this.logger.debug({r}, 'Say:exec play result');
          try {
            // wait for playback-stop event received to confirm if the playback is successful
            await this._playPromise;
@@ -433,12 +400,12 @@ class TaskSay extends TtsTask {
            this._playResolve = null;
            this._playReject = null;
          }
-          if (filename.startsWith('say:{')) {
-            const arr = /^say:\{.*\}\s*(.*)$/.exec(filename);
+          if (filepath[segment].startsWith('say:{')) {
+            const arr = /^say:\{.*\}\s*(.*)$/.exec(filepath[segment]);
            if (arr) this.logger.debug(`Say:exec complete playing streaming tts request: ${arr[1].substring(0, 64)}..`);
          } else {
            // This log will print spech credentials in say command for tts stream mode
-            this.logger.debug(`Say:exec completed play file ${filename}`);
+            this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
          }
        }
        segment++;
@@ -454,8 +421,8 @@ class TaskSay extends TtsTask {
        const {memberId, confName} = cs;
        this.killPlayToConfMember(this.ep, memberId, confName);
      } else if (this.isStreamingTts) {
-        this.logger.debug('TaskSay:kill - stopping TTS stream for streaming audio');
-        cs.stopTtsStream();
+        this.logger.debug('TaskSay:kill - clearing TTS stream for streaming audio');
+        cs.clearTtsStream();
      } else {
        if (!this.notifiedPlayBackStop) {
          this.notifyStatus({event: 'stop-playback'});
--- a/lib/tasks/stt-task.js
+++ b/lib/tasks/stt-task.js
@@ -171,7 +171,7 @@ class SttTask extends Task {
      try {
        this.sttCredentials = await this._initSpeechCredentials(this.cs, this.vendor, this.label);
      } catch (error) {
-        if (this.canFallback()) {
+        if (this.canFallback) {
          this.notifyError(
            {
              msg: 'ASR error', details:`Invalid vendor ${this.vendor}, Error: ${error}`,
@@ -205,64 +205,13 @@ class SttTask extends Task {
    }
  }

-
-  async createGladiaLiveSession() {
-    const { api_key, region = 'us-west' } = this.sttCredentials;
-    const model = this.data.recognizer.model || 'solaria-1';
-    const options = this.data.recognizer.gladiaOptions || {};
-
-    const url = `https://api.gladia.io/v2/live?region=${region}`;
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'x-gladia-key': api_key,
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        encoding: 'wav/pcm',
-        bit_depth: 16,
-        sample_rate: 8000,
-        channels: 1,
-        model,
-        ...options,
-        messages_config: {
-          receive_final_transcripts: true,
-          receive_speech_events: true,
-          receive_errors: true,
-        }
-      })
-    });
-    if (!response.ok) {
-      const error = await response.text();
-      this.logger.error({url, status: response.status, error}, 'Error creating Gladia live session');
-      throw new Error(`Error creating Gladia live session: ${response.status} ${error}`);
-    }
-
-    const data = await response.json();
-    this.logger.debug({url: data.url}, 'Gladia Call registered');
-
-    const {host, pathname, search} = new URL(data.url);
-    return {host, path: `${pathname}${search}`};
-  }
-
  addCustomEventListener(ep, event, handler) {
    this.eventHandlers.push({ep, event, handler});
    ep.addCustomEventListener(event, handler);
  }

-  removeCustomEventListeners(ep) {
-    if (ep) {
-      // for specific endpoint
-      this.eventHandlers.filter((h) => h.ep === ep).forEach((h) => {
-        h.ep.removeCustomEventListener(h.event, h.handler);
-      });
-      this.eventHandlers = this.eventHandlers.filter((h) => h.ep !== ep);
-      return;
-    } else {
-      // for all endpoints
-      this.eventHandlers.forEach((h) => h.ep.removeCustomEventListener(h.event, h.handler));
-      this.eventHandlers = [];
-    }
+  removeCustomEventListeners() {
+    this.eventHandlers.forEach((h) => h.ep.removeCustomEventListener(h.event, h.handler));
  }

  async _initSpeechCredentials(cs, vendor, label) {
@@ -276,7 +225,6 @@ class SttTask extends Task {
        account_sid: cs.accountSid,
        alert_type: AlertType.STT_NOT_PROVISIONED,
        vendor,
-        label,
        target_sid: cs.callSid
      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
      // the ASR might have fallback configuration, should not done task here.
@@ -331,13 +279,11 @@ class SttTask extends Task {
    return credentials;
  }

-  canFallback() {
+  get canFallback() {
    return this.fallbackVendor && this.isHandledByPrimaryProvider && !this.cs.hasFallbackAsr;
  }

-  // ep is optional for gather or any verb that have single ep,
-  // but transcribe does need as it might has 2 eps
-  async _initFallback(ep) {
+  async _initFallback() {
    assert(this.fallbackVendor, 'fallback failed without fallbackVendor configuration');
    this.logger.info(`Failed to use primary STT provider, fallback to ${this.fallbackVendor}`);
    this.isHandledByPrimaryProvider = false;
@@ -350,7 +296,7 @@ class SttTask extends Task {
    this.data.recognizer.label = this.label;
    this.sttCredentials = await this._initSpeechCredentials(this.cs, this.vendor, this.label);
    // cleanup previous listener from previous vendor
-    this.removeCustomEventListeners(ep);
+    this.removeCustomEventListeners();
  }

  async compileHintsForCobalt(ep, hostport, model, token, hints) {
@@ -477,7 +423,6 @@ class SttTask extends Task {
      message: 'STT failure reported by vendor',
      detail: evt.error,
      vendor: this.vendor,
-      label: this.label,
      target_sid: cs.callSid
    }).catch((err) => this.logger.info({err}, `Error generating alert for ${this.vendor} connection failure`));
  }
@@ -491,7 +436,6 @@ class SttTask extends Task {
      alert_type: AlertType.STT_FAILURE,
      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
      vendor: this.vendor,
-      label: this.label,
      target_sid: cs.callSid
    }).catch((err) => this.logger.info({err}, `Error generating alert for ${this.vendor} connection failure`));
  }
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -6,8 +6,7 @@ const {
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
  DeepgramTranscriptionEvents,
-  GladiaTranscriptionEvents,
-  DeepgramfluxTranscriptionEvents,
+  DeepgramRiverTranscriptionEvents,
  SonioxTranscriptionEvents,
  CobaltTranscriptionEvents,
  IbmTranscriptionEvents,
@@ -15,7 +14,6 @@ const {
  JambonzTranscriptionEvents,
  TranscribeStatus,
  AssemblyAiTranscriptionEvents,
-  HoundifyTranscriptionEvents,
  VoxistTranscriptionEvents,
  CartesiaTranscriptionEvents,
  OpenAITranscriptionEvents,
@@ -70,9 +68,6 @@ class TaskTranscribe extends SttTask {
    this._bufferedTranscripts = [ [], [] ];  // for channel 1 and 2
    this.bugname_prefix = 'transcribe_';
    this.paused = false;
-    // fallback flags
-    this.isHandledByPrimaryProviderForEp1 = true;
-    this.isHandledByPrimaryProviderForEp2 = true;
  }

  get name() { return TaskName.Transcribe; }
@@ -242,35 +237,19 @@ class TaskTranscribe extends SttTask {
          this._onVendorConnect.bind(this, cs, ep));
        this.addCustomEventListener(ep, DeepgramTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, DeepgramTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-

        /* if app sets deepgramOptions.utteranceEndMs they essentially want continuous asr */
        //if (opts.DEEPGRAM_SPEECH_UTTERANCE_END_MS) this.isContinuousAsr = true;

        break;
-      case 'deepgramflux':
-        this.bugname = `${this.bugname_prefix}deepgramflux_transcribe`;
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.Transcription,
+      case 'deepgramriver':
+        this.bugname = `${this.bugname_prefix}deepgramriver_transcribe`;
+        this.addCustomEventListener(ep, DeepgramRiverTranscriptionEvents.Transcription,
          this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.Connect,
+        this.addCustomEventListener(ep, DeepgramRiverTranscriptionEvents.Connect,
          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.ConnectFailure,
+        this.addCustomEventListener(ep, DeepgramRiverTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, DeepgramfluxTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-
-        break;
-
-      case 'gladia':
-        this.bugname = `${this.bugname_prefix}gladia_transcribe`;
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, GladiaTranscriptionEvents.Error, this._onVendorError.bind(this, cs, ep));
-
        break;
      case 'soniox':
        this.bugname = `${this.bugname_prefix}soniox_transcribe`;
@@ -341,18 +320,6 @@ class TaskTranscribe extends SttTask {
          this._onVendorConnectFailure.bind(this, cs, ep, channel));
        break;

-      case 'houndify':
-        this.bugname = `${this.bugname_prefix}houndify_transcribe`;
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Error,
-          this._onVendorError.bind(this, cs, ep));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep, channel));
-        this.addCustomEventListener(ep, HoundifyTranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        break;
-
      case 'voxist':
        this.bugname = `${this.bugname_prefix}voxist_transcribe`;
        this.addCustomEventListener(ep, VoxistTranscriptionEvents.Transcription,
@@ -459,14 +426,6 @@ class TaskTranscribe extends SttTask {
      else if (this.data.recognizer?.hints?.length > 0) {
        prompt = this.data.recognizer?.hints.join(', ');
      }
-    } else if (this.vendor === 'gladia') {
-      // gladia require unique url for each session
-      const {host, path} = await this.createGladiaLiveSession();
-      await ep.set({
-        GLADIA_SPEECH_HOST: host,
-        GLADIA_SPEECH_PATH: path,
-      })
-        .catch((err) => this.logger.info(err, 'Error setting channel variables'));
    }

    await ep.startTranscription({
@@ -787,7 +746,7 @@ class TaskTranscribe extends SttTask {
  }

  async _startFallback(cs, _ep, evt) {
-    if (this.canFallback(_ep)) {
+    if (this.canFallback) {
      _ep.stopTranscription({
        vendor: this.vendor,
        bugname: this.bugname,
@@ -797,7 +756,7 @@ class TaskTranscribe extends SttTask {
      try {
        this.notifyError({ msg: 'ASR error',
          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'in progress'});
-        await this._initFallback(_ep);
+        await this._initFallback();
        let channel = 1;
        if (this.ep !== _ep) {
          channel = 2;
@@ -906,41 +865,6 @@ class TaskTranscribe extends SttTask {
    if (this._asrTimer) clearTimeout(this._asrTimer);
    this._asrTimer = null;
  }
-
-  // We need to keep track the fallback is happened for each endpoint
-  // override the canFallback and _initFallback methods to make sure that
-  // we only fallback once per endpoint
-  // we want to keep track this on task level instead of endpoint level
-  // because the endpoint instance is used across multiple tasks.
-  canFallback(ep) {
-    let isHandledByPrimaryProvider = this.isHandledByPrimaryProvider;
-    if (ep === this.ep) {
-      isHandledByPrimaryProvider = this.isHandledByPrimaryProviderForEp1;
-    } else if (ep === this.ep2) {
-      isHandledByPrimaryProvider = this.isHandledByPrimaryProviderForEp2;
-    }
-
-    const isOneOfEndpointAlreadyFallenBack = !!this.ep && !!this.ep2 &&
-      this.isHandledByPrimaryProviderForEp1 !== this.isHandledByPrimaryProviderForEp2;
-
-    // fallback is configured
-    return this.fallbackVendor &&
-      // has this endpoint already fallen back
-      isHandledByPrimaryProvider &&
-      // in global level, is there any fallback is already happened
-      // one fallen endpoint will mark cs.hasFallbackAsr to true,
-      // so if one endpoint was fallen, the other endpoint would be able to fallback.
-      (isOneOfEndpointAlreadyFallenBack || !this.cs.hasFallbackAsr);
-  }
-
-  _initFallback(ep) {
-    if (ep === this.ep) {
-      this.isHandledByPrimaryProviderForEp1 = false;
-    } else if (ep === this.ep2) {
-      this.isHandledByPrimaryProviderForEp2 = false;
-    }
-    return super._initFallback(ep);
-  }
 }

 module.exports = TaskTranscribe;
--- a/lib/tasks/tts-task.js
+++ b/lib/tasks/tts-task.js
@@ -3,16 +3,6 @@ const { TaskPreconditions } = require('../utils/constants');
 const { SpeechCredentialError } = require('../utils/error');
 const dbUtils = require('../utils/db-utils');

-const extractPlaybackId = (str) => {
-  // Match say:{...} and capture the content inside braces
-  const match = str.match(/say:\{([^}]*)\}/);
-  if (!match) return null;
-
-  // Look for playback_id=value within the captured content
-  const playbackMatch = match[1].match(/playback_id=([^,]*)/);
-  return playbackMatch ? playbackMatch[1] : null;
-};
-
 class TtsTask extends Task {

  constructor(logger, data, parentTask) {
@@ -31,21 +21,11 @@ class TtsTask extends Task {
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
    this.options = this.synthesizer.options || {};
-    this.instructions = this.data.instructions || this.options.instructions;
-    this.playbackIds = [];
-    this.useGeminiTts = this.options.useGeminiTts;
-  }
-
-  getPlaybackId(offset) {
-    return this.playbackIds[offset];
+    this.instructions = this.data.instructions;
  }

  async exec(cs) {
    super.exec(cs);
-    // update disableTtsCache from call session if not set in task
-    if (this.data.disableTtsCache == null) {
-      this.disableTtsCache = cs.disableTtsCache;
-    }
    if (cs.synthesizer) {
      this.options = {...cs.synthesizer.options, ...this.options};
      this.data.synthesizer = this.data.synthesizer || {};
@@ -86,67 +66,55 @@ class TtsTask extends Task {
  }

  async setTtsStreamingChannelVars(vendor, language, voice, credentials, ep) {
-    const {api_key, model_id, api_uri, custom_tts_streaming_url, auth_token, options} = credentials;
-    // api_key, model_id, api_uri, custom_tts_streaming_url, and auth_token are encoded in the credentials
-    // allow them to be overriden via config, using options
-    // give preference to options passed in via config
-    const parsed_options = options ? JSON.parse(options) : {};
-    const local_options = {...parsed_options, ...this.options};
-    const local_voice_settings = {...(parsed_options.voice_settings || {}), ...(this.options.voice_settings || {})};
-    const local_api_key =  local_options.api_key ?? api_key;
-    const local_model_id = local_options.model_id ?? model_id;
-    const local_api_uri = local_options.api_uri ?? api_uri;
-    const local_custom_tts_streaming_url = local_options.custom_tts_streaming_url ?? custom_tts_streaming_url;
-    const local_auth_token = local_options.auth_token ?? auth_token;
-
-
+    const {api_key, model_id, custom_tts_streaming_url, auth_token} = credentials;
    let obj;

+    this.logger.debug({credentials},
+      `setTtsStreamingChannelVars: vendor: ${vendor}, language: ${language}, voice: ${voice}`);
+
    switch (vendor) {
      case 'deepgram':
        obj = {
-          DEEPGRAM_API_KEY: local_api_key,
+          DEEPGRAM_API_KEY: api_key,
          DEEPGRAM_TTS_STREAMING_MODEL: voice
        };
        break;
      case 'cartesia':
        obj = {
-          CARTESIA_API_KEY: local_api_key,
-          CARTESIA_TTS_STREAMING_MODEL_ID: local_model_id,
+          CARTESIA_API_KEY: api_key,
+          CARTESIA_TTS_STREAMING_MODEL_ID: model_id,
          CARTESIA_TTS_STREAMING_VOICE_ID: voice,
          CARTESIA_TTS_STREAMING_LANGUAGE: language || 'en',
        };
        break;
      case 'elevenlabs':
-        // eslint-disable-next-line max-len
-        const {stability, similarity_boost, use_speaker_boost, style, speed} = local_voice_settings || {};
+        const {stability, similarity_boost, use_speaker_boost, style, speed} = this.options.voice_settings || {};
        obj = {
-          ELEVENLABS_API_KEY: local_api_key,
-          ...(api_uri && {ELEVENLABS_API_URI: local_api_uri}),
-          ELEVENLABS_TTS_STREAMING_MODEL_ID: local_model_id,
+          ELEVENLABS_API_KEY: api_key,
+          ELEVENLABS_TTS_STREAMING_MODEL_ID: model_id,
          ELEVENLABS_TTS_STREAMING_VOICE_ID: voice,
          // 20/12/2024 - only eleven_turbo_v2_5 support multiple language
-          ...(['eleven_turbo_v2_5'].includes(local_model_id) && {ELEVENLABS_TTS_STREAMING_LANGUAGE: language}),
+          ...(['eleven_turbo_v2_5'].includes(model_id) && {ELEVENLABS_TTS_STREAMING_LANGUAGE: language}),
          ...(stability && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_STABILITY: stability}),
          ...(similarity_boost && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_SIMILARITY_BOOST: similarity_boost}),
          ...(use_speaker_boost && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_USE_SPEAKER_BOOST: use_speaker_boost}),
          ...(style && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_STYLE: style}),
          // speed has value 0.7 to 1.2, 1.0 is default, make sure we send the value event it's 0
          ...(speed !== null && speed !== undefined && {ELEVENLABS_TTS_STREAMING_VOICE_SETTINGS_SPEED: `${speed}`}),
-          ...(local_options.pronunciation_dictionary_locators &&
-            Array.isArray(local_options.pronunciation_dictionary_locators) && {
+          ...(this.options.pronunciation_dictionary_locators &&
+            Array.isArray(this.options.pronunciation_dictionary_locators) && {
            ELEVENLABS_TTS_STREAMING_PRONUNCIATION_DICTIONARY_LOCATORS:
-            JSON.stringify(local_options.pronunciation_dictionary_locators)
+            JSON.stringify(this.options.pronunciation_dictionary_locators)
          }),
        };
        break;
      case 'rimelabs':
        const {
          pauseBetweenBrackets, phonemizeBetweenBrackets, inlineSpeedAlpha, speedAlpha, reduceLatency
-        } = local_options;
+        } = this.options;
        obj = {
-          RIMELABS_API_KEY: local_api_key,
-          RIMELABS_TTS_STREAMING_MODEL_ID: local_model_id,
+          RIMELABS_API_KEY: api_key,
+          RIMELABS_TTS_STREAMING_MODEL_ID: model_id,
          RIMELABS_TTS_STREAMING_VOICE_ID: voice,
          RIMELABS_TTS_STREAMING_LANGUAGE: language || 'en',
          ...(pauseBetweenBrackets && {RIMELABS_TTS_STREAMING_PAUSE_BETWEEN_BRACKETS: pauseBetweenBrackets}),
@@ -157,19 +125,12 @@ class TtsTask extends Task {
          ...(reduceLatency && {RIMELABS_TTS_STREAMING_REDUCE_LATENCY: reduceLatency})
        };
        break;
-      case 'google':
-        obj = {
-          GOOGLE_TTS_LANGUAGE_CODE: language,
-          GOOGLE_TTS_VOICE_NAME: voice,
-          GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(credentials.credentials)
-        };
-        break;
      default:
        if (vendor.startsWith('custom:')) {
          const use_tls = custom_tts_streaming_url.startsWith('wss://');
          obj = {
-            CUSTOM_TTS_STREAMING_HOST: local_custom_tts_streaming_url.replace(/^(ws|wss):\/\//, ''),
-            CUSTOM_TTS_STREAMING_API_KEY: local_auth_token,
+            CUSTOM_TTS_STREAMING_HOST: custom_tts_streaming_url.replace(/^(ws|wss):\/\//, ''),
+            CUSTOM_TTS_STREAMING_API_KEY: auth_token,
            CUSTOM_TTS_STREAMING_VOICE_ID: voice,
            CUSTOM_TTS_STREAMING_LANGUAGE: language || 'en',
            CUSTOM_TTS_STREAMING_USE_TLS: use_tls
@@ -250,8 +211,6 @@ class TtsTask extends Task {
      }
    } else if (vendor === 'cartesia') {
      credentials.model_id = this.options.model_id || credentials.model_id;
-    } else if (vendor === 'google') {
-      this.model = this.options.model || credentials.credentials.model_id;
    }

    this.model_id = credentials.model_id;
@@ -284,16 +243,15 @@ class TtsTask extends Task {
          account_sid,
          alert_type: AlertType.TTS_NOT_PROVISIONED,
          vendor,
-          label,
          target_sid: cs.callSid
        }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
        throw new SpeechCredentialError('no provisioned speech credentials for TTS');
      }

      /* produce an audio segment from the provided text */
-      const generateAudio = async(text, index) => {
-        if (this.killed) return {index, filePath: null};
-        if (text.startsWith('silence_stream://')) return {index, filePath: text};
+      const generateAudio = async(text) => {
+        if (this.killed) return;
+        if (text.startsWith('silence_stream://')) return text;

        /* otel: trace time for tts */
        if (!preCache && !this._disableTracing)  {
@@ -349,21 +307,13 @@ class TtsTask extends Task {
                'id': this.id
              });
            }
-            return {index, filePath, playbackId: null};
          }
          else {
-            const playbackId = extractPlaybackId(filePath);
            this.logger.debug('Say: a streaming tts api will be used');
            const modifiedPath = filePath.replace('say:{', `say:{session-uuid=${ep.uuid},`);
-            this.notifyStatus({
-              event: 'synthesized-audio',
-              vendor,
-              language,
-              servedFromCache,
-              'id': this.id
-            });
-            return {index, filePath: modifiedPath, playbackId};
+            return modifiedPath;
          }
+          return filePath;
        } catch (err) {
          this.logger.info({err}, 'Error synthesizing tts');
          if (this.otelSpan) this.otelSpan.end();
@@ -371,7 +321,6 @@ class TtsTask extends Task {
            account_sid: cs.accountSid,
            alert_type: AlertType.TTS_FAILURE,
            vendor,
-            label,
            detail: err.message,
            target_sid: cs.callSid
          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
@@ -379,20 +328,8 @@ class TtsTask extends Task {
        }
      };

-      // process all text segments in parallel will cause ordering issue
-      // so we attach index to each promise result and sort them later
-
-      const arr = this.text.map((t, index) => (this._validateURL(t) ?
-        Promise.resolve({index, filePath: t, playbackId: null}) : generateAudio(t, index)));
-      const results = await Promise.all(arr);
-      const sorted = results.sort((a, b) => a.index - b.index);
-
-      return sorted
-        .filter((fp) => fp.filePath && fp.filePath.length)
-        .map((r) => {
-          this.playbackIds.push(r.playbackId);
-          return r.filePath;
-        });
+      const arr = this.text.map((t) => (this._validateURL(t) ? t : generateAudio(t)));
+      return (await Promise.all(arr)).filter((fp) => fp && fp.length);
    } catch (err) {
      this.logger.info(err, 'TaskSay:exec error');
      throw err;
--- a/lib/utils/action-hook-delay.js
+++ b/lib/utils/action-hook-delay.js
@@ -118,13 +118,6 @@ class ActionHookDelayProcessor extends Emitter {
    this.logger.debug('ActionHookDelayProcessor#_onNoResponseTimer');
    this._noResponseTimer = null;

-    /* check if endpoint is still available (call may have ended) */
-    if (!this.ep) {
-      this.logger.debug('ActionHookDelayProcessor#_onNoResponseTimer: endpoint is null, call may have ended');
-      this._active = false;
-      return;
-    }
-
    /* get the next play or say action */
    const verb = this.actions[this._retryCount % this.actions.length];

@@ -136,8 +129,8 @@ class ActionHookDelayProcessor extends Emitter {
      this._taskInProgress.exec(this.cs, {ep: this.ep}).catch((err) => {
        this.logger.info(`ActionHookDelayProcessor#_onNoResponseTimer: error playing file: ${err.message}`);
        this._taskInProgress = null;
-        this.ep?.removeAllListeners('playback-start');
-        this.ep?.removeAllListeners('playback-stop');
+        this.ep.removeAllListeners('playback-start');
+        this.ep.removeAllListeners('playback-stop');
      });
    } catch (err) {
      this.logger.info(err, 'ActionHookDelayProcessor#_onNoResponseTimer: error starting action');
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -405,21 +405,19 @@ module.exports = (logger) => {
    if (ep.amd) {
      vendor = ep.amd.vendor;
      ep.amd.stopAllTimers();
-      try {
-        ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
-        ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
-        ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-        ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      } catch (error) {
-        logger.error('Unable to Remove AMD Listener', error);
-      }
+
+      ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
+      ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
+      ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+      ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
+
      ep.amd = null;
    }

--- a/lib/utils/background-task-manager.js
+++ b/lib/utils/background-task-manager.js
@@ -135,24 +135,26 @@ class BackgroundTaskManager extends Emitter {

  // Initiate Record
  async _initRecord() {
-    if (!JAMBONZ_RECORD_WS_BASE_URL || !this.cs.accountInfo.account.bucket_credential) {
-      this.logger.error('_initRecord: invalid cfg - missing JAMBONZ_RECORD_WS_BASE_URL or bucket config');
-      return undefined;
-    }
-    const listenOpts = {
-      url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.cs.accountInfo.account.bucket_credential.vendor}`,
-      disableBidirectionalAudio: true,
-      mixType : 'stereo',
-      passDtmf: true
-    };
-    if (JAMBONZ_RECORD_WS_USERNAME && JAMBONZ_RECORD_WS_PASSWORD) {
-      listenOpts.wsAuth = {
-        username: JAMBONZ_RECORD_WS_USERNAME,
-        password: JAMBONZ_RECORD_WS_PASSWORD
+    if (this.cs.accountInfo.account.record_all_calls || this.cs.application.record_all_calls) {
+      if (!JAMBONZ_RECORD_WS_BASE_URL || !this.cs.accountInfo.account.bucket_credential) {
+        this.logger.error('_initRecord: invalid cfg - missing JAMBONZ_RECORD_WS_BASE_URL or bucket config');
+        return undefined;
+      }
+      const listenOpts = {
+        url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.cs.accountInfo.account.bucket_credential.vendor}`,
+        disableBidirectionalAudio: true,
+        mixType : 'stereo',
+        passDtmf: true
      };
+      if (JAMBONZ_RECORD_WS_USERNAME && JAMBONZ_RECORD_WS_PASSWORD) {
+        listenOpts.wsAuth = {
+          username: JAMBONZ_RECORD_WS_USERNAME,
+          password: JAMBONZ_RECORD_WS_PASSWORD
+        };
+      }
+      this.logger.debug({listenOpts}, '_initRecord: enabling listen');
+      return await this._initListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record', true, 'record');
    }
-    this.logger.debug({listenOpts}, '_initRecord: enabling listen');
-    return await this._initListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record', true, 'record');
  }

  // Initiate Transcribe
--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -94,20 +94,12 @@
  "DeepgramTranscriptionEvents": {
    "Transcription": "deepgram_transcribe::transcription",
    "ConnectFailure": "deepgram_transcribe::connect_failed",
-    "Connect": "deepgram_transcribe::connect",
-    "Error": "deepgram_transcribe::error"
+    "Connect": "deepgram_transcribe::connect"
  },
-  "DeepgramfluxTranscriptionEvents": {
-    "Transcription": "deepgramflux_transcribe::transcription",
-    "ConnectFailure": "deepgramflux_transcribe::connect_failed",
-    "Connect": "deepgramflux_transcribe::connect",
-    "Error": "deepgramflux_transcribe::error"
-  },
-  "GladiaTranscriptionEvents": {
-    "Transcription": "gladia_transcribe::transcription",
-    "ConnectFailure": "gladia_transcribe::connect_failed",
-    "Connect": "gladia_transcribe::connect",
-    "Error": "gladia_transcribe::error"
+  "DeepgramRiverTranscriptionEvents": {
+    "Transcription": "deepgramriver_transcribe::transcription",
+    "ConnectFailure": "deepgramriver_transcribe::connect_failed",
+    "Connect": "deepgramriver_transcribe::connect"
  },
  "SonioxTranscriptionEvents": {
    "Transcription": "soniox_transcribe::transcription",
@@ -175,12 +167,6 @@
    "ConnectFailure": "assemblyai_transcribe::connect_failed",
    "Connect": "assemblyai_transcribe::connect"
  },
-  "HoundifyTranscriptionEvents": {
-    "Transcription": "houndify_transcribe::transcription",
-    "Error": "houndify_transcribe::error",
-    "ConnectFailure": "houndify_transcribe::connect_failed",
-    "Connect": "houndify_transcribe::connect"
-  },
  "VoxistTranscriptionEvents": {
    "Transcription": "voxist_transcribe::transcription",
    "Error": "voxist_transcribe::error",
@@ -311,11 +297,6 @@
    "ConnectFailure": "deepgram_tts_streaming::connect_failed",
    "Connect": "deepgram_tts_streaming::connect"
  },
-  "GoogleTtsStreamingEvents": {
-    "Empty": "google_tts_streaming::empty",
-    "ConnectFailure": "google_tts_streaming::connect_failed",
-    "Connect": "google_tts_streaming::connect"
-  },
  "CartesiaTtsStreamingEvents": {
    "Empty": "cartesia_tts_streaming::empty",
    "ConnectFailure": "cartesia_tts_streaming::connect_failed",
@@ -340,8 +321,7 @@
    "Empty": "tts_streaming::empty",
    "Pause": "tts_streaming::pause",
    "Resume": "tts_streaming::resume",
-    "ConnectFailure": "tts_streaming::connect_failed",
-    "Connected": "tts_streaming::connected"
+    "ConnectFailure": "tts_streaming::connect_failed"
  },
  "TtsStreamingConnectionStatus": {
    "NotConnected": "not_connected",
@@ -361,8 +341,5 @@
  "WS_CLOSE_CODES": {
    "NormalClosure": 1000,
    "GoingAway": 1001
-  },
-  "NON_FANTAL_ERRORS": [
-    "File Not Found"
-  ]
+  }
 }
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -81,12 +81,7 @@ const speechMapper = (cred) => {
      obj.deepgram_tts_uri = o.deepgram_tts_uri;
      obj.deepgram_stt_use_tls = o.deepgram_stt_use_tls;
    }
-    else if ('gladia' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.region = o.region;
-    }
-    else if ('deepgramflux' === obj.vendor) {
+    else if ('deepgramriver' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
    }
@@ -106,7 +101,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
-      obj.api_uri = o.api_uri;
      obj.options = o.options;
    }
    else if ('playht' === obj.vendor) {
@@ -147,13 +141,6 @@ const speechMapper = (cred) => {
      obj.api_key = o.api_key;
      obj.service_version = o.service_version;
    }
-    else if ('houndify' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.client_id = o.client_id;
-      obj.client_key = o.client_key;
-      obj.user_id = o.user_id;
-      obj.houndify_server_uri = o.houndify_server_uri;
-    }
    else if ('voxist' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
--- a/lib/utils/http-requestor.js
+++ b/lib/utils/http-requestor.js
@@ -191,7 +191,7 @@ class HttpRequestor extends BaseRequestor {
        method,
        headers: hdrs,
        ...('POST' === method && {body: JSON.stringify(payload)}),
-        headersTimeout: HTTP_TIMEOUT,
+        timeout: HTTP_TIMEOUT,
        followRedirects: false
      };

--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -173,8 +173,7 @@ function installSrfLocals(srf, logger, {
    lookupAccountCapacitiesBySid,
    lookupSmppGateways,
    lookupClientByAccountAndUsername,
-    lookupSystemInformation,
-    lookupLcrByAccount
+    lookupSystemInformation
  } = require('@jambonz/db-helpers')({
    host: JAMBONES_MYSQL_HOST,
    user: JAMBONES_MYSQL_USER,
@@ -280,8 +279,7 @@ function installSrfLocals(srf, logger, {
      retrieveByPatternSortedSet,
      sortedSetLength,
      sortedSetPositionByPattern,
-      getVerbioAccessToken,
-      lookupLcrByAccount
+      getVerbioAccessToken
    },
    parentLogger: logger,
    getSBC,
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -20,7 +20,7 @@ const { createMediaEndpoint } = require('./media-endpoint');

 class SingleDialer extends Emitter {
  constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask,
-    onHoldMusic, tmpFiles}) {
+    onHoldMusic}) {
    super();
    assert(target.type);

@@ -44,7 +44,6 @@ class SingleDialer extends Emitter {
    this.callSid = crypto.randomUUID();
    this.dialTask = dialTask;
    this.onHoldMusic = onHoldMusic;
-    this.tmpFiles = tmpFiles;

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
  }
@@ -329,13 +328,7 @@ class SingleDialer extends Emitter {
   */
  async kill(Reason) {
    this.killed = true;
-    if (this.inviteInProgress) {
-      try {
-        await this.inviteInProgress.cancel();
-      } catch (err) {
-        this.logger.error({err}, 'SingleDialer:kill error cancelling invite');
-      }
-    }
+    if (this.inviteInProgress) await this.inviteInProgress.cancel();
    else if (this.dlg && this.dlg.connected) {
      const duration = moment().diff(this.dlg.connectTime, 'seconds');
      this.logger.debug('SingleDialer:kill hanging up called party');
@@ -409,7 +402,7 @@ class SingleDialer extends Emitter {
        tasks,
        rootSpan: this.rootSpan,
        req: this.req,
-        tmpFiles: this.tmpFiles,
+        tmpFiles: cs.tmpFiles,
      });
      await cs.exec();

@@ -543,12 +536,12 @@ class SingleDialer extends Emitter {

 function placeOutdial({
  logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask,
-  onHoldMusic, tmpFiles
+  onHoldMusic
 }) {
  const myOpts = deepcopy(opts);
  const sd = new SingleDialer({
    logger, sbcAddress, target, opts: myOpts, application, callInfo,
-    accountInfo, rootSpan, startSpan, dialTask, onHoldMusic, tmpFiles
+    accountInfo, rootSpan, startSpan, dialTask, onHoldMusic
  });
  sd.exec(srf, ms, myOpts);
  return sd;
--- a/lib/utils/process-monitor.js
+++ b/lib/utils/process-monitor.js
@@ -1,91 +0,0 @@
-// lib/utils/process-monitor.js
-const fs = require('fs');
-const path = require('path');
-
-class ProcessMonitor {
-  constructor(logger) {
-    this.logger = logger;
-    this.packageInfo = this.getPackageInfo();
-    this.processName = this.packageInfo.name || 'unknown-app';
-  }
-
-  getPackageInfo() {
-    try {
-      const packagePath = path.join(process.cwd(), 'package.json');
-      return JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-    } catch (e) {
-      return { name: 'unknown', version: 'unknown' };
-    }
-  }
-
-  logStartup(additionalInfo = {}) {
-    const startupInfo = {
-      msg: `${this.processName} started`,
-      app_name: this.processName,
-      app_version: this.packageInfo.version,
-      pid: process.pid,
-      ppid: process.ppid,
-      pm2_instance_id: process.env.NODE_APP_INSTANCE || 'not_pm2',
-      pm2_id: process.env.pm_id,
-      is_pm2: !!process.env.PM2,
-      node_version: process.version,
-      uptime: process.uptime(),
-      timestamp: new Date().toISOString(),
-      ...additionalInfo
-    };
-
-    this.logger.info(startupInfo);
-    return startupInfo;
-  }
-
-  setupSignalHandlers() {
-    // Log when we receive signals that would cause restart
-    process.on('SIGINT', () => {
-      this.logger.info({
-        msg: 'SIGINT received',
-        app_name: this.processName,
-        pid: process.pid,
-        ppid: process.ppid,
-        uptime: process.uptime(),
-        timestamp: new Date().toISOString()
-      });
-      process.exit(0);
-    });
-
-    process.on('SIGTERM', () => {
-      this.logger.info({
-        msg: 'SIGTERM received',
-        app_name: this.processName,
-        pid: process.pid,
-        ppid: process.ppid,
-        uptime: process.uptime(),
-        timestamp: new Date().toISOString()
-      });
-      process.exit(0);
-    });
-
-    process.on('uncaughtException', (error) => {
-      this.logger.error({
-        msg: 'Uncaught exception - process will restart',
-        app_name: this.processName,
-        error: error.message,
-        stack: error.stack,
-        pid: process.pid,
-        timestamp: new Date().toISOString()
-      });
-      process.exit(1);
-    });
-
-    process.on('unhandledRejection', (reason, promise) => {
-      this.logger.error({
-        msg: 'Unhandled rejection',
-        app_name: this.processName,
-        reason,
-        pid: process.pid,
-        timestamp: new Date().toISOString()
-      });
-    });
-  }
-}
-
-module.exports = ProcessMonitor;
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -100,30 +100,6 @@ module.exports = (logger) => {
  else if (K8S) {
    lifecycleEmitter.scaleIn = () => process.exit(0);
  }
-  else {
-    process.on('SIGUSR1', () => {
-      logger.info('received SIGUSR1: begin drying up calls for scale-in');
-      dryUpCalls = true;
-
-      const {srf} = require('../..');
-      const {writeSystemAlerts} = srf.locals;
-      if (writeSystemAlerts) {
-        const {SystemState, FEATURE_SERVER} = require('./constants');
-        writeSystemAlerts({
-          system_component: FEATURE_SERVER,
-          state : SystemState.GracefulShutdownInProgress,
-          fields : {
-            detail: `feature-server with process_id ${process.pid} shutdown in progress`,
-            host: srf.locals?.ipv4
-          }
-        });
-      }
-      pingProxies(srf);
-
-      // Note: in response to SIGUSR1 we start drying up but do not exit when calls reach zero.
-      // This is to allow external scripts that sent the signal to manage the lifecycle.
-    });
-  }


  async function pingProxies(srf) {
--- a/lib/utils/sdp-utils.js
+++ b/lib/utils/sdp-utils.js
@@ -55,28 +55,11 @@ const extractSdpMedia = (sdp) => {
  }
 };

-const getLeadingCodec = (sdp) => {
-  if (!sdp) {
-    return null;
-  }
-
-  const parsed = sdpTransform.parse(sdp);
-  const audio = parsed.media?.find((m) => m.type === 'audio');
-
-  if (!audio) {
-    return null;
-  }
-
-  return audio.rtp?.[0]?.codec || null;
-};
-
-
 module.exports = {
  isOnhold,
  mergeSdpMedia,
  extractSdpMedia,
  isOpusFirst,
  makeOpusFirst,
-  removeVideoSdp,
-  getLeadingCodec
+  removeVideoSdp
 };
--- a/lib/utils/stt-latency-calculator.js
+++ b/lib/utils/stt-latency-calculator.js
@@ -127,6 +127,7 @@ class SttLatencyCalculator extends Emitter {

  calculateLatency() {
    if (!this.isRunning) {
+      this.logger.debug('Latency calculator is not running, cannot calculate latency, returning default values');
      return null;
    }

--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -131,43 +131,6 @@ const stickyVars = {
    'OPENAI_TURN_DETECTION_PREFIX_PADDING_MS',
    'OPENAI_TURN_DETECTION_SILENCE_DURATION_MS',
  ],
-  houndify: [
-    'HOUNDIFY_CLIENT_ID',
-    'HOUNDIFY_CLIENT_KEY',
-    'HOUNDIFY_USER_ID',
-    'HOUNDIFY_MAX_SILENCE_SECONDS',
-    'HOUNDIFY_MAX_SILENCE_AFTER_FULL_QUERY_SECONDS',
-    'HOUNDIFY_MAX_SILENCE_AFTER_PARTIAL_QUERY_SECONDS',
-    'HOUNDIFY_VAD_SENSITIVITY',
-    'HOUNDIFY_VAD_TIMEOUT',
-    'HOUNDIFY_VAD_MODE',
-    'HOUNDIFY_VAD_VOICE_MS',
-    'HOUNDIFY_VAD_SILENCE_MS',
-    'HOUNDIFY_VAD_DEBUG',
-    'HOUNDIFY_AUDIO_FORMAT',
-    'HOUNDIFY_ENABLE_NOISE_REDUCTION',
-    'HOUNDIFY_AUDIO_ENDPOINT',
-    'HOUNDIFY_ENABLE_PROFANITY_FILTER',
-    'HOUNDIFY_ENABLE_PUNCTUATION',
-    'HOUNDIFY_ENABLE_CAPITALIZATION',
-    'HOUNDIFY_CONFIDENCE_THRESHOLD',
-    'HOUNDIFY_ENABLE_DISFLUENCY_FILTER',
-    'HOUNDIFY_MAX_RESULTS',
-    'HOUNDIFY_ENABLE_WORD_TIMESTAMPS',
-    'HOUNDIFY_MAX_ALTERNATIVES',
-    'HOUNDIFY_PARTIAL_TRANSCRIPT_INTERVAL',
-    'HOUNDIFY_SESSION_TIMEOUT',
-    'HOUNDIFY_CONNECTION_TIMEOUT',
-    'HOUNDIFY_LATITUDE',
-    'HOUNDIFY_LONGITUDE',
-    'HOUNDIFY_CITY',
-    'HOUNDIFY_STATE',
-    'HOUNDIFY_COUNTRY',
-    'HOUNDIFY_TIMEZONE',
-    'HOUNDIFY_DOMAIN',
-    'HOUNDIFY_CUSTOM_VOCABULARY',
-    'HOUNDIFY_LANGUAGE_MODEL'
-  ],
 };

 /**
@@ -376,56 +339,20 @@ const normalizeDeepgram = (evt, channel, language, shortUtterance) => {
  };
 };

-const normalizeGladia = (evt, channel, language, shortUtterance) => {
+const normalizeDeepgramRiver = (evt, channel, language, shortUtterance) => {
  const copy = JSON.parse(JSON.stringify(evt));
-
-  // Handle Gladia transcript format
-  if (evt.type === 'transcript' && evt.data && evt.data.utterance) {
-    const utterance = evt.data.utterance;
-    const alternatives = [{
-      confidence: utterance.confidence || 0,
-      transcript: utterance.text || '',
-    }];
-
-    return {
-      language_code: utterance.language || language,
-      channel_tag: channel,
-      is_final: evt.data.is_final || false,
-      alternatives,
-      vendor: {
-        name: 'gladia',
-        evt: copy
-      }
-    };
-  }
-};
-
-const normalizeDeepgramFlux = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-
-  let turnTakingEvent;
-  if (['StartOfTurn', 'EagerEndOfTurn', 'TurnResumed', 'EndOfTurn'].includes(evt.event)) {
-    turnTakingEvent = evt.event;
-  }
-
-  /* calculate total confidence based on word-level confidence */
-  const realWords = (evt.words || [])
-    .filter((w) => ![',.!?;'].includes(w.word));
-  const confidence = realWords.length > 0 ? realWords.reduce((acc, w) => acc + w.confidence, 0) / realWords.length : 0;
  return {
    language_code: language,
    channel_tag: channel,
    is_final: evt.event === 'EndOfTurn',
    alternatives: [
      {
-        confidence,
-        end_of_turn_confidence: evt.end_of_turn_confidence,
+        confidence: evt.end_of_turn_confidence,
        transcript: evt.transcript,
-        ...(turnTakingEvent && {turn_taking_event: turnTakingEvent})
      }
    ],
    vendor: {
-      name: 'deepgramflux',
+      name: 'deepgramriver',
      evt: copy
    }
  };
@@ -643,30 +570,6 @@ const normalizeAssemblyAi = (evt, channel, language) => {
  };
 };

-const normalizeHoundify = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const alternatives = [];
-  const is_final = evt.ResultsAreFinal && evt.ResultsAreFinal[0] === true;
-  if (evt.Disambiguation && evt.Disambiguation.ChoiceData && evt.Disambiguation.ChoiceData.length > 0) {
-    // Handle Houndify Voice Search Result format
-    const choiceData = evt.Disambiguation.ChoiceData[0];
-    alternatives.push({
-      confidence: choiceData.ConfidenceScore || choiceData.ASRConfidence || 0.0,
-      transcript: choiceData.FormattedTranscription || choiceData.Transcription || '',
-    });
-  }
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final,
-    alternatives,
-    vendor: {
-      name: 'houndify',
-      evt: copy
-    }
-  };
-};
-
 const normalizeVoxist = (evt, channel, language) => {
  const copy = JSON.parse(JSON.stringify(evt));
  return {
@@ -766,10 +669,8 @@ module.exports = (logger) => {
    switch (vendor) {
      case 'deepgram':
        return normalizeDeepgram(evt, channel, language, shortUtterance);
-      case 'gladia':
-        return normalizeGladia(evt, channel, language, shortUtterance);
-      case 'deepgramflux':
-        return normalizeDeepgramFlux(evt, channel, language, shortUtterance);
+      case 'deepgramriver':
+        return normalizeDeepgramRiver(evt, channel, language, shortUtterance);
      case 'microsoft':
        return normalizeMicrosoft(evt, channel, language, punctuation);
      case 'google':
@@ -788,8 +689,6 @@ module.exports = (logger) => {
        return normalizeCobalt(evt, channel, language);
      case 'assemblyai':
        return normalizeAssemblyAi(evt, channel, language, shortUtterance);
-      case 'houndify':
-        return normalizeHoundify(evt, channel, language, shortUtterance);
      case 'voxist':
        return normalizeVoxist(evt, channel, language);
      case 'cartesia':
@@ -920,7 +819,7 @@ module.exports = (logger) => {
        ...(rOpts.initialSpeechTimeoutMs > 0 &&
          {AZURE_INITIAL_SPEECH_TIMEOUT_MS: rOpts.initialSpeechTimeoutMs}),
        ...(rOpts.requestSnr && {AZURE_REQUEST_SNR: 1}),
-        ...(azureOptions.audioLogging && {AZURE_AUDIO_LOGGING: 1}),
+        ...(rOpts.audioLogging && {AZURE_AUDIO_LOGGING: 1}),
        ...{AZURE_USE_OUTPUT_FORMAT_DETAILED: 1},
        ...(azureOptions.speechSegmentationSilenceTimeoutMs &&
          {AZURE_SPEECH_SEGMENTATION_SILENCE_TIMEOUT_MS: azureOptions.speechSegmentationSilenceTimeoutMs}),
@@ -1066,23 +965,19 @@ module.exports = (logger) => {
        ...(entityPrompt && {DEEPGRAM_SPEECH_ENTITY_PROMPT: entityPrompt}),
      };
    }
-    else if ('deepgramflux' === vendor) {
+    else if ('deepgramriver' === vendor) {
      const {
+        preflightThreshold,
        eotThreshold,
        eotTimeoutMs,
-        mipOptOut,
-        model,
-        eagerEotThreshold,
-        keyterms
+        mipOptOut
      } = rOpts.deepgramOptions || {};
      opts = {
-        DEEPGRAMFLUX_API_KEY: sttCredentials.api_key,
-        DEEPGRAMFLUX_SPEECH_MODEL: model || 'flux-general-en',
-        ...(eotThreshold && {DEEPGRAMFLUX_SPEECH_EOT_THRESHOLD: eotThreshold}),
-        ...(eotTimeoutMs && {DEEPGRAMFLUX_SPEECH_EOT_TIMEOUT_MS: eotTimeoutMs}),
-        ...(mipOptOut && {DEEPGRAMFLUX_SPEECH_MIP_OPT_OUT: mipOptOut}),
-        ...(eagerEotThreshold && {DEEPGRAMFLUX_SPEECH_EAGER_EOT_THRESHOLD: eagerEotThreshold}),
-        ...(keyterms && keyterms.length > 0 && {DEEPGRAMFLUX_SPEECH_KEYTERMS: keyterms.join(',')}),
+        DEEPGRAM_API_KEY: sttCredentials.api_key,
+        ...(preflightThreshold && {DEEPGRAM_SPEECH_PRELIGHT_THRESHOLD: preflightThreshold}),
+        ...(eotThreshold && {DEEPGRAM_SPEECH_EOT_THRESHOLD: eotThreshold}),
+        ...(eotTimeoutMs && {DEEPGRAM_SPEECH_EOT_TIMEOUT_MS: eotTimeoutMs}),
+        ...(mipOptOut && {DEEPGRAM_SPEECH_MIP_OPT_OUT: mipOptOut}),
      };
    }
    else if ('soniox' === vendor) {
@@ -1211,61 +1106,6 @@ module.exports = (logger) => {
          {ASSEMBLYAI_WORD_BOOST: JSON.stringify(rOpts.hints)})
      };
    }
-    else if ('houndify' === vendor) {
-      const {
-        latitude, longitude, city, state, country, timeZone, domain, audioEndpoint,
-        maxSilenceSeconds, maxSilenceAfterFullQuerySeconds, maxSilenceAfterPartialQuerySeconds,
-        vadSensitivity, vadTimeout, vadMode, vadVoiceMs, vadSilenceMs, vadDebug,
-        audioFormat, enableNoiseReduction, enableProfanityFilter, enablePunctuation,
-        enableCapitalization, confidenceThreshold, enableDisfluencyFilter,
-        maxResults, enableWordTimestamps, maxAlternatives, partialTranscriptInterval,
-        sessionTimeout, connectionTimeout, customVocabulary, languageModel,
-        requestInfo, sampleRate
-      } = rOpts.houndifyOptions || {};
-      const audioEndpointUri = audioEndpoint || sttCredentials.houndify_server_uri;
-
-      opts = {
-        ...opts,
-        HOUNDIFY_CLIENT_ID: sttCredentials.client_id,
-        HOUNDIFY_CLIENT_KEY: sttCredentials.client_key,
-        HOUNDIFY_USER_ID: sttCredentials.user_id,
-        HOUNDIFY_MAX_SILENCE_SECONDS: maxSilenceSeconds || 5,
-        HOUNDIFY_MAX_SILENCE_AFTER_FULL_QUERY_SECONDS: maxSilenceAfterFullQuerySeconds || 1,
-        HOUNDIFY_MAX_SILENCE_AFTER_PARTIAL_QUERY_SECONDS: maxSilenceAfterPartialQuerySeconds || 1.5,
-        ...(vadSensitivity && {HOUNDIFY_VAD_SENSITIVITY: vadSensitivity}),
-        ...(vadTimeout && {HOUNDIFY_VAD_TIMEOUT: vadTimeout}),
-        ...(vadMode && {HOUNDIFY_VAD_MODE: vadMode}),
-        ...(vadVoiceMs && {HOUNDIFY_VAD_VOICE_MS: vadVoiceMs}),
-        ...(vadSilenceMs && {HOUNDIFY_VAD_SILENCE_MS: vadSilenceMs}),
-        ...(vadDebug && {HOUNDIFY_VAD_DEBUG: vadDebug}),
-        ...(audioFormat && {HOUNDIFY_AUDIO_FORMAT: audioFormat}),
-        ...(enableNoiseReduction && {HOUNDIFY_ENABLE_NOISE_REDUCTION: enableNoiseReduction}),
-        ...(enableProfanityFilter && {HOUNDIFY_ENABLE_PROFANITY_FILTER: enableProfanityFilter}),
-        ...(enablePunctuation && {HOUNDIFY_ENABLE_PUNCTUATION: enablePunctuation}),
-        ...(enableCapitalization && {HOUNDIFY_ENABLE_CAPITALIZATION: enableCapitalization}),
-        ...(confidenceThreshold && {HOUNDIFY_CONFIDENCE_THRESHOLD: confidenceThreshold}),
-        ...(enableDisfluencyFilter && {HOUNDIFY_ENABLE_DISFLUENCY_FILTER: enableDisfluencyFilter}),
-        ...(maxResults && {HOUNDIFY_MAX_RESULTS: maxResults}),
-        ...(enableWordTimestamps && {HOUNDIFY_ENABLE_WORD_TIMESTAMPS: enableWordTimestamps}),
-        ...(maxAlternatives && {HOUNDIFY_MAX_ALTERNATIVES: maxAlternatives}),
-        ...(partialTranscriptInterval && {HOUNDIFY_PARTIAL_TRANSCRIPT_INTERVAL: partialTranscriptInterval}),
-        ...(sessionTimeout && {HOUNDIFY_SESSION_TIMEOUT: sessionTimeout}),
-        ...(connectionTimeout && {HOUNDIFY_CONNECTION_TIMEOUT: connectionTimeout}),
-        ...(latitude && {HOUNDIFY_LATITUDE: latitude}),
-        ...(longitude && {HOUNDIFY_LONGITUDE: longitude}),
-        ...(city && {HOUNDIFY_CITY: city}),
-        ...(state && {HOUNDIFY_STATE: state}),
-        ...(country && {HOUNDIFY_COUNTRY: country}),
-        ...(timeZone && {HOUNDIFY_TIMEZONE: timeZone}),
-        ...(domain && {HOUNDIFY_DOMAIN: domain}),
-        ...(audioEndpointUri && {HOUNDIFY_AUDIO_ENDPOINT: audioEndpointUri}),
-        ...(customVocabulary && {HOUNDIFY_CUSTOM_VOCABULARY:
-          Array.isArray(customVocabulary) ? customVocabulary.join(',') : customVocabulary}),
-        ...(languageModel && {HOUNDIFY_LANGUAGE_MODEL: languageModel}),
-        ...(requestInfo && {HOUNDIFY_REQUEST_INFO: JSON.stringify(requestInfo)}),
-        ...(sampleRate && {HOUNDIFY_SAMPLING_RATE: sampleRate}),
-      };
-    }
    else if ('voxist' === vendor) {
      opts = {
        ...opts,
@@ -1310,9 +1150,6 @@ module.exports = (logger) => {
          ...(openaiOptions.turn_detection.silence_duration_ms && {
            OPENAI_TURN_DETECTION_SILENCE_DURATION_MS: openaiOptions.turn_detection.silence_duration_ms
          }),
-          ...(openaiOptions.turn_detection.eagerness && {
-            OPENAI_TURN_DETECTION_EAGERNESS: openaiOptions.turn_detection.eagerness
-          })
        };
      }
    }
@@ -1378,9 +1215,7 @@ module.exports = (logger) => {
            speechmaticsOptions.transcription_config.audio_filtering_config.volume_threshold}),
        ...(speechmaticsOptions.transcription_config?.transcript_filtering_config?.remove_disfluencies &&
          {SPEECHMATICS_REMOVE_DISFLUENCIES:
-            speechmaticsOptions.transcription_config.transcript_filtering_config.remove_disfluencies}),
-        SPEECHMATICS_END_OF_UTTERANCE_SILENCE_TRIGGER:
-          speechmaticsOptions.transcription_config?.conversation_config?.end_of_utterance_silence_trigger || 0.5
+            speechmaticsOptions.transcription_config.transcript_filtering_config.remove_disfluencies})
      };
    }
    else if (vendor.startsWith('custom:')) {
--- a/lib/utils/tts-streaming-buffer.js
+++ b/lib/utils/tts-streaming-buffer.js
@@ -80,7 +80,7 @@ class TtsStreamingBuffer extends Emitter {
    clearTimeout(this.timer);
    this.removeCustomEventListeners();
    if (this.ep) {
-      this._api(this.ep, [this.ep.uuid, 'stop'])
+      this._api(this.ep, [this.ep.uuid, 'close'])
        .catch((err) =>
          this.logger.info({ err }, 'TtsStreamingBuffer:stop Error closing TTS streaming')
        );
@@ -163,6 +163,7 @@ class TtsStreamingBuffer extends Emitter {
  }

  clear() {
+    this.logger.debug('TtsStreamingBuffer:clear');
    if (this._connectionStatus !== TtsStreamingConnectionStatus.Connected) return;
    clearTimeout(this.timer);
    this._api(this.ep, [this.ep.uuid, 'clear']).catch((err) =>
@@ -192,7 +193,10 @@ class TtsStreamingBuffer extends Emitter {
        this.logger.debug('TtsStreamingBuffer:_feedQueue TTS stream is not open or no endpoint available');
        return;
      }
-      if (this._connectionStatus !== TtsStreamingConnectionStatus.Connected) {
+      if (
+        this._connectionStatus === TtsStreamingConnectionStatus.NotConnected ||
+        this._connectionStatus === TtsStreamingConnectionStatus.Failed
+      ) {
        this.logger.debug('TtsStreamingBuffer:_feedQueue TTS stream is not connected');
        return;
      }
@@ -274,14 +278,6 @@ class TtsStreamingBuffer extends Emitter {
      }
      const chunk = combinedText.slice(0, chunkEnd);

-      // Check if the chunk is only whitespace before processing the queue
-      // If so, wait for more meaningful text
-      if (isWhitespace(chunk)) {
-        this.logger.debug('TtsStreamingBuffer:_feedQueue chunk is only whitespace, waiting for more text');
-        this._setTimerIfNeeded();
-        return;
-      }
-
      // Now we iterate over the queue items
      // and deduct their lengths until we've accounted for chunkEnd characters.
      let remaining = chunkEnd;
@@ -305,14 +301,6 @@ class TtsStreamingBuffer extends Emitter {
      this.bufferedLength -= chunkEnd;

      const modifiedChunk = chunk.replace(/\n\n/g, '\n \n');
-
-      if (isWhitespace(modifiedChunk)) {
-        this.logger.debug('TtsStreamingBuffer:_feedQueue modified chunk is only whitespace, restoring queue');
-        this.queue.unshift({ type: 'text', value: chunk });
-        this.bufferedLength += chunkEnd;
-        this._setTimerIfNeeded();
-        return;
-      }
      this.logger.debug(`TtsStreamingBuffer:_feedQueue sending chunk to tts: ${modifiedChunk}`);

      try {
@@ -361,7 +349,6 @@ class TtsStreamingBuffer extends Emitter {
    if (this.queue.length > 0) {
      await this._feedQueue();
    }
-    this.emit(TtsStreamingEvents.Connected, { vendor });
  }

  _onConnectFailure(vendor) {
@@ -412,7 +399,6 @@ class TtsStreamingBuffer extends Emitter {

  removeCustomEventListeners() {
    this.eventHandlers.forEach((h) => h.ep.removeCustomEventListener(h.event, h.handler));
-    this.eventHandlers.length = 0;
  }

  _initHandlers(ep) {
@@ -421,7 +407,6 @@ class TtsStreamingBuffer extends Emitter {
      'cartesia',
      'elevenlabs',
      'rimelabs',
-      'google',
      'custom'
    ].forEach((vendor) => {
      const eventClassName = `${vendor.charAt(0).toUpperCase() + vendor.slice(1)}TtsStreamingEvents`;
@@ -437,15 +422,7 @@ class TtsStreamingBuffer extends Emitter {

 const findSentenceBoundary = (text, limit) => {
  // Look for punctuation or double newline that signals sentence end.
-  // Includes:
-  //   - ASCII: . ! ?
-  //   - Arabic: ؟ (question mark), ۔ (full stop)
-  //   - Japanese: 。 (full stop), ！, ？ (full-width exclamation/question)
-  //
-  // For languages that use spaces between sentences, we still require
-  // whitespace or end-of-string after the mark. For Japanese (no spaces),
-  // we treat the punctuation itself as a boundary regardless of following char.
-  const sentenceEndRegex = /[.!?؟۔](?=\s|$)|[。！？]|\n\n/g;
+  const sentenceEndRegex = /[.!?](?=\s|$)|\n\n/g;
  let lastSentenceBoundary = -1;
  let match;
  while ((match = sentenceEndRegex.exec(text)) && match.index < limit) {
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -293,7 +293,7 @@ class WsRequestor extends BaseRequestor {

      /* send the message */
      this.ws.send(JSON.stringify(obj), async() => {
-        if (obj.type !== 'llm:event') this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
+        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
        // If session:reconnect is waiting for ack, hold here until ack to send queuedMsgs
        if (this._reconnectPromise) {
          try {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -27,14 +27,14 @@
  "dependencies": {
    "@aws-sdk/client-auto-scaling": "^3.549.0",
    "@aws-sdk/client-sns": "^3.549.0",
-    "@jambonz/db-helpers": "^0.9.18",
+    "@jambonz/db-helpers": "^0.9.16",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "^0.2.7",
    "@jambonz/realtimedb-helpers": "^0.8.15",
-    "@jambonz/speech-utils": "^0.2.30",
+    "@jambonz/speech-utils": "^0.2.18",
    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.15",
-    "@jambonz/verb-specifications": "^0.0.125",
+    "@jambonz/time-series": "^0.2.14",
+    "@jambonz/verb-specifications": "^0.0.113",
    "@modelcontextprotocol/sdk": "^1.9.0",
    "@opentelemetry/api": "^1.8.0",
    "@opentelemetry/exporter-jaeger": "^1.23.0",
@@ -49,12 +49,12 @@
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
    "drachtio-fsmrf": "^4.1.2",
-    "drachtio-srf": "^5.0.18",
+    "drachtio-srf": "^5.0.5",
    "express": "^4.19.2",
    "express-validator": "^7.0.1",
    "moment": "^2.30.1",
    "parse-url": "^9.2.0",
-    "pino": "^10.1.0",
+    "pino": "^8.20.0",
    "polly-ssml-split": "^0.1.0",
    "sdp-transform": "^2.15.0",
    "short-uuid": "^5.1.0",
--- a/test/webhooks-tests.js
+++ b/test/webhooks-tests.js
@@ -83,8 +83,7 @@ test('invalid jambonz json create alert tests', async(t) => {
      {account_sid: 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f', page: 1, page_size: 25, days: 7});
    let checked = false;
    for (let i = 0; i < data.total; i++) {
-      checked = data.data[i].message === 'malformed jambonz payload: must be array';
-      if (checked) break;
+      checked = data.data[i].message === 'malformed jambonz payload: must be array'
    }
    t.ok(checked, 'alert is raised as expected');
    disconnect();