lint

fix crashing bug with uncaught exception in session.updateCall
rest:dial support timeLimit (#1024 )
2026-01-25 02:07:56 +00:00 · 2025-03-05 20:25:25 -05:00 · 2025-03-05 20:09:53 -05:00 · 2025-02-26 20:39:40 +07:00 · 2025-02-26 20:39:15 +07:00 · 2025-02-03 09:51:40 -05:00
48 changed files with 471 additions and 2659 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -42,5 +42,4 @@ ecosystem.config.js
 test/credentials/*.json
 run-tests.sh
 run-coverage.sh
-.vscode
-.env
+.vscode
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:20-alpine as base
+FROM --platform=linux/amd64 node:18.15-alpine3.16 as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

--- a/app.js
+++ b/app.js
@@ -25,22 +25,10 @@ const opts = {
 };
 const pino = require('pino');
 const logger = pino(opts, pino.destination({sync: false}));
-const {LifeCycleEvents, FS_UUID_SET_NAME, SystemState, FEATURE_SERVER} = require('./lib/utils/constants');
+const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
 const installSrfLocals = require('./lib/utils/install-srf-locals');
 installSrfLocals(srf, logger);

-const writeSystemAlerts = srf.locals?.writeSystemAlerts;
-if (writeSystemAlerts) {
-  writeSystemAlerts({
-    system_component: FEATURE_SERVER,
-    state : SystemState.Online,
-    fields : {
-      detail: `feature-server with process_id ${process.pid} started`,
-      host: srf.locals?.ipv4
-    }
-  });
-}
-
 const {
  initLocals,
  createRootSpan,
@@ -112,19 +100,12 @@ createHttpListener(logger, srf)
  });


-const monInterval = setInterval(async() => {
+setInterval(async() => {
  srf.locals.stats.gauge('fs.sip.calls.count', sessionTracker.count);
-  try {
-    const systemInformation = await srf.locals.dbHelpers.lookupSystemInformation();
-    if (systemInformation && systemInformation.log_level) {
-      logger.level = systemInformation.log_level;
-    }
-  } catch (err) {
-    if (process.env.NODE_ENV === 'test') {
-      clearInterval(monInterval);
-      logger.error('all tests complete');
-    }
-    else logger.error({err}, 'Error checking system log level in database');
+  // Checking system log level
+  const systemInformation = await srf.locals.dbHelpers.lookupSystemInformation();
+  if (systemInformation && systemInformation.log_level) {
+    logger.level = systemInformation.log_level;
  }
 }, 20000);

@@ -136,25 +117,13 @@ const disconnect = () => {
    srf.locals.mediaservers?.forEach((ms) => ms.disconnect());
  });
 };
-process.on('SIGTERM', handle);
-process.on('SIGINT', handle);

-async function handle(signal) {
+process.on('SIGTERM', handle);
+
+function handle(signal) {
  const {removeFromSet} = srf.locals.dbHelpers;
  srf.locals.disabled = true;
  logger.info(`got signal ${signal}`);
-  const writeSystemAlerts = srf.locals?.writeSystemAlerts;
-  if (writeSystemAlerts) {
-    // it has to be synchronous call, or else by the time system saves the app terminates
-    await writeSystemAlerts({
-      system_component: FEATURE_SERVER,
-      state : SystemState.Offline,
-      fields : {
-        detail: `feature-server with process_id ${process.pid} stopped, signal ${signal}`,
-        host: srf.locals?.ipv4
-      }
-    });
-  }
  const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
  const fsServiceUrlSetName = `${(JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
  if (setName && srf.locals.localSipAddress) {
--- a/lib/config.js
+++ b/lib/config.js
@@ -136,9 +136,6 @@ const JAMBONES_DISABLE_DIRECT_P2P_CALL = process.env.JAMBONES_DISABLE_DIRECT_P2P
 const JAMBONES_EAGERLY_PRE_CACHE_AUDIO = parseInt(process.env.JAMBONES_EAGERLY_PRE_CACHE_AUDIO, 10) || 0;

 const JAMBONES_USE_FREESWITCH_TIMER_FD = process.env.JAMBONES_USE_FREESWITCH_TIMER_FD;
-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;

 module.exports = {
  JAMBONES_MYSQL_HOST,
@@ -224,8 +221,5 @@ module.exports = {
  JAMBONZ_RECORD_WS_PASSWORD,
  JAMBONZ_DISABLE_DIAL_PAI_HEADER,
  JAMBONES_DISABLE_DIRECT_P2P_CALL,
-  JAMBONES_USE_FREESWITCH_TIMER_FD,
-  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER,
-  JAMBONES_MEDIA_TIMEOUT_MS,
-  JAMBONES_MEDIA_HOLD_TIMEOUT_MS
+  JAMBONES_USE_FREESWITCH_TIMER_FD
 };
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -14,8 +14,6 @@ const RootSpan = require('../../utils/call-tracer');
 const dbUtils = require('../../utils/db-utils');
 const { mergeSdpMedia, extractSdpMedia } = require('../../utils/sdp-utils');
 const { createCallSchema, customSanitizeFunction } = require('../schemas/create-call');
-const { selectHostPort } = require('../../utils/network');
-const { JAMBONES_DIAL_SBC_FOR_REGISTERED_USER } = require('../../config');

 const removeNullProperties = (obj) => (Object.keys(obj).forEach((key) => obj[key] === null && delete obj[key]), obj);
 const removeNulls = (req, res, next) => {
@@ -67,7 +65,7 @@ router.post('/',
        lookupAppBySid
      }  = srf.locals.dbHelpers;
      const {getSBC, getFreeswitch} = srf.locals;
-      let sbcAddress = getSBC();
+      const sbcAddress = getSBC();
      if (!sbcAddress) throw new Error('no available SBCs for outbound call creation');
      const target = restDial.to;
      const opts = {
@@ -142,16 +140,6 @@ 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 reg = await registrar.query(target.name);
-        if (reg) {
-          sbcAddress = selectHostPort(logger, reg.sbcAddress, 'tcp')[1];
-        }
-        //sbc outbound return 404 Notfound to handle case called user is not reigstered.
-      }
-
      /**
     * trunk isn't specified,
     * check if from-number matches any existing numbers on Jambonz
@@ -208,13 +196,10 @@ router.post('/',

      /**
     * create our application object -
-     * we merge the inbound call application,
-     * with the provided app params from the request body
+     * not from the database as per an inbound call,
+     * but from the provided params in the request
     */
-      const app = {
-        ...application,
-        ...req.body
-      };
+      const app = req.body;

      /**
     * attach our requestor and notifier objects
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -1,5 +1,5 @@
 const uuidv4 = require('uuid-random');
-const {CallDirection, AllowedSipRecVerbs, WS_CLOSE_CODES} = require('./utils/constants');
+const {CallDirection, AllowedSipRecVerbs} = require('./utils/constants');
 const {parseSiprecPayload} = require('./utils/siprec-utils');
 const CallInfo = require('./session/call-info');
 const HttpRequestor = require('./utils/http-requestor');
@@ -336,9 +336,7 @@ module.exports = function(srf, logger) {
        if (arr) {
          const google_custom_voice_sid = arr[1];
          const [custom_voice] = await lookupGoogleCustomVoice(google_custom_voice_sid);
-          //google voice cloning key has size 200kb, jambonz should not resolve the voice here that the app's calling
-          //webhook will receive big payload, tts-task should resolve the voice later.
-          if (!custom_voice.use_voice_cloning_key) {
+          if (custom_voice) {
            app2.speech_synthesis_voice = {
              reportedUsage: custom_voice.reported_usage,
              model: custom_voice.model
@@ -460,7 +458,7 @@ module.exports = function(srf, logger) {
      }).catch((err) => this.logger.info({err}, 'Error generating alert for parsing application'));
      logger.info({err}, `Error retrieving or parsing application: ${err?.message}`);
      res.send(480, {headers: {'X-Reason': err?.message || 'unknown'}});
-      app.requestor.close(WS_CLOSE_CODES.GoingAway);
+      app.requestor.close();
    }
  }

--- a/lib/session/adulting-call-session.js
+++ b/lib/session/adulting-call-session.js
@@ -45,10 +45,8 @@ class AdultingCallSession extends CallSession {
    return this.sd.ep;
  }

-  // When adulting session kicked from conference, replaceEndpoint is a must
-  set ep(newEp) {
-    this.sd.ep = newEp;
-  }
+  /* see note above */
+  set ep(newEp) {}

  get callSid() {
    return this.callInfo.callSid;
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -2,15 +2,13 @@ const Emitter = require('events');
 const fs = require('fs');
 const {
  CallDirection,
-  MediaPath,
  TaskPreconditions,
  CallStatus,
  TaskName,
  KillReason,
  RecordState,
  AllowedSipRecVerbs,
-  AllowedConfirmSessionVerbs,
-  TtsStreamingEvents
+  AllowedConfirmSessionVerbs
 } = require('../utils/constants');
 const moment = require('moment');
 const assert = require('assert');
@@ -22,22 +20,18 @@ const listTaskNames = require('../utils/summarize-tasks');
 const HttpRequestor = require('../utils/http-requestor');
 const WsRequestor = require('../utils/ws-requestor');
 const ActionHookDelayProcessor = require('../utils/action-hook-delay');
-const TtsStreamingBuffer = require('../utils/tts-streaming-buffer');
 const {parseUri} = require('drachtio-srf');
 const {
  JAMBONES_INJECT_CONTENT,
  JAMBONES_EAGERLY_PRE_CACHE_AUDIO,
  AWS_REGION,
-  JAMBONES_USE_FREESWITCH_TIMER_FD,
-  JAMBONES_MEDIA_TIMEOUT_MS,
-  JAMBONES_MEDIA_HOLD_TIMEOUT_MS
+  JAMBONES_USE_FREESWITCH_TIMER_FD
 } = require('../config');
 const bent = require('bent');
 const BackgroundTaskManager = require('../utils/background-task-manager');
-const dbUtils = require('../utils/db-utils');
 const BADPRECONDITIONS = 'preconditions not met';
 const CALLER_CANCELLED_ERR_MSG = 'Response not sent due to unknown transaction';
-const { NonFatalTaskError} = require('../utils/error');
+
 const sqlRetrieveQueueEventHook = `SELECT * FROM webhooks 
 WHERE webhook_sid = 
 (
@@ -404,41 +398,33 @@ class CallSession extends Emitter {
    return this.application.transferredCall === true;
  }

-  /**
-   * returns true if this session is an inbound call session
-   */
-  get isInboundCallSession() {
-    return this.constructor.name === 'InboundCallSession';
-  }
-
  /**
   * returns true if this session is a ConfirmCallSession
   */
  get isAdultingCallSession() {
    return this.constructor.name === 'AdultingCallSession';
  }
+
+  /**
+   * returns true if this session is a ConfirmCallSession
+   */
  get isConfirmCallSession() {
    return this.constructor.name === 'ConfirmCallSession';
  }
+
+  /**
+   * returns true if this session is a SipRecCallSession
+   */
  get isSipRecCallSession() {
    return this.constructor.name === 'SipRecCallSession';
  }
+
+  /**
+   * returns true if this session is a SmsCallSession
+   */
  get isSmsCallSession() {
    return this.constructor.name === 'SmsCallSession';
  }
-  get isRestCallSession() {
-    return this.constructor.name === 'RestCallSession';
-  }
-  get InboundCallSession() {
-    return this.constructor.name === 'InboundCallSession';
-  }
-  get isNormalCallSession() {
-    return this.constructor.name === 'InboundCallSession' || this.constructor.name === 'RestCallSession';
-  }
-
-  get is3pccInvite() {
-    return this.isInboundCallSession && this.req?.body?.length === 0;
-  }

  get webhook_secret() {
    return this.accountInfo?.account?.webhook_secret;
@@ -452,10 +438,6 @@ class CallSession extends Emitter {
    return this.backgroundTaskManager.isTaskRunning('bargeIn');
  }

-  get isTtsStreamEnabled() {
-    return this.backgroundTaskManager.isTaskRunning('ttsStream');
-  }
-
  get isListenEnabled() {
    return this.backgroundTaskManager.isTaskRunning('listen');
  }
@@ -518,10 +500,6 @@ class CallSession extends Emitter {
    this._sipRequestWithinDialogHook = url;
  }

-  get isTtsStreamOpen() {
-    return this.currentTask?.isStreamingTts ||
-      this.backgroundTaskManager.getTask('ttsStream')?.isStreamingTts;
-  }
  // Bot Delay (actionHook delayed)
  get actionHookDelayEnabled() {
    return this._actionHookDelayEnabled;
@@ -572,18 +550,7 @@ class CallSession extends Emitter {
        this._actionHookDelayProcessor = new ActionHookDelayProcessor(this.logger, opts, this, this.ep);
        this._actionHookDelayProcessor.on('giveup', () => {
          this.logger.info('CallSession: ActionHookDelayProcessor: giveup event - hanging up call');
-          const {writeAlerts} = this.srf.locals;
-          try {
-            writeAlerts({
-              alert_type: 'bot-action-delay-giveup',
-              account_sid: this.accountSid,
-              message: 'Call terminated due to bot action delay timeout',
-              target_sid: this.callSid
-            });
-          } catch (err) {
-            this.logger.error({err}, 'Error writing bot-action-delay-giveup alert');
-          }
-          this._jambonzHangup('bot-action-delay-giveup');
+          this._jambonzHangup();
          if (this.wakeupResolver) {
            this.logger.debug('CallSession: Giveup timer expired - waking up');
            this.wakeupResolver({reason: 'noResponseGiveUp'});
@@ -607,25 +574,6 @@ class CallSession extends Emitter {
    }
  }

-  getTsStreamingVendor() {
-    let v;
-    if (this.currentTask?.isStreamingTts) {
-      const {vendor} = this.currentTask.getTtsVendorData(this);
-      v = vendor;
-    }
-    else if (this.backgroundTaskManager.getTask('ttsStream')?.isStreamingTts) {
-      const {vendor} = this.backgroundTaskManager.getTask('ttsStream').getTtsVendorData(this);
-      v = vendor;
-    }
-    return v;
-  }
-
-  get appIsUsingWebsockets() {
-    return this.requestor instanceof WsRequestor;
-  }
-
-  /* end of getters and setters */
-
  async clearOrRestoreActionHookDelayProcessor() {
    if (this._actionHookDelayProcessor) {
      await this._actionHookDelayProcessor.stop();
@@ -843,38 +791,6 @@ class CallSession extends Emitter {
    }
  }

-  async enableBackgroundTtsStream(say) {
-    try {
-      if (this.isTtsStreamEnabled) {
-        this.logger.debug('CallSession:enableBackgroundTtsStream - ttsStream currently enabled, ignoring request');
-      } else if (this.appIsUsingWebsockets && this.isNormalCallSession) {
-        await this.backgroundTaskManager.newTask('ttsStream', say);
-        this.logger.debug('CallSession:enableBackgroundTtsStream - ttsStream enabled');
-      } else {
-        this.logger.debug(
-          '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');
-    }
-  }
-
-  disableTtsStream() {
-    if (this.isTtsStreamEnabled) {
-      this.backgroundTaskManager.stop('ttsStream');
-      this.logger.debug('CallSession:disableTtsStream - ttsStream disabled');
-    }
-  }
-  clearTtsStream() {
-    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();
-  }
-
  async enableBotMode(gather, autoEnable) {
    try {
      let task;
@@ -1063,14 +979,6 @@ class CallSession extends Emitter {
            options: credential.options
          };
        }
-        else if ('cartesia' === vendor) {
-          return {
-            api_key: credential.api_key,
-            model_id: credential.model_id,
-            embedding: credential.embedding,
-            options: credential.options
-          };
-        }
        else if ('rimelabs' === vendor) {
          return {
            api_key: credential.api_key,
@@ -1109,8 +1017,7 @@ class CallSession extends Emitter {
            speech_credential_sid: credential.speech_credential_sid,
            auth_token: credential.auth_token,
            custom_stt_url: credential.custom_stt_url,
-            custom_tts_url: credential.custom_tts_url,
-            custom_tts_streaming_url: credential.custom_tts_streaming_url
+            custom_tts_url: credential.custom_tts_url
          };
        }
      }
@@ -1133,27 +1040,6 @@ class CallSession extends Emitter {
  async exec() {
    this.logger.info({tasks: listTaskNames(this.tasks)}, `CallSession:exec starting ${this.tasks.length} tasks`);

-    // calculate if inbandDTMF tone is used
-    const voip_carrier_sid = this.req?.has('X-Voip-Carrier-Sid') ? this.req.get('X-Voip-Carrier-Sid') :
-      this.req?.has('X-Requested-Carrier-Sid') ? this.req.get('X-Requested-Carrier-Sid') : null;
-
-    if (voip_carrier_sid) {
-      const {lookupVoipCarrierBySid} = dbUtils(this.logger, this.srf);
-      const [voipCarrier] = await lookupVoipCarrierBySid(voip_carrier_sid);
-      this.inbandDtmfEnabled = voipCarrier?.dtmf_type === 'tones';
-    }
-
-    if (this.isNormalCallSession) {
-      this.ttsStreamingBuffer = new TtsStreamingBuffer(this);
-      this.ttsStreamingBuffer.on(TtsStreamingEvents.Empty, this._onTtsStreamingEmpty.bind(this));
-      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));
-    }
-    else {
-      this.logger.info(`CallSession:exec - not a normal call session: ${this.constructor.name}`);
-    }
-
    while (this.tasks.length && !this.callGone) {
      const taskNum = ++this.taskIdx;
      const stackNum = this.stackIdx;
@@ -1194,8 +1080,6 @@ class CallSession extends Emitter {
        this.currentTask = null;
        if (err.message?.includes(BADPRECONDITIONS)) {
          this.logger.info(`CallSession:exec task #${stackNum}:${taskNum}: ${task.name}: ${err.message}`);
-        } else if (err instanceof NonFatalTaskError) {
-          this.logger.error(err, `Error executing task  #${stackNum}:${taskNum}: ${task.name}`);
        }
        else {
          this.logger.error(err, `Error executing task  #${stackNum}:${taskNum}: ${task.name}`);
@@ -1468,7 +1352,7 @@ class CallSession extends Emitter {
    if (!listenTask) {
      return this.logger.info('CallSession:_lccListenStatus - invalid listen_status: Dial does not have a listen');
    }
-    listenTask.updateListen(opts.listen_status || opts.stream_status);
+    listenTask.updateListen(opts.listen_status);
  }

  /**
@@ -1610,7 +1494,7 @@ Duration=${duration} `
    // this whole thing requires us to be in a Dial verb
    const task = this.currentTask;
    if (!task || ![TaskName.Dial, TaskName.Listen].includes(task.name)) {
-      return this.logger.info('CallSession:_lccWhisper - invalid command since we are not in a dial or stream/listen');
+      return this.logger.info('CallSession:_lccWhisper - invalid command since we are not in a dial or listen');
    }

    // allow user to provide a url object, a url string, an array of tasks, or a single task
@@ -1710,15 +1594,6 @@ Duration=${duration} `
    this.logger.info({response}, '_lccBoostAudioSignal: response from freeswitch');
  }

-  async _lccMediaPath(desiredPath) {
-    const task = this.currentTask;
-    if (!task || task.name !== TaskName.Dial) {
-      return this.logger.info('CallSession:_lccMediaPath - invalid command since we are not in a dial verb');
-    }
-    task.updateMediaPath(desiredPath)
-      .catch((err) => this.logger.error(err, 'CallSession:_lccMediaPath'));
-  }
-
  _lccToolOutput(tool_call_id, opts, callSid) {
    // only valid if we are in an LLM verb
    const task = this.currentTask;
@@ -1742,39 +1617,6 @@ Duration=${duration} `
      .catch((err) => this.logger.error(err, 'CallSession:_lccLlmUpdate'));
  }

-  async _lccTtsTokens(opts) {
-    const {id, tokens} = opts;
-
-    if (id === undefined) {
-      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since id is missing');
-      return;
-    }
-    else if (tokens === undefined) {
-      this.logger.info({opts}, 'CallSession:_lccTtsTokens - invalid command since id is missing');
-      return this.requestor.request('tts:tokens-result', '/tokens-result', {
-        id,
-        status: 'failed',
-        reason: 'missing tokens'
-      }).catch((err) => this.logger.debug({err}, 'CallSession:_notifyTaskStatus - Error sending'));
-    }
-    let res;
-    try {
-      res = await this.ttsStreamingBuffer?.bufferTokens(tokens);
-      this.logger.info({id, res}, 'CallSession:_lccTtsTokens - tts:tokens-result');
-    } catch (err) {
-      this.logger.info(err, 'CallSession:_lccTtsTokens');
-    }
-    this.requestor.request('tts:tokens-result', '/tokens-result', {id, ...res})
-      .catch((err) => this.logger.debug({err}, 'CallSession:_notifyTaskStatus - Error sending'));
-  }
-
-  _lccTtsFlush(opts) {
-    this.ttsStreamingBuffer?.flush(opts);
-  }
-
-  _lccTtsClear(opts) {
-    this.ttsStreamingBuffer?.clear(opts);
-  }

  /**
   * perform call hangup by jambonz
@@ -1793,62 +1635,63 @@ Duration=${duration} `
  async updateCall(opts, callSid) {
    this.logger.debug(opts, 'CallSession:updateCall');

-    if (opts.call_status) {
-      return this._lccCallStatus(opts);
-    }
-    if (opts.call_hook || opts.child_call_hook) {
-      return await this._lccCallHook(opts);
-    }
-    if (opts.listen_status || opts.stream_status) {
-      await this._lccListenStatus(opts);
-    }
-    if (opts.transcribe_status) {
-      await this._lccTranscribeStatus(opts);
-    }
-    else if (opts.mute_status) {
-      await this._lccMuteStatus(opts.mute_status === 'mute', callSid);
-    }
-    else if (opts.conf_hold_status) {
-      await this._lccConfHoldStatus(opts);
-    }
-    else if (opts.conf_mute_status) {
-      await this._lccConfMuteStatus(opts);
-    }
-    else if (opts.sip_request) {
-      const res = await this._lccSipRequest(opts, callSid);
-      return {status: res.status, reason: res.reason};
-    } else if (opts.dtmf) {
-      await this._lccDtmf(opts, callSid);
-    }
-    else if (opts.record) {
-      await this.notifyRecordOptions(opts.record);
-    }
-    else if (opts.tag) {
-      return this._lccTag(opts);
-    }
-    else if (opts.conferenceParticipantAction) {
-      return this._lccConferenceParticipantAction(opts.conferenceParticipantAction);
-    }
-    else if (opts.dub) {
-      return this._lccDub(opts.dub, callSid);
-    }
-    else if (opts.boostAudioSignal) {
-      return this._lccBoostAudioSignal(opts, callSid);
-    }
-    else if (opts.media_path) {
-      return this._lccMediaPath(opts.media_path, callSid);
-    }
-    else if (opts.llm_tool_output) {
-      return this._lccToolOutput(opts.tool_call_id, opts.llm_tool_output, callSid);
-    }
-    else if (opts.llm_update) {
-      return this._lccLlmUpdate(opts.llm_update, callSid);
-    }
+    try {
+      if (opts.call_status) {
+        return this._lccCallStatus(opts);
+      }
+      if (opts.call_hook || opts.child_call_hook) {
+        return await this._lccCallHook(opts);
+      }
+      if (opts.listen_status) {
+        await this._lccListenStatus(opts);
+      }
+      if (opts.transcribe_status) {
+        await this._lccTranscribeStatus(opts);
+      }
+      else if (opts.mute_status) {
+        await this._lccMuteStatus(opts.mute_status === 'mute', callSid);
+      }
+      else if (opts.conf_hold_status) {
+        await this._lccConfHoldStatus(opts);
+      }
+      else if (opts.conf_mute_status) {
+        await this._lccConfMuteStatus(opts);
+      }
+      else if (opts.sip_request) {
+        const res = await this._lccSipRequest(opts, callSid);
+        return {status: res.status, reason: res.reason};
+      } else if (opts.dtmf) {
+        await this._lccDtmf(opts, callSid);
+      }
+      else if (opts.record) {
+        await this.notifyRecordOptions(opts.record);
+      }
+      else if (opts.tag) {
+        return this._lccTag(opts);
+      }
+      else if (opts.conferenceParticipantAction) {
+        return this._lccConferenceParticipantAction(opts.conferenceParticipantAction);
+      }
+      else if (opts.dub) {
+        return this._lccDub(opts);
+      }
+      else if (opts.boostAudioSignal) {
+        return this._lccBoostAudioSignal(opts, callSid);
+      }
+      else if (opts.llm_tool_output) {
+        return this._lccToolOutput(opts.tool_call_id, opts.llm_tool_output, callSid);
+      }
+      else if (opts.llm_update) {
+        return this._lccLlmUpdate(opts.llm_update, callSid);
+      }

-    // whisper may be the only thing we are asked to do, or it may that
-    // we are doing a whisper after having muted, paused recording etc..
-    if (opts.whisper) {
-      return this._lccWhisper(opts, callSid);
+      // whisper may be the only thing we are asked to do, or it may that
+      // we are doing a whisper after having muted, paused recording etc..
+      if (opts.whisper) {
+        return this._lccWhisper(opts, callSid);
+      }
+    } catch (err) {
+      this.logger.info({err, opts, callSid}, 'CallSession:updateCall - error updating call');
    }
  }

@@ -2109,7 +1952,6 @@ Duration=${duration} `
        break;

      case 'listen:status':
-      case 'stream:status':
        this._lccListenStatus(data);
        break;

@@ -2142,13 +1984,6 @@ Duration=${duration} `
          });
        break;

-      case 'media:path':
-        this._lccMediaPath(data, call_sid)
-          .catch((err) => {
-            this.logger.info({err, data}, 'CallSession:_onCommand - error setting media path');
-          });
-        break;
-
      case 'llm:tool-output':
        this._lccToolOutput(tool_call_id, data, call_sid);
        break;
@@ -2157,18 +1992,6 @@ Duration=${duration} `
        this._lccLlmUpdate(data, call_sid);
        break;

-      case 'tts:tokens':
-        this._lccTtsTokens(data);
-        break;
-
-      case 'tts:flush':
-        this._lccTtsFlush(data);
-        break;
-
-      case 'tts:clear':
-        this._lccTtsClear(data);
-        break;
-
      default:
        this.logger.info(`CallSession:_onCommand - invalid command ${command}`);
    }
@@ -2226,8 +2049,6 @@ Duration=${duration} `
        };
      }

-      this._enableInbandDtmfIfRequired(this.ep);
-
      // we are going from an early media connection to answer
      if (this.direction === CallDirection.Inbound) {
        // only do this for inbound call.
@@ -2251,6 +2072,7 @@ Duration=${duration} `
      //ep.cs = this;
      this.ep = ep;
      this.logger.info(`allocated endpoint ${ep.uuid}`);
+
      this._configMsEndpoint();

      this.ep.on('destroy', () => {
@@ -2363,8 +2185,6 @@ Duration=${duration} `
    // close all background tasks
    this.backgroundTaskManager.stopAll();
    this.clearOrRestoreActionHookDelayProcessor().catch((err) => {});
-
-    this.ttsStreamingBuffer?.stop();
  }

  /**
@@ -2414,43 +2234,22 @@ Duration=${duration} `
        },
        localSdp: this.ep.local.sdp
      });
+      this.logger.debug('answered call');
+      this.dlg.on('destroy', this._callerHungup.bind(this));
+      this.wrapDialog(this.dlg);
+      this.dlg.callSid = this.callSid;
+      this.emit('callStatusChange', {sipStatus: 200, sipReason: 'OK', callStatus: CallStatus.InProgress});

-      const tidyUp = () => {
-        this.dlg.on('destroy', this._callerHungup.bind(this));
-        this.wrapDialog(this.dlg);
-        this.dlg.callSid = this.callSid;
-        this.emit('callStatusChange', {sipStatus: 200, sipReason: 'OK', callStatus: CallStatus.InProgress});
-
-        if (this.recordOptions && this.recordState === RecordState.RecordingOff) {
-          this.startRecording();
-        }
-        this.dlg.on('modify', this._onReinvite.bind(this));
-        this.dlg.on('refer', this._onRefer.bind(this));
-        if (this.sipRequestWithinDialogHook) {
-          this.dlg.on('info', this._onRequestWithinDialog.bind(this));
-          this.dlg.on('message', this._onRequestWithinDialog.bind(this));
-        }
-        this.logger.debug(`CallSession:propagateAnswer - answered callSid ${this.callSid}`);
-      };
-
-      if (this.is3pccInvite) {
-        return new Promise((resolve, reject) => {
-          this.dlg.once('ack', (ackRequest) => {
-            this.logger.debug({body: ackRequest.body}, 'received ACK for 3pcc invite');
-            this.ep.modify(ackRequest.body)
-              .then(() => {
-                tidyUp();
-                return resolve();
-              })
-              .catch((err) => {
-                this.logger.info({err}, 'Error modifying endpoint with ACK');
-                reject(err);
-              });
-          });
-          this.logger.debug('this is a 3pcc invite');
-        });
+      if (this.recordOptions && this.recordState === RecordState.RecordingOff) {
+        this.startRecording();
      }
-      tidyUp();
+      this.dlg.on('modify', this._onReinvite.bind(this));
+      this.dlg.on('refer', this._onRefer.bind(this));
+      if (this.sipRequestWithinDialogHook) {
+        this.dlg.on('info', this._onRequestWithinDialog.bind(this));
+        this.dlg.on('message', this._onRequestWithinDialog.bind(this));
+      }
+      this.logger.debug(`CallSession:propagateAnswer - answered callSid ${this.callSid}`);
    }
    else {
      this.logger.debug('CallSession:propagateAnswer - call already answered - re-anchor media with a reinvite');
@@ -2528,12 +2327,6 @@ Duration=${duration} `
      try {
        const to = parseUri(req.getParsedHeader('Refer-To').uri);
        const by = parseUri(req.getParsedHeader('Referred-By').uri);
-        const customHeaders = Object.keys(req.headers)
-          .filter((h) => h.toLowerCase().startsWith('x-'))
-          .reduce((acc, h) => {
-            acc[h] = req.get(h);
-            return acc;
-          }, {});
        const b3 = this.b3;
        const httpHeaders = b3 && {b3};
        const json = await this.requestor.request('verb:hook', this._referHook, {
@@ -2546,7 +2339,6 @@ Duration=${duration} `
            referred_by_user: by.scheme === 'tel' ? by.number : by.user,
            referring_call_sid: this.callSid,
            referred_call_sid: null,
-            ...customHeaders
          }
        }, httpHeaders);

@@ -2722,35 +2514,27 @@ Duration=${duration} `
    };
  }

-  async releaseMediaToSBC(remoteSdp, releaseMediaEntirely) {
+  async releaseMediaToSBC(remoteSdp) {
    assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
    await this.dlg.modify(remoteSdp, {
      headers: {
-        'X-Reason': releaseMediaEntirely ? 'release-media-entirely' : 'release-media'
+        'X-Reason': 'release-media'
      }
    });
-    try {
-      await this.ep.destroy();
-    } catch (err) {
-      this.logger.error({err}, 'CallSession:releaseMediaToSBC: Error destroying endpoint');
-    }
-    this.ep = null;
+    this.ep.destroy()
+      .then(() => this.ep = null)
+      .catch((err) => this.logger.error({err}, 'CallSession:releaseMediaToSBC: Error destroying endpoint'));
  }

-  async reAnchorMedia(currentMediaRoute = MediaPath.PartialMedia) {
+  async reAnchorMedia() {
    assert(this.dlg && this.dlg.connected && !this.ep);
-
    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
-    this._configMsEndpoint();
    await this.dlg.modify(this.ep.local.sdp, {
      headers: {
        'X-Reason': 'anchor-media'
      }
    });
-
-    if (currentMediaRoute === MediaPath.NoMedia) {
-      await this.ep.modify(this.dlg.remote.sdp);
-    }
+    this._configMsEndpoint();
  }

  async handleReinviteAfterMediaReleased(req, res) {
@@ -2817,40 +2601,15 @@ Duration=${duration} `
  }

  _configMsEndpoint() {
-    this._enableInbandDtmfIfRequired(this.ep);
-    this.ep.once('destroy', this._handleMediaTimeout.bind(this));
    const opts = {
      ...(this.onHoldMusic && {holdMusic: `shout://${this.onHoldMusic.replace(/^https?:\/\//, '')}`}),
-      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'}),
-      ...(JAMBONES_MEDIA_TIMEOUT_MS && {media_timeout: JAMBONES_MEDIA_TIMEOUT_MS}),
-      ...(JAMBONES_MEDIA_HOLD_TIMEOUT_MS && {media_hold_timeout: JAMBONES_MEDIA_HOLD_TIMEOUT_MS})
+      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'})
    };
    if (Object.keys(opts).length > 0) {
      this.ep.set(opts);
    }
  }

-  async _handleMediaTimeout(evt) {
-    if (evt.reason === 'MEDIA_TIMEOUT' && !this.callGone) {
-      this.logger.info('CallSession:_handleMediaTimeout: received MEDIA_TIMEOUT, hangup the call');
-      this._jambonzHangup('Media Timeout');
-    }
-  }
-
-  async _enableInbandDtmfIfRequired(ep) {
-    if (ep.inbandDtmfEnabled) return;
-    // only enable inband dtmf detection if voip carrier dtmf_type === tones
-    if (this.inbandDtmfEnabled) {
-      // https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Modules/mod-dptools/6587132/#0-about
-      try {
-        ep.execute('start_dtmf');
-        ep.inbandDtmfEnabled = true;
-      } catch (err) {
-        this.logger.info(err, 'CallSession:_enableInbandDtmf - error enable inband DTMF');
-      }
-    }
-  }
-
  /**
   * notifyTaskError - only used when websocket connection is used instead of webhooks
   */
@@ -2931,37 +2690,6 @@ Duration=${duration} `
    }
  }

-  _onTtsStreamingEmpty() {
-    const task = this.currentTask;
-    if (task && TaskName.Say === task.name) {
-      task.notifyTtsStreamIsEmpty();
-    }
-  }
-
-  _onTtsStreamingPause() {
-    this.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_paused'})
-      .catch((err) => this.logger.info({err}, 'CallSession:_onTtsStreamingPause - Error sending'));
-  }
-
-  _onTtsStreamingResume() {
-    this.requestor?.request('tts:streaming-event', 'streaming-event', {event_type: 'stream_resumed'})
-      .catch((err) => this.logger.info({err}, 'CallSession:_onTtsStreamingResume - Error sending'));
-  }
-
-  async _onTtsStreamingConnectFailure(vendor) {
-    const {writeAlerts, AlertType} = this.srf.locals;
-    try {
-      await writeAlerts({
-        alert_type: AlertType.TTS_STREAMING_CONNECTION_FAILURE,
-        account_sid: this.accountSid,
-        vendor
-      });
-    } catch (error) {
-      this.logger.error({error}, 'Error writing WEBHOOK_CONNECTION_FAILURE alert');
-    }
-    this.logger.info({vendor}, 'CallSession:_onTtsStreamingConnectFailure - tts streaming connect failure');
-  }
-
  async startMaxCallDurationTimer(timeLimit) {
    if (!this._maxCallDurationTimer && timeLimit > 0) {
      this.timeLimit = timeLimit;
--- a/lib/session/confirm-call-session.js
+++ b/lib/session/confirm-call-session.js
@@ -8,7 +8,7 @@ const CallSession = require('./call-session');

 */
 class ConfirmCallSession extends CallSession {
-  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName, rootSpan, req}) {
+  constructor({logger, application, dlg, ep, tasks, callInfo, accountInfo, memberId, confName, rootSpan}) {
    super({
      logger,
      application,
@@ -23,7 +23,6 @@ class ConfirmCallSession extends CallSession {
    });
    this.dlg = dlg;
    this.ep = ep;
-    this.req = req;
  }

  /**
--- a/lib/session/inbound-call-session.js
+++ b/lib/session/inbound-call-session.js
@@ -70,12 +70,8 @@ class InboundCallSession extends CallSession {
    this._hangup('caller');
  }

-  _jambonzHangup(reason) {
-    this.dlg?.destroy({
-      headers: {
-        ...(reason && {'X-Reason': reason})
-      }
-    });
+  _jambonzHangup() {
+    this.dlg?.destroy();
    // kill current task or wakeup the call session.
    this._callReleased();
  }
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -653,8 +653,7 @@ class Conference extends Task {
        memberId: this.memberId,
        confName: this.confName,
        tasks,
-        rootSpan: cs.rootSpan,
-        req: cs.req
+        rootSpan: cs.rootSpan
      });
      await this._playSession.exec();
      this._playSession = null;
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -16,8 +16,7 @@ class TaskConfig extends Task {
      'fillerNoise',
      'actionHookDelayAction',
      'boostAudioSignal',
-      'vad',
-      'ttsStream'
+      'vad'
    ].forEach((k) => this[k] = this.data[k] || {});

    if ('notifyEvents' in this.data) {
@@ -46,12 +45,6 @@ class TaskConfig extends Task {
      };
      delete this.transcribeOpts.enable;
    }
-    if (this.ttsStream.enable) {
-      this.sayOpts = {
-        verb: 'say',
-        stream: true
-      };
-    }

    if (this.data.reset) {
      if (typeof this.data.reset === 'string') this.data.reset = [this.data.reset];
@@ -82,7 +75,6 @@ class TaskConfig extends Task {
  get hasVad() { return Object.keys(this.vad).length; }
  get hasFillerNoise() { return Object.keys(this.fillerNoise).length; }
  get hasReferHook() { return Object.keys(this.data).includes('referHook'); }
-  get hasTtsStream() { return Object.keys(this.ttsStream).length; }

  get summary() {
    const phrase = [];
@@ -114,9 +106,6 @@ class TaskConfig extends Task {
    if (this.onHoldMusic) phrase.push(`onHoldMusic: ${this.onHoldMusic}`);
    if ('boostAudioSignal' in this.data) phrase.push(`setGain ${this.data.boostAudioSignal}`);
    if (this.hasReferHook) phrase.push('set referHook');
-    if (this.hasTtsStream) {
-      phrase.push(`${this.ttsStream.enable ? 'enable' : 'disable'} ttsStream`);
-    }
    return `${this.name}{${phrase.join(',')}}`;
  }

@@ -316,22 +305,6 @@ class TaskConfig extends Task {
    if (this.hasReferHook) {
      cs.referHook = this.data.referHook;
    }
-
-    if (this.ttsStream.enable && this.sayOpts) {
-      this.sayOpts.synthesizer = this.hasSynthesizer ? this.synthesizer : {
-        vendor: cs.speechSynthesisVendor,
-        language: cs.speechSynthesisLanguage,
-        voice: cs.speechSynthesisVoice,
-        ...(cs.speechSynthesisLabel && {
-          label: cs.speechSynthesisLabel
-        })
-      };
-      this.logger.info({opts: this.gatherOpts}, 'Config: enabling ttsStream');
-      cs.enableBackgroundTtsStream(this.sayOpts);
-    } else if (!this.ttsStream.enable) {
-      this.logger.info('Config: disabling ttsStream');
-      cs.disableTtsStream();
-    }
  }

  async kill(cs) {
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -6,7 +6,6 @@ const {
  TaskName,
  TaskPreconditions,
  MAX_SIMRINGS,
-  MediaPath,
  KillReason
 } = require('../utils/constants');
 const assert = require('assert');
@@ -18,12 +17,9 @@ const dbUtils = require('../utils/db-utils');
 const parseDecibels = require('../utils/parse-decibels');
 const debug = require('debug')('jambonz:feature-server');
 const {parseUri} = require('drachtio-srf');
-const {ANCHOR_MEDIA_ALWAYS,
-  JAMBONZ_DISABLE_DIAL_PAI_HEADER,
-  JAMBONES_DIAL_SBC_FOR_REGISTERED_USER} = require('../config');
+const {ANCHOR_MEDIA_ALWAYS, JAMBONZ_DISABLE_DIAL_PAI_HEADER} = require('../config');
 const { isOnhold, isOpusFirst } = require('../utils/sdp-utils');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
-const { selectHostPort } = require('../utils/network');

 function parseDtmfOptions(logger, dtmfCapture) {
  let parentDtmfCollector, childDtmfCollector;
@@ -109,7 +105,6 @@ class TaskDial extends Task {
    this.proxy = this.data.proxy;
    this.tag = this.data.tag;
    this.boostAudioSignal = this.data.boostAudioSignal;
-    this._mediaPath = MediaPath.FullMedia;

    if (this.dtmfHook) {
      const {parentDtmfCollector, childDtmfCollector} = parseDtmfOptions(logger, this.data.dtmfCapture || {});
@@ -121,9 +116,8 @@ class TaskDial extends Task {
      }
    }

-    const listenData = this.data.listen || this.data.stream;
-    if (listenData) {
-      this.listenTask = makeTask(logger, {'listen': listenData }, this);
+    if (this.data.listen) {
+      this.listenTask = makeTask(logger, {'listen': this.data.listen}, this);
    }
    if (this.data.transcribe) {
      this.transcribeTask = makeTask(logger, {'transcribe' : this.data.transcribe}, this);
@@ -158,21 +152,17 @@ class TaskDial extends Task {

  get canReleaseMedia() {
    const keepAnchor = this.data.anchorMedia ||
-      this.cs.isBackGroundListen ||
-      this.cs.onHoldMusic ||
-      ANCHOR_MEDIA_ALWAYS ||
-      this.listenTask ||
-      this.dubTasks ||
-      this.transcribeTask ||
-      this.startAmd;
+    this.cs.isBackGroundListen ||
+    this.cs.onHoldMusic ||
+    ANCHOR_MEDIA_ALWAYS ||
+    this.listenTask ||
+    this.dubTasks ||
+    this.transcribeTask ||
+    this.startAmd;

    return !keepAnchor;
  }

-  get shouldExitMediaPathEntirely() {
-    return this.data.exitMediaPath;
-  }
-
  get summary() {
    if (this.target.length === 1) {
      const target = this.target[0];
@@ -193,16 +183,6 @@ class TaskDial extends Task {

  async exec(cs) {
    await super.exec(cs);
-
-    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;
-    }
-    if (!this.canReleaseMedia && this.data.exitMediaPath) {
-      this.logger.info(
-        'Dial:exec - exitMediaPath is set so features such as transcribe and record will not work on this call');
-    }
-
    try {
      if (this.listenTask) {
        const {span, ctx} = this.startChildSpan(`nested:${this.listenTask.summary}`);
@@ -274,9 +254,7 @@ class TaskDial extends Task {
    this._removeDtmfDetection(this.dlg);
    await this._killOutdials();
    if (this.sd) {
-      const byeReasonHeader = this.killReason === KillReason.MediaTimeout ? 'Media Timeout' : undefined;
-      this.sd.kill(byeReasonHeader);
-      this.sd.ep?.removeListener('destroy', this._handleMediaTimeout.bind(this));
+      this.sd.kill();
      this.sd.removeAllListeners();
      this.sd = null;
    }
@@ -322,7 +300,7 @@ class TaskDial extends Task {
      if (!cs.callGone && this.epOther) {

        /* if we can release the media back to the SBC, do so now */
-        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd, this.shouldExitMediaPathEntirely);
+        if (this.canReleaseMedia) this._releaseMedia(cs, this.sd);
        else this.epOther.bridge(this.ep);
      }
    } catch (err) {
@@ -364,12 +342,6 @@ class TaskDial extends Task {
        const by = parseUri(req.getParsedHeader('Referred-By').uri);
        const referredBy = req.get('Referred-By');
        const userAgent = req.get('User-Agent');
-        const customHeaders = Object.keys(req.headers)
-          .filter((h) => h.toLowerCase().startsWith('x-'))
-          .reduce((acc, h) => {
-            acc[h] = req.get(h);
-            return acc;
-          }, {});
        this.logger.info({to}, 'refer to parsed');
        const json = await cs.requestor.request('verb:hook', this.referHook, {
          ...(callInfo.toJSON()),
@@ -380,8 +352,7 @@ class TaskDial extends Task {
            ...(userAgent && {sip_user_agent: userAgent}),
            ...(by && {referred_by_user: by.scheme === 'tel' ? by.number : by.user}),
            referring_call_sid,
-            referred_call_sid,
-            ...customHeaders
+            referred_call_sid
          }
        }, httpHeaders);
        if (json && Array.isArray(json)) {
@@ -407,9 +378,6 @@ class TaskDial extends Task {
            this.logger.info(err, 'Dial:handleRefer - error setting new application after receiving REFER');
          }
        }
-        //caller and callee legs are briged together, accept refer with 202 will release callee leg endpoint
-        //that makes freeswitch release endpoint for caller leg.
-        if (this.ep) this.ep.unbridge();
        res.send(202);
        this.logger.info('DialTask:handleRefer - sent 202 Accepted');
      } catch (err) {
@@ -522,8 +490,8 @@ class TaskDial extends Task {
    const {req, callInfo, direction, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier, lookupCarrierByPhoneNumber, lookupVoipCarrierBySid} = dbUtils(this.logger, cs.srf);
-    let sbcAddress = this.proxy || getSBC();
+    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
+    const sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;

@@ -541,15 +509,10 @@ class TaskDial extends Task {
      ...this.headers
    };

-    // default to inband dtmf if not specified
-    this.inbandDtmfEnabled = cs.inbandDtmfEnabled;
-    // get calling user from From header
-    const parsedFrom = req.getParsedHeader('from');
-    const fromUri = parseUri(parsedFrom.uri);
    const opts = {
      headers: this.headers,
      proxy: `sip:${sbcAddress}`,
-      callingNumber: this.callerId || fromUri.user,
+      callingNumber: this.callerId || req.callingNumber,
      ...(this.callerName && {callingName: this.callerName}),
      opusFirst: isOpusFirst(this.cs.ep.remote.sdp)
    };
@@ -595,15 +558,6 @@ class TaskDial extends Task {
            this.logger.error({err}, 'Error looking up account by sid');
          }
        }
-        // find handling sbc sip for called user
-        if (JAMBONES_DIAL_SBC_FOR_REGISTERED_USER && t.type === 'user') {
-          const { registrar }  = srf.locals.dbHelpers;
-          const reg = await registrar.query(t.name);
-          if (reg) {
-            sbcAddress = selectHostPort(this.logger, reg.sbcAddress, 'tcp')[1];
-          }
-          //sbc outbound return 404 Notfound to handle case called user is not reigstered.
-        }
        if (t.type === 'phone' && t.trunk) {
          const voip_carrier_sid = await lookupCarrier(cs.accountSid, t.trunk);
          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk}`);
@@ -620,17 +574,10 @@ class TaskDial extends Task {
          const str = this.callerId || req.callingNumber || '';
          const callingNumber = str.startsWith('+') ? str.substring(1) : str;
          const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
-          const req_voip_carrier_sid = req.has('X-Voip-Carrier-Sid') ? req.get('X-Voip-Carrier-Sid') : null;
          if (voip_carrier_sid) {
            this.logger.info(
              `Dial:_attemptCalls: selected voip_carrier_sid ${voip_carrier_sid} for callingNumber: ${callingNumber}`);
            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-
-            // Checking if outbound carrier is different from inbound carrier and has dtmf type tones
-            if (voip_carrier_sid !== req_voip_carrier_sid) {
-              const [voipCarrier] = await lookupVoipCarrierBySid(voip_carrier_sid);
-              this.inbandDtmfEnabled = voipCarrier?.dtmf_type === 'tones';
-            }
          }
        }

@@ -787,7 +734,7 @@ class TaskDial extends Task {
            // Offhold, time to release media
            const newSdp = await this.ep.modify(req.body);
            await res.send(200, {body: newSdp});
-            await this._releaseMedia(this.cs, this.sd, this.shouldExitMediaPathEntirely);
+            await this._releaseMedia(this.cs, this.sd);
            this.isOutgoingLegHold = false;
          } else {
            this.logger.debug('Dial: _onReinvite receive unhold Request, update media server');
@@ -874,7 +821,7 @@ class TaskDial extends Task {
    if (cs.sipRequestWithinDialogHook) this._initSipIndialogRequestListener(cs, this.dlg);

    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep: this.epOther, ep2:this.ep});
-    if (this.listenTask) this.listenTask.exec(cs, {ep: this.listenTask.channel === 2 ? this.ep : this.epOther});
+    if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
    if (this.startAmd) {
      try {
        this.startAmd(cs, this.ep, this, this.data.amd);
@@ -896,17 +843,7 @@ class TaskDial extends Task {
    }

    /* 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);
-    }
-
-    this.sd.ep.once('destroy', this._handleMediaTimeout.bind(this));
-  }
-
-  _handleMediaTimeout(evt) {
-    if (evt.reason === 'MEDIA_TIMEOUT' && this.sd && this.bridged) {
-      this.kill(this.cs, KillReason.MediaTimeout);
-    }
+    if (this.canReleaseMedia) setTimeout(this._releaseMedia.bind(this, cs, sd), 200);
  }

  _bridgeEarlyMedia(sd) {
@@ -918,57 +855,22 @@ class TaskDial extends Task {
    }
  }

-  /* public api */
-  async updateMediaPath(desiredPath) {
-    this.logger.info(`Dial:updateMediaPath - ${this._mediaPath} => ${desiredPath}`);
-    switch (desiredPath) {
-      case MediaPath.NoMedia:
-        assert(this._mediaPath !== MediaPath.NoMedia, 'updateMediaPath: already no-media');
-        await this._releaseMedia(this.cs, this.sd, true);
-        break;
-
-      case MediaPath.PartialMedia:
-        assert(this._mediaPath !== MediaPath.PartialMedia, 'updateMediaPath: already partial-media');
-        if (this._mediaPath === MediaPath.FullMedia) {
-          await this._releaseMedia(this.cs, this.sd, false);
-        }
-        else {
-          // to go from no-media to partial-media we need to go through full-media first
-          await this.reAnchorMedia(this.cs, this.sd);
-          await this._releaseMedia(this.cs, this.sd, false);
-        }
-        assert(!this.epOther, 'updateMediaPath: epOther should be null');
-        assert(!this.ep, 'updateMediaPath: ep should be null');
-
-        break;
-      case MediaPath.FullMedia:
-        assert(this._mediaPath !== MediaPath.FullMedia, 'updateMediaPath: already full-media');
-        await this.reAnchorMedia(this.cs, this.sd);
-        break;
-
-      default:
-        assert(false, `updateMediaPath: invalid path request ${desiredPath}`);
-    }
-  }
-
  /**
   * Release the media from freeswitch
   * @param {*} cs
   * @param {*} sd
   */
-  async _releaseMedia(cs, sd, releaseEntirely = false) {
+  async _releaseMedia(cs, sd) {
    assert(cs.ep && sd.ep);

    try {
      // Wait until we got new SDP from B leg to ofter to A Leg
      const aLegSdp = cs.ep.remote.sdp;
-      await sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp, releaseEntirely);
+      await sd.releaseMediaToSBC(aLegSdp, cs.ep.local.sdp);
      const bLegSdp = sd.dlg.remote.sdp;
-      await cs.releaseMediaToSBC(bLegSdp, releaseEntirely);
+      await cs.releaseMediaToSBC(bLegSdp);
      this.epOther = null;
-      this._mediaPath = releaseEntirely ? MediaPath.NoMedia : MediaPath.PartialMedia;
-      this.logger.info(
-        `Dial:_releaseMedia - successfully released media from freewitch, media path is now ${this._mediaPath}`);
+      this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
    } catch (err) {
      this.logger.info({err}, 'Dial:_releaseMedia error');
    }
@@ -978,14 +880,8 @@ class TaskDial extends Task {
    if (cs.ep && sd.ep) return;

    this.logger.info('Dial:reAnchorMedia - re-anchoring media to freewitch');
-    await Promise.all([sd.reAnchorMedia(this._mediaPath), cs.reAnchorMedia(this._mediaPath)]);
+    await Promise.all([sd.reAnchorMedia(), cs.reAnchorMedia()]);
    this.epOther = cs.ep;
-
-    this.epOther.bridge(this.ep);
-
-    this._mediaPath = MediaPath.FullMedia;
-    this.logger.info(
-      `Dial:_releaseMedia - successfully re-anchored media to freewitch, media path is now ${this._mediaPath}`);
  }

  // Handle RE-INVITE hold from caller leg.
@@ -1004,12 +900,11 @@ class TaskDial extends Task {
        }
        this._onHoldHook(req);
      } else if (!isOnhold(req.body)) {
-        if (this.epOther && this.ep && this.isIncomingLegHold &&
-          (this.canReleaseMedia || this.shouldExitMediaPathEntirely)) {
+        if (this.epOther && this.ep && this.isIncomingLegHold && this.canReleaseMedia) {
          // Offhold, time to release media
          const newSdp = await this.epOther.modify(req.body);
          await res.send(200, {body: newSdp});
-          await this._releaseMedia(this.cs, this.sd, this.shouldExitMediaPathEntirely);
+          await this._releaseMedia(this.cs, this.sd);
          isHandled = true;
        }
        this.isIncomingLegHold = false;
@@ -1068,8 +963,7 @@ class TaskDial extends Task {
              callInfo: this.cs.callInfo,
              accountInfo: this.cs.accountInfo,
              tasks,
-              rootSpan: this.cs.rootSpan,
-              req: this.cs.req
+              rootSpan: this.cs.rootSpan
            });
            await this._onHoldSession.exec();
            this._onHoldSession = null;
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -369,8 +369,7 @@ class TaskEnqueue extends Task {
        callInfo: cs.callInfo,
        accountInfo: cs.accountInfo,
        tasks: tasksToRun,
-        rootSpan: cs.rootSpan,
-        req: cs.req
+        rootSpan: cs.rootSpan
      });
      await this._playSession.exec();
      this._playSession = null;
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -24,7 +24,6 @@ const makeTask = require('./make_task');
 const assert = require('assert');
 const SttTask = require('./stt-task');
 const { SpeechCredentialError } = require('../utils/error');
-const SPEECHMATICS_DEFAULT_ASR_TIMEOUT = 1200;

 class TaskGather extends SttTask {
  constructor(logger, opts, parentTask) {
@@ -141,6 +140,7 @@ class TaskGather extends SttTask {
  async handling(cs, {ep}) {
    this.logger.debug({options: this.data}, 'Gather:exec');
    await super.exec(cs, {ep});
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);

    this.fillerNoise = {
      ...(cs.fillerNoise || {}),
@@ -156,23 +156,12 @@ class TaskGather extends SttTask {
      const {hints, hintsBoost} = cs.globalSttHints;
      const setOfHints = new Set((this.data.recognizer.hints || [])
        .concat(hints)
-        // allow for hints to be an array of object
-        .filter((h) => (typeof h === 'string' && h.length > 0) || (typeof h === 'object')));
+        .filter((h) => typeof h === 'string' && h.length > 0));
      this.data.recognizer.hints = [...setOfHints];
      if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
      this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
        'Gather:exec - applying global sttHints');
    }
-
-    // specials case for speechmatics: they dont do endpointing so we need to enable continuous ASR
-    if (this.vendor === 'speechmatics' && !this.isContinuousAsr) {
-      const maxDelay = this.recognizer?.speechmaticsOptions?.transcription_config?.max_delay;
-      if (maxDelay) this.asrTimeout = Math.min(SPEECHMATICS_DEFAULT_ASR_TIMEOUT, maxDelay * 1000);
-      else this.asrTimeout = SPEECHMATICS_DEFAULT_ASR_TIMEOUT;
-      this.isContinuousAsr = true;
-      this.logger.debug(`Gather:exec - auto-enabling continuous ASR for speechmatics w/ timeout ${this.asrTimeout}`);
-    }
-
    if (!this.isContinuousAsr && cs.isContinuousAsr) {
      this.isContinuousAsr = true;
      this.asrTimeout = cs.asrTimeout * 1000;
@@ -221,6 +210,7 @@ class TaskGather extends SttTask {
            return;
          }
          this._startTranscribing(ep);
+          return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
        } catch (e) {
          await this._startFallback(cs, ep, {error: e});
        }
@@ -300,6 +290,8 @@ class TaskGather extends SttTask {
        await this._setSpeechHandlers(cs, ep);
        if (!this.resolved && !this.killed) {
          this._startTranscribing(ep);
+          updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
+            .catch(() => {/*already logged error */});
        }
        else {
          this.logger.info('Gather:exec - task was killed or resolved quickly, not starting transcription');
@@ -354,13 +346,6 @@ class TaskGather extends SttTask {
      this._killAudio(cs);
      this.emit('dtmf', evt);
    }
-    if (this.isContinuousAsr && evt.dtmf === this.asrDtmfTerminationDigit && this._bufferedTranscripts.length > 0) {
-      this.logger.info(`continuousAsr triggered with dtmf ${this.asrDtmfTerminationDigit}`);
-      this._clearAsrTimer();
-      this._clearTimer();
-      this._startFinalAsrTimer();
-      return;
-    }
    if (evt.dtmf === this.finishOnKey && this.input.includes('digits')) {
      resolved = true;
      this._resolve('dtmf-terminator-key');
@@ -383,6 +368,13 @@ class TaskGather extends SttTask {
        this._resolve('dtmf-num-digits');
      }
    }
+    else if (this.isContinuousAsr && evt.dtmf === this.asrDtmfTerminationDigit) {
+      this.logger.info(`continuousAsr triggered with dtmf ${this.asrDtmfTerminationDigit}`);
+      this._clearAsrTimer();
+      this._clearTimer();
+      this._startFinalAsrTimer();
+      return;
+    }
    if (!resolved && this.interDigitTimeout > 0 && this.digitBuffer.length >= this.minDigits) {
      /* start interDigitTimer */
      const ms = this.interDigitTimeout * 1000;
@@ -734,7 +726,6 @@ 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'));
-        cs.clearTtsStream();
      }
      return;
    }
@@ -843,7 +834,7 @@ class TaskGather extends SttTask {
        const t = evt.alternatives[0].transcript;
        if (t) {
          /* remove trailing punctuation */
-          if (this.vendor !== 'speechmatics' && /[,;:\.!\?]$/.test(t)) {
+          if (/[,;:\.!\?]$/.test(t)) {
            this.logger.debug('TaskGather:_onTranscription - removing trailing punctuation');
            evt.alternatives[0].transcript = t.slice(0, -1);
          }
@@ -859,10 +850,7 @@ class TaskGather extends SttTask {
        this._startAsrTimer();

        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'speechmatics'].includes(this.vendor) &&
-          !this.vendor.startsWith('custom')) {
-          this._startTranscribing(ep);
-        }
+        if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(ep);
      }
      else {
        /* this was removed to fix https://github.com/jambonz/jambonz-feature-server/issues/783 */
@@ -981,6 +969,7 @@ class TaskGather extends SttTask {
        bugname: this.bugname
      })
        .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
+      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
      try {
        this.logger.debug('gather:_startFallback');
        this.notifyError({ msg: 'ASR error',
@@ -989,6 +978,7 @@ class TaskGather extends SttTask {
        this._speechHandlersSet = false;
        await this._setSpeechHandlers(cs, ep);
        this._startTranscribing(ep);
+        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
        return true;
      } catch (error) {
        this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
@@ -1182,6 +1172,7 @@ class TaskGather extends SttTask {
    } catch (err) {  /*already logged error*/ }

    // Gather got response from hook, cancel actionHookDelay processing
+    this.logger.debug('TaskGather:_resolve - checking ahd');
    if (this.cs.actionHookDelayProcessor) {
      if (returnedVerbs) {
        this.logger.debug('TaskGather:_resolve - got response from action hook, cancelling actionHookDelay');
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -17,7 +17,7 @@ class TaskListen extends Task {

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

    this.mixType = this.mixType || 'mono';
--- a/lib/tasks/llm/index.js
+++ b/lib/tasks/llm/index.js
@@ -1,8 +1,6 @@
 const Task = require('../task');
 const {TaskPreconditions} = require('../../utils/constants');
 const TaskLlmOpenAI_S2S = require('./llms/openai_s2s');
-const TaskLlmVoiceAgent_S2S = require('./llms/voice_agent_s2s');
-const TaskLlmUltravox_S2S = require('./llms/ultravox_s2s');

 class TaskLlm extends Task {
  constructor(logger, opts) {
@@ -42,18 +40,10 @@ class TaskLlm extends Task {
    switch (this.vendor) {
      case 'openai':
      case 'microsoft':
-        llm = new TaskLlmOpenAI_S2S(this.logger, this.data, this);
+        if (this.model.startsWith('gpt-4o-realtime')) {
+          llm = new TaskLlmOpenAI_S2S(this.logger, this.data, this);
+        }
        break;
-
-      case 'voiceagent':
-      case 'deepgram':
-        llm = new TaskLlmVoiceAgent_S2S(this.logger, this.data, this);
-        break;
-
-      case 'ultravox':
-        llm = new TaskLlmUltravox_S2S(this.logger, this.data, this);
-        break;
-
      default:
        throw new Error(`Unsupported vendor ${this.vendor} for LLM`);
    }
--- a/lib/tasks/llm/llms/openai_s2s.js
+++ b/lib/tasks/llm/llms/openai_s2s.js
@@ -59,7 +59,7 @@ class TaskLlmOpenAI_S2S extends Task {
    this.parent = parentTask;

    this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'gpt-4o-realtime-preview-2024-12-17';
+    this.model = this.parent.model;
    this.auth = this.parent.auth;
    this.connectionOptions = this.parent.connectOptions;

@@ -120,9 +120,9 @@ class TaskLlmOpenAI_S2S extends Task {

    switch (this.vendor) {
      case 'openai':
-        return `v1/realtime?model=${this.model}`;
+        return 'v1/realtime?model=gpt-4o-realtime-preview-2024-10-01';
      case 'microsoft':
-        return `openai/realtime?api-version=2024-10-01-preview&deployment=${this.model}`;
+        return 'openai/realtime?api-version=2024-10-01-preview&deployment=gpt-4o-realtime-preview-1001&';
    }
  }

--- a/lib/tasks/llm/llms/ultravox_s2s.js
+++ b/lib/tasks/llm/llms/ultravox_s2s.js
@@ -1,245 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_Ultravox_s2s';
-const {request} = require('undici');
-const {LlmEvents_Ultravox} = require('../../../utils/constants');
-
-const ultravox_server_events = [
-  'pong',
-  'state',
-  'transcript',
-  'conversationText',
-  'clientToolInvocation',
-  'playbackClearBuffer',
-];
-
-const ClientEvent = 'client.event';
-
-const expandWildcards = (events) => {
-  // no-op for deepgram
-  return events;
-};
-
-const SessionDelete = 'session.delete';
-
-class TaskLlmUltravox_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.model = this.parent.model || 'fixie-ai/ultravox';
-    this.auth = this.parent.auth;
-    this.connectionOptions = this.parent.connectOptions;
-
-    const {apiKey} = this.auth || {};
-    if (!apiKey) throw new Error('auth.apiKey is required for Vendor: Ultravox');
-    this.apiKey = apiKey;
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || ultravox_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_ultravox_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error(`Error calling uuid_ultravox_s2s: ${JSON.stringify(res.body)}`);
-    }
-  }
-
-  async createCall() {
-    const payload = {
-      ...this.data.llmOptions,
-      model: this.model,
-      medium: {
-        ...(this.data.llmOptions.medium || {}),
-        serverWebSocket: {
-          inputSampleRate: 8000,
-          outputSampleRate: 8000,
-        }
-      }
-    };
-    const {statusCode, body} = await request('https://api.ultravox.ai/api/calls', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'X-API-Key': this.apiKey
-      },
-      body: JSON.stringify(payload)
-    });
-    const data = await body.json();
-    if (statusCode !== 201 || !data?.joinUrl) {
-      this.logger.error({statusCode, data}, 'Ultravox Error registering call');
-      throw new Error(`Ultravox  Error registering call: ${data.message}`);
-    }
-    this.logger.info({joinUrl: data.joinUrl}, 'Ultravox Call registered');
-    return data.joinUrl;
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_Ultravox.Connect, this._onConnect.bind(this, ep));
-    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));
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    const joinUrl = await this.createCall();
-    // split the joinUrl into host and path
-    const {host, pathname, search} = new URL(joinUrl);
-
-    try {
-      const args = [ep.uuid, 'session.create', host, pathname + search];
-      await this._api(ep, args);
-    } catch (err) {
-      this.logger.error({err}, 'TaskLlmUltraVox_S2S:_startListening');
-      this.notifyTaskDone();
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmUltravox_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmUltravox_S2S:_onConnect');
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmUltravox_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmUltravox_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-
-  async _onServerEvent(_ep, evt) {
-    let endConversation = false;
-    const type = evt.type;
-    this.logger.info({evt}, 'TaskLlmUltravox_S2S:_onServerEvent');
-
-    /* server errors of some sort */
-    if (type === 'error') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server error',
-        error: evt.error
-      };
-    }
-
-    /* tool calls */
-    else if (type === 'client_tool_invocation') {
-      this.logger.debug({evt}, 'TaskLlmUltravox_S2S:_onServerEvent - function_call');
-      if (!this.toolHook) {
-        this.logger.warn({evt}, 'TaskLlmUltravox_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        const {toolName: name, invocationId: call_id, parameters: args} = evt;
-
-        try {
-          await this.parent.sendToolHook(call_id, {name, args});
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmUltravox_S2S - error calling function');
-          this.results = {
-            completionReason: 'client error calling function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-    }
-
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err}, 'TaskLlmUltravox_S2S:_onServerEvent - error sending event hook'));
-    }
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmUltravox_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      this.logger.debug({tool_call_id, data}, 'TaskLlmUltravox_S2S:processToolOutput');
-
-      if (!data.type || data.type !== 'client_tool_result') {
-        this.logger.info({data},
-          'TaskLlmUltravox_S2S:processToolOutput - invalid tool output, must be client_tool_result');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmUltravox_S2S:processToolOutput');
-    }
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = ultravox_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmUltravox_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmUltravox_S2S;
--- a/lib/tasks/llm/llms/voice_agent_s2s.js
+++ b/lib/tasks/llm/llms/voice_agent_s2s.js
@@ -1,313 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_VoiceAgent_s2s';
-const {LlmEvents_VoiceAgent} = require('../../../utils/constants');
-const ClientEvent = 'client.event';
-const SessionDelete = 'session.delete';
-
-const va_server_events = [
-  'Error',
-  'Welcome',
-  'SettingsApplied',
-  'ConversationText',
-  'UserStartedSpeaking',
-  'EndOfThought',
-  'AgentThinking',
-  'FunctionCallRequest',
-  'FunctionCalling',
-  'AgentStartedSpeaking',
-  'AgentAudioDone',
-];
-
-const expandWildcards = (events) => {
-  // no-op for deepgram
-  return events;
-};
-
-class TaskLlmVoiceAgent_S2S extends Task {
-  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
-    this.parent = parentTask;
-
-    this.vendor = this.parent.vendor;
-    this.model = this.parent.model;
-    this.auth = this.parent.auth;
-    this.connectionOptions = this.parent.connectOptions;
-
-    const {apiKey} = this.auth || {};
-    if (!apiKey) throw new Error('auth.apiKey is required for VoiceAgent S2S');
-
-    this.apiKey = apiKey;
-    this.authType = 'bearer';
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-    const {settingsConfiguration} = this.data.llmOptions;
-
-    if (typeof settingsConfiguration !== 'object') {
-      throw new Error('llmOptions with an initial settingsConfiguration is required for VoiceAgent S2S');
-    }
-
-    // eslint-disable-next-line no-unused-vars
-    const {audio, ...rest} = settingsConfiguration;
-    const cfg = this.settingsConfiguration = rest;
-
-    if (!cfg.agent) throw new Error('llmOptions.settingsConfiguration.agent is required for VoiceAgent S2S');
-    if (!cfg.agent.think) {
-      throw new Error('llmOptions.settingsConfiguration.agent.think is required for VoiceAgent S2S');
-    }
-    if (!cfg.agent.think.model) {
-      throw new Error('llmOptions.settingsConfiguration.agent.think.model is required for VoiceAgent S2S');
-    }
-    if (!cfg.agent.think.provider?.type) {
-      throw new Error('llmOptions.settingsConfiguration.agent.think.provider.type is required for VoiceAgent S2S');
-    }
-
-    this.results = {
-      completionReason: 'normal conversation end'
-    };
-
-    /**
-     * only one of these will have items,
-     * if includeEvents, then these are the events to include
-     * if excludeEvents, then these are the events to exclude
-     */
-    this.includeEvents = [];
-    this.excludeEvents = [];
-
-    /* default to all events if user did not specify */
-    this._populateEvents(this.data.events || va_server_events);
-
-    this.addCustomEventListener = parentTask.addCustomEventListener.bind(parentTask);
-    this.removeCustomEventListeners = parentTask.removeCustomEventListeners.bind(parentTask);
-  }
-
-  get name() { return TaskName; }
-
-  get host() {
-    const {host} = this.connectionOptions || {};
-    return host || 'agent.deepgram.com';
-  }
-
-  get path() {
-    const {path} = this.connectionOptions || {};
-    if (path) return path;
-
-    return '/agent';
-  }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_voice_agent_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error(`Error calling uuid_voice_agent_s2s: ${JSON.stringify(res.body)}`);
-    }
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-
-    await this._startListening(cs, ep);
-
-    await this.awaitTaskDone();
-
-    /* note: the parent llm verb started the span, which is why this is necessary */
-    await this.parent.performAction(this.results);
-
-    this._unregisterHandlers();
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-
-    this._api(cs.ep, [cs.ep.uuid, SessionDelete])
-      .catch((err) => this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  /**
-   * Send function call response to the VoiceAgent server
-   */
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      const {data:response} = data;
-      this.logger.debug({tool_call_id, response}, 'TaskLlmVoiceAgent_S2S:processToolOutput');
-
-      if (!response.type || response.type !== 'FunctionCallResponse') {
-        this.logger.info({response},
-          'TaskLlmVoiceAgent_S2S:processToolOutput - invalid tool output, must be FunctionCallResponse');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(response)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:processToolOutput');
-    }
-  }
-
-  /**
-   * Send a session.update to the VoiceAgent server
-   * Note: creating and deleting conversation items also supported as well as interrupting the assistant
-   */
-  async processLlmUpdate(ep, data, _callSid) {
-    try {
-      this.logger.debug({data, _callSid}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate');
-
-      if (!data.type || ![
-        'UpdateInstructions',
-        'UpdateSpeak',
-        'InjectAgentMessage',
-      ].includes(data.type)) {
-        this.logger.info({data}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate - invalid mid-call request');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:processLlmUpdate');
-    }
-  }
-
-  async _startListening(cs, ep) {
-    this._registerHandlers(ep);
-
-    try {
-      const args = [ep.uuid, 'session.create', this.host, this.path, this.authType, this.apiKey];
-      await this._api(ep, args);
-    } catch (err) {
-      this.logger.error({err}, `TaskLlmVoiceAgent_S2S:_startListening: ${JSON.stringify(err)}`);
-      this.notifyTaskDone();
-    }
-  }
-
-  async _sendClientEvent(ep, obj) {
-    let ok = true;
-    this.logger.debug({obj}, 'TaskLlmVoiceAgent_S2S:_sendClientEvent');
-    try {
-      const args = [ep.uuid, ClientEvent, JSON.stringify(obj)];
-      await this._api(ep, args);
-    } catch (err) {
-      ok = false;
-      this.logger.error({err}, 'TaskLlmVoiceAgent_S2S:_sendClientEvent - Error');
-    }
-    return ok;
-  }
-
-  async _sendInitialMessage(ep) {
-    if (!await this._sendClientEvent(ep, this.settingsConfiguration)) {
-      this.notifyTaskDone();
-    }
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_VoiceAgent.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _onError(_ep, evt) {
-    this.logger.info({evt}, 'TaskLlmVoiceAgent_S2S:_onError');
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmVoiceAgent_S2S:_onConnect');
-    this._sendInitialMessage(ep);
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmVoiceAgent_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmVoiceAgent_S2S:_onConnectFailure');
-    this.results = {completionReason: 'disconnect from remote end'};
-    this.notifyTaskDone();
-  }
-  async _onServerEvent(_ep, evt) {
-    let endConversation = false;
-    const type = evt.type;
-    this.logger.info({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent');
-
-    /* check for failures, such as rate limit exceeded, that should terminate the conversation */
-    if (type === 'response.done' && evt.response.status === 'failed') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server failure',
-        error: evt.response.status_details?.error
-      };
-    }
-
-    /* server errors of some sort */
-    else if (type === 'error') {
-      endConversation = true;
-      this.results = {
-        completionReason: 'server error',
-        error: evt.error
-      };
-    }
-
-    /* tool calls */
-    else if (type === 'FunctionCallRequest') {
-      this.logger.debug({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - function_call');
-      if (!this.toolHook) {
-        this.logger.warn({evt}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        const {function_name:name, function_call_id:call_id} = evt;
-        const args = evt.input;
-
-        try {
-          await this.parent.sendToolHook(call_id, {name, args});
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmVoiceAgent - error calling function');
-          this.results = {
-            completionReason: 'client error calling function',
-            error: err
-          };
-          endConversation = true;
-        }
-      }
-    }
-
-    /* check whether we should notify on this event */
-    if (this.includeEvents.length > 0 ? this.includeEvents.includes(type) : !this.excludeEvents.includes(type)) {
-      this.parent.sendEventHook(evt)
-        .catch((err) => this.logger.info({err}, 'TaskLlmVoiceAgent_S2S:_onServerEvent - error sending event hook'));
-    }
-
-    if (endConversation) {
-      this.logger.info({results: this.results},
-        'TaskLlmVoiceAgent_S2S:_onServerEvent - ending conversation due to error');
-      this.notifyTaskDone();
-    }
-  }
-
-  _populateEvents(events) {
-    if (events.includes('all')) {
-      /* work by excluding specific events */
-      const exclude = events
-        .filter((evt) => evt.startsWith('-'))
-        .map((evt) => evt.slice(1));
-      if (exclude.length === 0) this.includeEvents = va_server_events;
-      else this.excludeEvents = expandWildcards(exclude);
-    }
-    else {
-      /* work by including specific events */
-      const include = events
-        .filter((evt) => !evt.startsWith('-'));
-      this.includeEvents = expandWildcards(include);
-    }
-
-    this.logger.debug({
-      includeEvents: this.includeEvents,
-      excludeEvents: this.excludeEvents
-    }, 'TaskLlmVoiceAgent_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmVoiceAgent_S2S;
--- a/lib/tasks/make_task.js
+++ b/lib/tasks/make_task.js
@@ -84,7 +84,6 @@ function makeTask(logger, obj, parent) {
      const TaskTranscribe = require('./transcribe');
      return new TaskTranscribe(logger, data, parent);
    case TaskName.Listen:
-    case TaskName.Stream:
      const TaskListen = require('./listen');
      return new TaskListen(logger, data, parent);
    case TaskName.Redirect:
--- a/lib/tasks/play.js
+++ b/lib/tasks/play.js
@@ -1,6 +1,5 @@
 const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
-const { PlayFileNotFoundError } = require('../utils/error');

 class TaskPlay extends Task {
  constructor(logger, opts) {
@@ -67,20 +66,8 @@ class TaskPlay extends Task {
        }
      }
    } catch (err) {
-      this.logger.info(`TaskPlay:exec - error playing ${this.url}: ${err.message}`);
-      this.playComplete = true;
-      if (err.message === 'File Not Found') {
-        const {writeAlerts, AlertType} = cs.srf.locals;
-        await this.performAction({status: 'fail', reason: 'playFailed'}, !(this.parentTask || cs.isConfirmCallSession));
-        this.emit('playDone');
-        writeAlerts({
-          account_sid: cs.accountSid,
-          alert_type: AlertType.PLAY_FILENOTFOUND,
-          url: this.url,
-          target_sid: cs.callSid
-        });
-        throw new PlayFileNotFoundError(this.url);
-      }
+      if (timeout) clearTimeout(timeout);
+      this.logger.info(err, `TaskPlay:exec - error playing ${this.url}`);
    }
    this.emit('playDone');
  }
--- a/lib/tasks/redirect.js
+++ b/lib/tasks/redirect.js
@@ -1,6 +1,5 @@
 const Task = require('./task');
 const {TaskName} = require('../utils/constants');
-const WsRequestor = require('../utils/ws-requestor');

 /**
 * Redirects to a new application
@@ -14,17 +13,6 @@ class TaskRedirect extends Task {

  async exec(cs) {
    await super.exec(cs);
-
-    if (cs.requestor instanceof WsRequestor && cs.application.requestor._isAbsoluteUrl(this.actionHook)) {
-      this.logger.info(`Task:performAction redirecting to ${this.actionHook}, requires new ws connection`);
-      try {
-        this.cs.requestor.close();
-        const requestor = new WsRequestor(this.logger, cs.accountSid, {url: this.actionHook}, this.webhook_secret) ;
-        this.cs.application.requestor = requestor;
-      } catch (err) {
-        this.logger.info(err, `Task:performAction error redirecting to ${this.actionHook}`);
-      }
-    }
    await this.performAction();
  }
 }
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -81,13 +81,11 @@ class TaskRestDial extends Task {
          synthesizer: {
            vendor: cs.speechSynthesisVendor,
            language: cs.speechSynthesisLanguage,
-            voice: cs.speechSynthesisVoice,
-            label: cs.speechSynthesisLabel,
+            voice: cs.speechSynthesisVoice
          },
          recognizer: {
            vendor:  cs.speechRecognizerVendor,
-            language: cs.speechRecognizerLanguage,
-            label: cs.speechRecognizerLabel,
+            language: cs.speechRecognizerLanguage
          }
        }
      };
--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -1,4 +1,3 @@
-const assert = require('assert');
 const TtsTask = require('./tts-task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const pollySSMLSplit = require('polly-ssml-split');
@@ -36,40 +35,24 @@ class TaskSay extends TtsTask {
    super(logger, opts, parentTask);
    this.preconditions = TaskPreconditions.Endpoint;

-    assert.ok((typeof this.data.text === 'string' || Array.isArray(this.data.text)) || this.data.stream === true,
-      'Say: either text or stream:true is required');
+    this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
+      .map((t) => breakLengthyTextIfNeeded(this.logger, t))
+      .flat();

-
-    if (this.data.stream === true) {
-      this._isStreamingTts = true;
-      this.closeOnStreamEmpty = this.data.closeOnStreamEmpty !== false;
-    }
-    else {
-      this._isStreamingTts = false;
-      this.text = (Array.isArray(this.data.text) ? this.data.text : [this.data.text])
-        .map((t) => breakLengthyTextIfNeeded(this.logger, t))
-        .flat();
-
-      this.loop = this.data.loop || 1;
-      this.isHandledByPrimaryProvider = true;
-    }
+    this.loop = this.data.loop || 1;
+    this.isHandledByPrimaryProvider = true;
  }

  get name() { return TaskName.Say; }

  get summary() {
-    if (this.isStreamingTts) return `${this.name} streaming`;
-    else {
-      for (let i = 0; i < this.text.length; i++) {
-        if (this.text[i].startsWith('silence_stream')) continue;
-        return `${this.name}{text=${this.text[i].slice(0, 15)}${this.text[i].length > 15 ? '...' : ''}}`;
-      }
-      return `${this.name}{${this.text[0]}}`;
+    for (let i = 0; i < this.text.length; i++) {
+      if (this.text[i].startsWith('silence_stream')) continue;
+      return `${this.name}{text=${this.text[i].slice(0, 15)}${this.text[i].length > 15 ? '...' : ''}}`;
    }
+    return `${this.name}{${this.text[0]}}`;
  }

-  get isStreamingTts() { return this._isStreamingTts; }
-
  _validateURL(urlString) {
    try {
      new URL(urlString);
@@ -80,19 +63,14 @@ class TaskSay extends TtsTask {
  }

  async exec(cs, obj) {
-    if (this.isStreamingTts && !cs.appIsUsingWebsockets) {
-      throw new Error('Say: streaming say verb requires applications to use the websocket API');
-    }
-
    try {
-      if (this.isStreamingTts) await this.handlingStreaming(cs, obj);
-      else await this.handling(cs, obj);
+      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.logger.info('Say failed due to SpeechCredentialError, finished!');
        this.emit('playDone');
        return;
      }
@@ -100,35 +78,6 @@ class TaskSay extends TtsTask {
    }
  }

-  async handlingStreaming(cs, {ep}) {
-    const {vendor, language, voice, label} = this.getTtsVendorData(cs);
-    const  credentials = cs.getSpeechCredentials(vendor, 'tts', label);
-    if (!credentials) {
-      throw new SpeechCredentialError(
-        `No text-to-speech service credentials for ${vendor} with labels: ${label} have been configured`);
-    }
-
-    try {
-
-      await this.setTtsStreamingChannelVars(vendor, language, voice, credentials, ep);
-
-      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'));
-    } catch (err) {
-      this.logger.info({err}, 'TaskSay:handlingStreaming - Error setting channel vars');
-      cs.requestor?.request('tts:streaming-event', '/streaming-event', {event_type: 'stream_closed'})
-        .catch((err) => this.logger.info({err}, 'TaskSay:handlingStreaming - Error sending'));
-
-      //TODO: send tts:streaming-event with error?
-      this.notifyTaskDone();
-    }
-
-    await this.awaitTaskDone();
-    this.logger.info('TaskSay:handlingStreaming - done');
-  }
-
  async handling(cs, {ep}) {
    const {srf, accountSid:account_sid, callSid:target_sid} = cs;
    const {writeAlerts, AlertType} = srf.locals;
@@ -147,7 +96,7 @@ class TaskSay extends TtsTask {
    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
      this.synthesizer.voice :
      cs.speechSynthesisVoice;
-    let label = this.taskIncludeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
+    let label = this.taskInlcudeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;

    const fallbackVendor = this.synthesizer.fallbackVendor && this.synthesizer.fallbackVendor !== 'default' ?
      this.synthesizer.fallbackVendor :
@@ -158,7 +107,7 @@ class TaskSay extends TtsTask {
    const fallbackVoice =  this.synthesizer.fallbackVoice && this.synthesizer.fallbackVoice !== 'default' ?
      this.synthesizer.fallbackVoice :
      cs.fallbackSpeechSynthesisVoice;
-    const fallbackLabel = this.taskIncludeSynthesizer ?
+    const fallbackLabel = this.taskInlcudeSynthesizer ?
      this.synthesizer.fallbackLabel : cs.fallbackSpeechSynthesisLabel;

    if (cs.hasFallbackTts) {
@@ -304,7 +253,6 @@ class TaskSay extends TtsTask {
        this._playResolve = null;
      }
    }
-    this.notifyTaskDone();
  }

  _addStreamingTtsAttributes(span, evt) {
@@ -315,7 +263,6 @@ class TaskSay extends TtsTask {
          .replace('whisper_', 'whisper.')
          .replace('deepgram_', 'deepgram.')
          .replace('playht_', 'playht.')
-          .replace('cartesia_', 'cartesia.')
          .replace('rimelabs_', 'rimelabs.')
          .replace('verbio_', 'verbio.')
          .replace('elevenlabs_', 'elevenlabs.');
@@ -326,13 +273,6 @@ class TaskSay extends TtsTask {
    delete attrs['cache_filename']; //no value in adding this to the span
    span.setAttributes(attrs);
  }
-
-  notifyTtsStreamIsEmpty() {
-    if (this.isStreamingTts && this.closeOnStreamEmpty) {
-      this.logger.info('TaskSay:notifyTtsStreamIsEmpty - stream is empty, killing task');
-      this.notifyTaskDone();
-    }
-  }
 }

 const spanMapping = {
@@ -369,11 +309,6 @@ const spanMapping = {
  'playht.name_lookup_time_ms': 'name_lookup_ms',
  'playht.connect_time_ms': 'connect_ms',
  'playht.final_response_time_ms': 'final_response_ms',
-  // Cartesia
-  'cartesia.request_id': 'cartesia.req_id',
-  'cartesia.name_lookup_time_ms': 'name_lookup_ms',
-  'cartesia.connect_time_ms': 'connect_ms',
-  'cartesia.final_response_time_ms': 'final_response_ms',
  // Rimelabs
  'rimelabs.name_lookup_time_ms': 'name_lookup_ms',
  'rimelabs.connect_time_ms': 'connect_ms',
--- a/lib/tasks/sip_refer.js
+++ b/lib/tasks/sip_refer.js
@@ -12,7 +12,6 @@ class TaskSipRefer extends Task {

    this.referTo = this.data.referTo;
    this.referredBy = this.data.referredBy;
-    this.referredByDisplayName = this.data.referredByDisplayName;
    this.headers = this.data.headers || {};
    this.eventHook = this.data.eventHook;
  }
@@ -95,10 +94,7 @@ class TaskSipRefer extends Task {
        }
        if (status >= 200) {
          this.referSpan.setAttributes({'refer.finalNotify': status});
-          await this.performAction({refer_status: 202, final_referred_call_status: status})
-            .catch((err) => {
-              this.logger.error(err, 'TaskSipRefer:exec - error performing action finalNotify');
-            });
+          await this.performAction({refer_status: 202, final_referred_call_status: status});
          this.notifyTaskDone();
        }
      }
@@ -106,7 +102,7 @@ class TaskSipRefer extends Task {
  }

  _normalizeReferHeaders(cs, dlg) {
-    let {referTo, referredBy, referredByDisplayName} = this;
+    let {referTo, referredBy} = this;

    /* get IP address of the SBC to use as hostname if needed */
    const {host} = parseUri(dlg.remote.uri);
@@ -121,12 +117,9 @@ class TaskSipRefer extends Task {
      referredBy = cs.req?.callingNumber || dlg.local.uri;
      this.logger.info({referredBy}, 'setting referredby');
    }
-    if (!referredByDisplayName) {
-      referredByDisplayName = cs.req?.callingName;
-    }
    if (!referredBy.startsWith('<') && !referredBy.startsWith('sip') && !referredBy.startsWith('"')) {
      /* they may have only provided a phone number/user */
-      referredBy = `${referredByDisplayName ? `"${referredByDisplayName}"` : ''}<sip:${referredBy}@${host}>`;
+      referredBy = `sip:${referredBy}@${host}`;
    }
    return {referTo, referredBy};
  }
--- a/lib/tasks/stt-task.js
+++ b/lib/tasks/stt-task.js
@@ -219,8 +219,7 @@ class SttTask extends Task {
          roleArn
        });
      this.logger.debug({roleArn}, `(roleArn) got aws access token ${servedFromCache ? 'from cache' : ''}`);
-      // from role ARN, we will get SessionToken, but feature server use it as securityToken.
-      credentials = {...credentials, accessKeyId, secretAccessKey, securityToken: sessionToken};
+      credentials = {...credentials, accessKeyId, secretAccessKey, sessionToken};
    }
    else if (vendor === 'verbio' && credentials.client_id && credentials.client_secret) {
      const {access_token, servedFromCache} = await getVerbioAccessToken(credentials);
@@ -230,13 +229,9 @@ class SttTask extends Task {
    }
    else if (vendor == 'aws' && !JAMBONES_AWS_TRANSCRIBE_USE_GRPC) {
      /* get AWS access token */
-      const {speech_credential_sid, accessKeyId, secretAccessKey, securityToken, region } = credentials;
+      const {accessKeyId, secretAccessKey, securityToken, region } = credentials;
      if (!securityToken) {
-        const { servedFromCache, ...newCredentials} = await getAwsAuthToken({
-          speech_credential_sid,
-          accessKeyId,
-          secretAccessKey,
-          region});
+        const { servedFromCache, ...newCredentials} = await getAwsAuthToken({accessKeyId, secretAccessKey, region});
        this.logger.debug({newCredentials}, `got aws security token ${servedFromCache ? 'from cache' : ''}`);
        credentials = {...newCredentials, region};
      }
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -27,7 +27,6 @@ class TaskTranscribe extends SttTask {
    super(logger, opts, parentTask);

    this.transcriptionHook = this.data.transcriptionHook;
-    this.translationHook = this.data.translationHook;
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);

    if (this.data.recognizer) {
@@ -101,6 +100,7 @@ class TaskTranscribe extends SttTask {
        ...this.data.recognizer.nuanceOptions
      };
    }
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);

    if (cs.hasGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
@@ -117,6 +117,9 @@ class TaskTranscribe extends SttTask {
      if (this.transcribing2) {
        await this._startTranscribing(cs, ep2, 2);
      }
+
+      updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
+        .catch(() => {/*already logged error */});
    } catch (err) {
      if (!(await this._startFallback(cs, ep, {error: err}))) {
        this.logger.info(err, 'TaskTranscribe:exec - error');
@@ -303,9 +306,7 @@ class TaskTranscribe extends SttTask {
      case 'speechmatics':
        this.bugname = `${this.bugname_prefix}speechmatics_transcribe`;
        this.addCustomEventListener(
-          ep, SpeechmaticsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep, channel));
-        this.addCustomEventListener(
-          ep, SpeechmaticsTranscriptionEvents.Translation, this._onTranslation.bind(this, cs, ep, channel));
+          ep, SpeechmaticsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Info,
          this._onSpeechmaticsInfo.bind(this, cs, ep));
        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.RecognitionStarted,
@@ -444,7 +445,7 @@ class TaskTranscribe extends SttTask {
        this._startAsrTimer(channel);

        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google', 'speechmatics']
+        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
      }
      else {
@@ -469,7 +470,7 @@ class TaskTranscribe extends SttTask {
        this._resolve(channel, evt);

        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google', 'speechmatics'].includes(this.vendor) &&
+        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google'].includes(this.vendor) &&
          !this.vendor.startsWith('custom:')) {
          this.logger.debug('TaskTranscribe:_onTranscription - restarting transcribe');
          this._startTranscribing(cs, ep, channel);
@@ -495,47 +496,6 @@ class TaskTranscribe extends SttTask {
    }
  }

-  async _onTranslation(_cs, _ep, channel, evt, _fsEvent) {
-    this.logger.debug({evt}, 'TaskTranscribe:_onTranslation');
-    if (this.translationHook && evt.results?.length > 0) {
-      try {
-        const b3 = this.getTracingPropagation();
-        const httpHeaders = b3 && {b3};
-        const payload = {
-          ...this.cs.callInfo,
-          ...httpHeaders,
-          translation: {
-            channel,
-            language: evt.language,
-            translation: evt.results[0].content
-          }
-        };
-
-        this.logger.debug({payload}, 'sending translationHook');
-        const json = await this.cs.requestor.request('verb:hook', this.translationHook, payload);
-        this.logger.info({json}, 'completed translationHook');
-        if (json && Array.isArray(json) && !this.parentTask) {
-          const makeTask = require('./make_task');
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          if (tasks && tasks.length > 0) {
-            this.logger.info({tasks: tasks}, `${this.name} replacing application with ${tasks.length} tasks`);
-            this.cs.replaceApplication(tasks);
-          }
-        }
-      } catch (err) {
-        this.logger.info(err, 'TranscribeTask:_onTranslation error');
-      }
-      if (this.parentTask) {
-        this.parentTask.emit('translation', evt);
-      }
-    }
-    if (this.killed) {
-      this.logger.debug('TaskTranscribe:_onTranslation exiting after receiving final transcription');
-      this._clearTimer();
-      this.notifyTaskDone();
-    }
-  }
-
  async _resolve(channel, evt) {
    if (evt.is_final) {
      /* we've got a final transcript, so end the otel child span for this channel */
@@ -641,6 +601,7 @@ class TaskTranscribe extends SttTask {
        bugname: this.bugname
      })
        .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
+      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
      try {
        this.notifyError({ msg: 'ASR error',
          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'in progress'});
@@ -651,6 +612,7 @@ class TaskTranscribe extends SttTask {
        }
        this[`_speechHandlersSet_${channel}`] = false;
        this._startTranscribing(cs, _ep, channel);
+        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
        return true;
      } catch (error) {
        this.notifyError({ msg: 'ASR error',
@@ -715,7 +677,7 @@ class TaskTranscribe extends SttTask {
    this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsInfo');
  }

-  async _onSpeechmaticsError(cs, _ep, evt) {
+  async _onSpeechmaticsErrror(cs, _ep, evt) {
    // eslint-disable-next-line no-unused-vars
    const {message, ...e} = evt;
    this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
--- a/lib/tasks/tts-task.js
+++ b/lib/tasks/tts-task.js
@@ -1,7 +1,6 @@
 const Task = require('./task');
 const { TaskPreconditions } = require('../utils/constants');
 const { SpeechCredentialError } = require('../utils/error');
-const dbUtils = require('../utils/db-utils');

 class TtsTask extends Task {

@@ -13,11 +12,11 @@ class TtsTask extends Task {

    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
    /**
-     * Task use taskIncludeSynthesizer to identify
-     * if taskIncludeSynthesizer === true, use label from verb.synthesizer, even it's empty
-     * if taskIncludeSynthesizer === false, use label from application.synthesizer
+     * Task use taskInlcudeSynthesizer to identify
+     * if taskInlcudeSynthesizer === true, use label from verb.synthesizer, even it's empty
+     * if taskInlcudeSynthesizer === false, use label from application.synthesizer
     */
-    this.taskIncludeSynthesizer = !!this.data.synthesizer;
+    this.taskInlcudeSynthesizer = !!this.data.synthesizer;
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
    this.options = this.synthesizer.options || {};
@@ -44,94 +43,9 @@ class TtsTask extends Task {
    }
  }

-  getTtsVendorData(cs) {
-    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
-      this.synthesizer.vendor :
-      cs.speechSynthesisVendor;
-    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
-      this.synthesizer.language :
-      cs.speechSynthesisLanguage ;
-    const voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
-      this.synthesizer.voice :
-      cs.speechSynthesisVoice;
-    const label = this.taskIncludeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
-    return {vendor, language, voice, label};
-  }
-
-  async setTtsStreamingChannelVars(vendor, language, voice, credentials, ep) {
-    const {api_key, model_id, custom_tts_streaming_url, auth_token} = credentials;
-    const {stability, similarity_boost, use_speaker_boost, style} = this.options;
-    let obj;
-
-    this.logger.debug({credentials},
-      `setTtsStreamingChannelVars: vendor: ${vendor}, language: ${language}, voice: ${voice}`);
-
-    switch (vendor) {
-      case 'deepgram':
-        obj = {
-          DEEPGRAM_API_KEY: api_key,
-          DEEPGRAM_TTS_STREAMING_MODEL: voice
-        };
-        break;
-      case 'cartesia':
-        obj = {
-          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':
-        obj = {
-          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(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})
-        };
-        break;
-      case 'rimelabs':
-        const {
-          pauseBetweenBrackets, phonemizeBetweenBrackets, inlineSpeedAlpha, speedAlpha, reduceLatency
-        } = this.options;
-        obj = {
-          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}),
-          ...(phonemizeBetweenBrackets &&
-            {RIMELABS_TTS_STREAMING_PHONEMIZE_BETWEEN_BRACKETS: phonemizeBetweenBrackets}),
-          ...(inlineSpeedAlpha && {RIMELABS_TTS_STREAMING_INLINE_SPEED_ALPHA: inlineSpeedAlpha}),
-          ...(speedAlpha && {RIMELABS_TTS_STREAMING_SPEED_ALPHA: speedAlpha}),
-          ...(reduceLatency && {RIMELABS_TTS_STREAMING_REDUCE_LATENCY: reduceLatency})
-        };
-        break;
-      default:
-        if (vendor.startsWith('custom:')) {
-          const use_tls = custom_tts_streaming_url.startsWith('wss://');
-          obj = {
-            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
-          };
-        } else {
-          throw new Error(`vendor ${vendor} is not supported for tts streaming yet`);
-        }
-    }
-    this.logger.info({vendor, credentials, obj}, 'setTtsStreamingChannelVars');
-
-    await ep.set(obj);
-  }
-
  async _synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label, preCache = false}) {
    const {srf, accountSid:account_sid} = cs;
+    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
    const {writeAlerts, AlertType, stats} = srf.locals;
    const {synthAudio} = srf.locals.dbHelpers;
    const engine = this.synthesizer.engine || cs.synthesizer?.engine || 'neural';
@@ -181,18 +95,6 @@ class TtsTask extends Task {
    } else if (vendor === 'playht') {
      credentials = credentials || {};
      credentials.voice_engine = this.options.voice_engine || credentials.voice_engine;
-    } else if (vendor === 'google' && typeof voice === 'string' && voice.startsWith('custom_')) {
-      const {lookupGoogleCustomVoice} = dbUtils(this.logger, cs.srf);
-      const arr = /custom_(.*)/.exec(voice);
-      if (arr) {
-        const google_custom_voice_sid = arr[1];
-        const [custom_voice] = await lookupGoogleCustomVoice(google_custom_voice_sid);
-        if (custom_voice.use_voice_cloning_key) {
-          voice = {
-            voice_cloning_key: custom_voice.voice_cloning_key,
-          };
-        }
-      }
    }

    /**
@@ -226,6 +128,8 @@ class TtsTask extends Task {
        }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
        throw new SpeechCredentialError('no provisioned speech credentials for TTS');
      }
+      // synthesize all of the text elements
+      let lastUpdated = false;

      /* produce an audio segment from the provided text */
      const generateAudio = async(text) => {
@@ -265,6 +169,10 @@ class TtsTask extends Task {
              this.otelSpan.end();
              this.otelSpan = null;
            }
+            if (!servedFromCache && !lastUpdated) {
+              lastUpdated = true;
+              updateSpeechCredentialLastUsed(credentials.speech_credential_sid).catch(() => {/* logged error */});
+            }
            if (!servedFromCache && rtt && !preCache  && !this._disableTracing) {
              this.notifyStatus({
                event: 'synthesized-audio',
--- a/lib/utils/action-hook-delay.js
+++ b/lib/utils/action-hook-delay.js
@@ -126,12 +126,7 @@ class ActionHookDelayProcessor extends Emitter {
    try {
      this._taskInProgress = makeTask(this.logger, t[0]);
      this._taskInProgress.disableTracing = true;
-      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._taskInProgress.exec(this.cs, {ep: this.ep});
    } catch (err) {
      this.logger.info(err, 'ActionHookDelayProcessor#_onNoResponseTimer: error starting action');
      this._taskInProgress = null;
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -153,7 +153,7 @@ class Amd extends Emitter {
      const wordCount = t.alternatives[0].transcript.split(' ').length;
      const final = t.is_final;

-      const foundHint = hints.find((h) =>  t.alternatives[0].transcript.toLowerCase().includes(h.toLowerCase()));
+      const foundHint = hints.find((h) =>  t.alternatives[0].transcript.includes(h));
      if (foundHint) {
        /* we detected a common voice mail greeting */
        this.logger.debug(`Amd:evaluateTranscription: found hint ${foundHint}`);
--- a/lib/utils/background-task-manager.js
+++ b/lib/utils/background-task-manager.js
@@ -46,9 +46,6 @@ class BackgroundTaskManager extends Emitter {
      case 'transcribe':
        task = await this._initTranscribe(opts);
        break;
-      case 'ttsStream':
-        task = await this._initTtsStream(opts);
-        break;
      default:
        break;
    }
@@ -79,7 +76,7 @@ class BackgroundTaskManager extends Emitter {
  }

  // Initiate Listen
-  async _initListen(opts, bugname = 'jambonz-background-listen', ignoreCustomerData = true, type = 'listen') {
+  async _initListen(opts, bugname = 'jambonz-background-listen', ignoreCustomerData = false, type = 'listen') {
    let task;
    try {
      const t = normalizeJambones(this.logger, [opts]);
@@ -103,7 +100,6 @@ class BackgroundTaskManager extends Emitter {
  async _initBargeIn(opts) {
    let task;
    try {
-      const copy = JSON.parse(JSON.stringify(opts));
      const t = normalizeJambones(this.logger, [opts]);
      task = makeTask(this.logger, t[0]);
      task
@@ -122,7 +118,7 @@ class BackgroundTaskManager extends Emitter {
          if (task.sticky && !this.cs.callGone && !this.cs._stopping) {
            this.logger.info('BackgroundTaskManager:_initBargeIn: restarting background bargeIn');
            this._bargeInHandled = false;
-            this.newTask('bargeIn', copy, true);
+            this.newTask('bargeIn', opts, true);
          }
          return;
        })
@@ -177,25 +173,6 @@ class BackgroundTaskManager extends Emitter {
    return task;
  }

-  // Initiate Tts Stream
-  async _initTtsStream(opts) {
-    let task;
-    try {
-      const t = normalizeJambones(this.logger, [opts]);
-      task = makeTask(this.logger, t[0]);
-      const resources = await this.cs._evaluatePreconditions(task);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-ttsStream:${task.summary}`);
-      task.span = span;
-      task.ctx = ctx;
-      task.exec(this.cs, resources)
-        .then(this._taskCompleted.bind(this, 'ttsStream', task))
-        .catch(this._taskError.bind(this, 'ttsStream', task));
-    } catch (err) {
-      this.logger.info(err, 'BackgroundTaskManager:_initTtsStream - Error creating ttsStream task');
-    }
-    return task;
-  }
-
  _taskCompleted(type, task) {
    this.logger.debug({type, task}, `BackgroundTaskManager:_taskCompleted: task completed, sticky: ${task.sticky}`);
    task.removeAllListeners();
--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -28,7 +28,6 @@
    "SipRedirect": "sip:redirect",
    "Say": "say",
    "SayLegacy": "say:legacy",
-    "Stream": "stream",
    "Tag": "tag",
    "Transcribe": "transcribe"
  },
@@ -130,7 +129,6 @@
  },
  "SpeechmaticsTranscriptionEvents": {
    "Transcription": "speechmatics_transcribe::transcription",
-    "Translation": "speechmatics_transcribe::translation",
    "Info": "speechmatics_transcribe::info",
    "RecognitionStarted": "speechmatics_transcribe::recognition_started",
    "ConnectFailure": "speechmatics_transcribe::connect_failed",
@@ -176,20 +174,6 @@
    "Disconnect": "openai_s2s::disconnect",
    "ServerEvent": "openai_s2s::server_event"
  },
-  "LlmEvents_VoiceAgent": {
-    "Error": "error",
-    "Connect": "voice_agent_s2s::connect",
-    "ConnectFailure": "voice_agent_s2s::connect_failed",
-    "Disconnect": "voice_agent_s2s::disconnect",
-    "ServerEvent": "voice_agent_s2s::server_event"
-  },
-  "LlmEvents_Ultravox": {
-    "Error": "error",
-    "Connect": "ultravox_s2s::connect",
-    "ConnectFailure": "ultravox_s2s::connect_failed",
-    "Disconnect": "ultravox_s2s::disconnect",
-    "ServerEvent": "ultravox_s2s::server_event"
-  },
  "QueueResults": {
    "Bridged": "bridged",
    "Error": "error",
@@ -204,8 +188,7 @@
  },
  "KillReason": {
    "Hangup": "hangup",
-    "Replaced": "replaced",
-    "MediaTimeout": "media_timeout"
+    "Replaced": "replaced"
  },
  "HookMsgTypes": [
    "session:new",
@@ -219,8 +202,6 @@
    "verb:status",
    "llm:event",
    "llm:tool-call",
-    "tts:tokens-result",
-    "tts:streaming-event",
    "jambonz:error"
  ],
  "RecordState": {
@@ -239,59 +220,7 @@
    "ToneTimeout": "amd_tone_timeout",
    "Stopped": "amd_stopped"
  },
-  "MediaPath": {
-    "NoMedia": "no-media",
-    "PartialMedia": "partial-media",
-    "FullMedia": "full-media"
-  },
-  "DeepgramTtsStreamingEvents": {
-    "Empty": "deepgram_tts_streaming::empty",
-    "ConnectFailure": "deepgram_tts_streaming::connect_failed",
-    "Connect": "deepgram_tts_streaming::connect"
-  },
-  "CartesiaTtsStreamingEvents": {
-    "Empty": "cartesia_tts_streaming::empty",
-    "ConnectFailure": "cartesia_tts_streaming::connect_failed",
-    "Connect": "cartesia_tts_streaming::connect"
-  },
-  "ElevenlabsTtsStreamingEvents": {
-    "Empty": "elevenlabs_tts_streaming::empty",
-    "ConnectFailure": "elevenlabs_tts_streaming::connect_failed",
-    "Connect": "elevenlabs_tts_streaming::connect"
-  },
-  "RimelabsTtsStreamingEvents": {
-    "Empty": "rimelabs_tts_streaming::empty",
-    "ConnectFailure": "rimelabs_tts_streaming::connect_failed",
-    "Connect": "rimelabs_tts_streaming::connect"
-  },
-  "CustomTtsStreamingEvents": {
-    "Empty": "custom_tts_streaming::empty",
-    "ConnectFailure": "custom_tts_streaming::connect_failed",
-    "Connect": "custom_tts_streaming::connect"
-  },
-  "TtsStreamingEvents": {
-    "Empty": "tts_streaming::empty",
-    "Pause": "tts_streaming::pause",
-    "Resume": "tts_streaming::resume",
-    "ConnectFailure": "tts_streaming::connect_failed"
-  },
-  "TtsStreamingConnectionStatus": {
-    "NotConnected": "not_connected",
-    "Connected": "connected",
-    "Connecting": "connecting",
-    "Failed": "failed"
-  },
  "MAX_SIMRINGS": 10,
  "BONG_TONE": "tone_stream://v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)",
-  "FS_UUID_SET_NAME": "fsUUIDs",
-  "SystemState" : {
-    "Online": "ONLINE",
-    "Offline": "OFFLINE",
-    "GracefulShutdownInProgress":"SHUTDOWN_IN_PROGRESS"
-  },
-  "FEATURE_SERVER" : "feature-server",
-  "WS_CLOSE_CODES": {
-    "NormalClosure": 1000,
-    "GoingAway": 1001
-  }
+  "FS_UUID_SET_NAME": "fsUUIDs"
 }
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -105,13 +105,6 @@ const speechMapper = (cred) => {
      obj.voice_engine = o.voice_engine;
      obj.options = o.options;
    }
-    else if ('cartesia' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.model_id = o.model_id;
-      obj.embedding = o.embedding;
-      obj.options = o.options;
-    }
    else if ('rimelabs' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
@@ -143,7 +136,6 @@ const speechMapper = (cred) => {
      obj.auth_token = o.auth_token;
      obj.custom_stt_url = o.custom_stt_url;
      obj.custom_tts_url = o.custom_tts_url;
-      obj.custom_tts_streaming_url = o.custom_tts_streaming_url;
    }
  } catch (err) {
    console.log(err);
@@ -223,23 +215,11 @@ module.exports = (logger, srf) => {
    }
  };

-  const lookupVoipCarrierBySid = async(sid) => {
-    const pp = pool.promise();
-    try {
-      const [r] = await pp.query('SELECT * FROM voip_carriers WHERE voip_carrier_sid = ?', [sid]);
-      return r;
-
-    } catch (err) {
-      logger.error({err}, `lookupVoipCarrierBySid: Error ${sid}`);
-    }
-  };
-
  return {
    lookupAccountDetails,
    updateSpeechCredentialLastUsed,
    lookupCarrier,
    lookupCarrierByPhoneNumber,
-    lookupGoogleCustomVoice,
-    lookupVoipCarrierBySid
+    lookupGoogleCustomVoice
  };
 };
--- a/lib/utils/error.js
+++ b/lib/utils/error.js
@@ -1,33 +1,9 @@
-class NonFatalTaskError extends Error {
+class SpeechCredentialError extends Error {
  constructor(msg) {
    super(msg);
  }
 }

-class SpeechCredentialError extends NonFatalTaskError {
-  constructor(msg) {
-    super(msg);
-  }
-}
-
-class PlayFileNotFoundError extends NonFatalTaskError {
-  constructor(url) {
-    super('File not found');
-    this.url = url;
-  }
-}
-
-class HTTPResponseError extends Error {
-  constructor(statusCode) {
-    super('Unexpected HTTP Response');
-    delete this.stack;
-    this.statusCode = statusCode;
-  }
-}
-
 module.exports = {
-  SpeechCredentialError,
-  NonFatalTaskError,
-  PlayFileNotFoundError,
-  HTTPResponseError
+  SpeechCredentialError
 };
--- a/lib/utils/http-requestor.js
+++ b/lib/utils/http-requestor.js
@@ -16,7 +16,6 @@ const {
  NODE_ENV,
  HTTP_USER_AGENT_HEADER,
 } = require('../config');
-const {HTTPResponseError} = require('./error');

 const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');

@@ -191,7 +190,8 @@ class HttpRequestor extends BaseRequestor {
        followRedirects: false
      });
      if (![200, 202, 204].includes(statusCode)) {
-        const err = new HTTPResponseError(statusCode);
+        const err = new Error();
+        err.statusCode = statusCode;
        throw err;
      }
      if (headers['content-type']?.includes('application/json')) {
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -199,8 +199,7 @@ function installSrfLocals(srf, logger) {
  } = require('@jambonz/speech-utils')({}, logger);
  const {
    writeAlerts,
-    AlertType,
-    writeSystemAlerts
+    AlertType
  } = require('@jambonz/time-series')(logger, {
    host: JAMBONES_TIME_SERIES_HOST,
    commitSize: 50,
@@ -270,8 +269,7 @@ function installSrfLocals(srf, logger) {
    getFreeswitch,
    stats: stats,
    writeAlerts,
-    AlertType,
-    writeSystemAlerts
+    AlertType
  };

  if (localIp) {
--- a/lib/utils/network.js
+++ b/lib/utils/network.js
@@ -1,32 +0,0 @@
-
-/**
- * Parses a list of hostport entries and selects the first one that matches the specified protocol,
- * excluding any entries with the localhost IP address ('127.0.0.1').
- *
- * Each hostport entry should be in the format: 'protocol/ip:port'
- *
- * @param {Object} logger - A logging object with a 'debug' method for logging debug messages.
- * @param {string} hostport - A comma-separated string containing hostport entries.
- * @param {string} protocol - The protocol to match (e.g., 'udp', 'tcp').
- * @returns {Array} An array containing:
- * 0: protocol
- * 1: ip address
- * 2: port
- */
-const selectHostPort = (logger, hostport, protocol) => {
-  logger.debug(`selectHostPort: ${hostport}, ${protocol}`);
-  const sel = hostport
-    .split(',')
-    .map((hp) => {
-      const arr = /(.*)\/(.*):(.*)/.exec(hp);
-      return [arr[1], arr[2], arr[3]];
-    })
-    .filter((hp) => {
-      return hp[0] === protocol && hp[1] !== '127.0.0.1';
-    });
-  return sel[0];
-};
-
-module.exports = {
-  selectHostPort
-};
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -1,5 +1,5 @@
 const Emitter = require('events');
-const {CallStatus, MediaPath} = require('./constants');
+const {CallStatus} = require('./constants');
 const SipError = require('drachtio-srf').SipError;
 const {TaskPreconditions, CallDirection} = require('../utils/constants');
 const CallInfo = require('../session/call-info');
@@ -17,9 +17,7 @@ const HttpRequestor = require('./http-requestor');
 const WsRequestor = require('./ws-requestor');
 const {makeOpusFirst} = require('./sdp-utils');
 const {
-  JAMBONES_USE_FREESWITCH_TIMER_FD,
-  JAMBONES_MEDIA_TIMEOUT_MS,
-  JAMBONES_MEDIA_HOLD_TIMEOUT_MS
+  JAMBONES_USE_FREESWITCH_TIMER_FD
 } = require('../config');

 class SingleDialer extends Emitter {
@@ -319,19 +317,14 @@ class SingleDialer extends Emitter {
  /**
   * kill the call in progress or the stable dialog, whichever we have
   */
-  async kill(Reason) {
+  async kill() {
    this.killed = true;
    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');
      this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
-      const headers = {
-        ...(Reason && {'X-Reason': Reason})
-      };
-      this.dlg.destroy({
-        headers
-      });
+      this.dlg.destroy();
    }
    if (this.ep) {
      this.logger.debug(`SingleDialer:kill - deleting endpoint ${this.ep.uuid}`);
@@ -342,22 +335,11 @@ class SingleDialer extends Emitter {
  _configMsEndpoint() {
    const opts = {
      ...(this.onHoldMusic && {holdMusic: `shout://${this.onHoldMusic.replace(/^https?:\/\//, '')}`}),
-      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'}),
-      ...(JAMBONES_MEDIA_TIMEOUT_MS && {media_timeout: JAMBONES_MEDIA_TIMEOUT_MS}),
-      ...(JAMBONES_MEDIA_HOLD_TIMEOUT_MS && {media_hold_timeout: JAMBONES_MEDIA_HOLD_TIMEOUT_MS})
+      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'})
    };
    if (Object.keys(opts).length > 0) {
      this.ep.set(opts);
    }
-    if (this.dialTask?.inbandDtmfEnabled && !this.ep.inbandDtmfEnabled) {
-      // https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Modules/mod-dptools/6587132/#0-about
-      try {
-        this.ep.execute('start_dtmf');
-        this.ep.inbandDtmfEnabled = true;
-      } catch (err) {
-        this.logger.info(err, 'place-outdial:_configMsEndpoint - error enable inband DTMF');
-      }
-    }
  }

  /**
@@ -399,8 +381,7 @@ class SingleDialer extends Emitter {
        callInfo: this.callInfo,
        accountInfo: this.accountInfo,
        tasks,
-        rootSpan: this.rootSpan,
-        req: this.req
+        rootSpan: this.rootSpan
      });
      await cs.exec();

@@ -474,26 +455,21 @@ class SingleDialer extends Emitter {
    return cs;
  }

-  async releaseMediaToSBC(remoteSdp, localSdp, releaseMediaEntirely) {
+  async releaseMediaToSBC(remoteSdp, localSdp) {
    assert(this.dlg && this.dlg.connected && this.ep && typeof remoteSdp === 'string');
    const sdp = stripCodecs(this.logger, remoteSdp, localSdp) || remoteSdp;
    await this.dlg.modify(sdp, {
      headers: {
-        'X-Reason': releaseMediaEntirely ? 'release-media-entirely' : 'release-media'
+        'X-Reason': 'release-media'
      }
    });
-    try {
-      await this.ep.destroy();
-    } catch (err) {
-      this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint');
-    }
-    this.ep = null;
+    this.ep.destroy()
+      .then(() => this.ep = null)
+      .catch((err) => this.logger.error({err}, 'SingleDialer:releaseMediaToSBC: Error destroying endpoint'));
  }

-  async reAnchorMedia(currentMediaRoute = MediaPath.PartialMedia) {
+  async reAnchorMedia() {
    assert(this.dlg && this.dlg.connected && !this.ep);
-
-    this.logger.debug('SingleDialer:reAnchorMedia: re-anchoring media after partial media');
    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
    this._configMsEndpoint();
    await this.dlg.modify(this.ep.local.sdp, {
@@ -501,11 +477,6 @@ class SingleDialer extends Emitter {
        'X-Reason': 'anchor-media'
      }
    });
-
-    if (currentMediaRoute === MediaPath.NoMedia) {
-      this.logger.debug('SingleDialer:reAnchorMedia: repoint endpoint after no media');
-      await this.ep.modify(this.dlg.remote.sdp);
-    }
  }

  _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -46,24 +46,12 @@ module.exports = (logger) => {
            const {srf} = require('../..');
            srf.locals.publicIp = publicIp;
          })
-          .on(LifeCycleEvents.ScaleIn, async() => {
+          .on(LifeCycleEvents.ScaleIn, () => {
            logger.info('AWS scale-in notification: begin drying up calls');
            dryUpCalls = true;
            lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;

            const {srf} = require('../..');
-            const {writeSystemAlerts} = srf.locals;
-            if (writeSystemAlerts) {
-              const {SystemState, FEATURE_SERVER} = require('./constants');
-              await 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);

            // if we have zero calls, we can complete the scale-in right
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -43,8 +43,7 @@ const stickyVars = {
    'DEEPGRAM_SPEECH_UTTERANCE_END_MS',
    'DEEPGRAM_SPEECH_VAD_TURNOFF',
    'DEEPGRAM_SPEECH_TAG',
-    'DEEPGRAM_SPEECH_MODEL_VERSION',
-    'DEEPGRAM_SPEECH_FILLER_WORDS'
+    'DEEPGRAM_SPEECH_MODEL_VERSION'
  ],
  aws: [
    'AWS_VOCABULARY_NAME',
@@ -110,8 +109,6 @@ const stickyVars = {
    'SPEECHMATICS_HOST',
    'SPEECHMATICS_PATH',
    'SPEECHMATICS_SPEECH_HINTS',
-    'SPEECHMATICS_TRANSLATION_LANGUAGES',
-    'SPEECHMATICS_TRANSLATION_PARTIALS'
  ]
 };

@@ -186,10 +183,7 @@ const selectDefaultGoogleModel = (task, language, version) => {
    (useV2 ? 'long' : 'latest_long');
 };
 const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor) => {
-  if (bufferedTranscripts.length === 1) {
-    bufferedTranscripts[0].is_final = true;
-    return bufferedTranscripts[0];
-  }
+  if (bufferedTranscripts.length === 1) return bufferedTranscripts[0];
  let totalConfidence = 0;
  const finalTranscript = bufferedTranscripts.reduce((acc, evt) => {
    totalConfidence += evt.alternatives[0].confidence;
@@ -209,7 +203,7 @@ const consolidateTranscripts = (bufferedTranscripts, channel, language, vendor)
    const lastChar = acc.alternatives[0].transcript.slice(-1);
    const firstChar = newTranscript.charAt(0);

-    if (vendor === 'speechmatics' || (lastChar.match(/\d/) && firstChar.match(/\d/))) {
+    if (lastChar.match(/\d/) && firstChar.match(/\d/)) {
      acc.alternatives[0].transcript += newTranscript;
    } else {
      acc.alternatives[0].transcript += ` ${newTranscript}`;
@@ -813,9 +807,7 @@ module.exports = (logger) => {
        ...(deepgramOptions.tag) &&
          {DEEPGRAM_SPEECH_TAG: deepgramOptions.tag},
        ...(deepgramOptions.version) &&
-          {DEEPGRAM_SPEECH_MODEL_VERSION: deepgramOptions.version},
-        ...(deepgramOptions.fillerWords) &&
-          {DEEPGRAM_SPEECH_FILLER_WORDS: deepgramOptions.fillerWords}
+          {DEEPGRAM_SPEECH_MODEL_VERSION: deepgramOptions.version}
      };
    }
    else if ('soniox' === vendor) {
@@ -945,48 +937,11 @@ module.exports = (logger) => {
      };
    }
    else if ('speechmatics' === vendor) {
-      const {speechmaticsOptions = {}} = rOpts;
      opts = {
        ...opts,
        ...(sttCredentials.api_key) && {SPEECHMATICS_API_KEY: sttCredentials.api_key},
        ...(sttCredentials.speechmatics_stt_uri) && {SPEECHMATICS_HOST: sttCredentials.speechmatics_stt_uri},
        ...(rOpts.hints?.length > 0 && {SPEECHMATICS_SPEECH_HINTS: rOpts.hints.join(',')}),
-        ...(speechmaticsOptions.translation_config &&
-          {
-            SPEECHMATICS_TRANSLATION_LANGUAGES: speechmaticsOptions.translation_config.target_languages.join(','),
-            SPEECHMATICS_TRANSLATION_PARTIALS: speechmaticsOptions.translation_config.enable_partials ? 1 : 0
-          }
-        ),
-        ...(speechmaticsOptions.transcription_config?.domain &&
-          {SPEECHMATICS_DOMAIN: speechmaticsOptions.transcription_config.domain}),
-        ...{SPEECHMATICS_MAX_DELAY: speechmaticsOptions.transcription_config?.max_delay || 0.7},
-        ...{SPEECHMATICS_MAX_DELAY_MODE: speechmaticsOptions.transcription_config?.max_delay_mode || 'flexible'},
-        ...(speechmaticsOptions.transcription_config?.diarization &&
-            {SPEECHMATICS_DIARIZATION: speechmaticsOptions.transcription_config.diarization}),
-        ...(speechmaticsOptions.transcription_config?.speaker_diarization_config?.speaker_sensitivity &&
-          {SPEECHMATICS_DIARIZATION_SPEAKER_SENSITIVITY:
-            speechmaticsOptions.transcription_config.speaker_diarization_config.speaker_sensitivity}),
-        ...(speechmaticsOptions.transcription_config?.speaker_diarization_config?.max_speakers &&
-          {SPEECHMATICS_DIARIZATION_MAX_SPEAKERS:
-            speechmaticsOptions.transcription_config.speaker_diarization_config.max_speakers}),
-        ...(speechmaticsOptions.transcription_config?.output_locale &&
-          {SPEECHMATICS_OUTPUT_LOCALE: speechmaticsOptions.transcription_config.output_locale}),
-        ...(speechmaticsOptions.transcription_config?.punctuation_overrides?.permitted_marks &&
-          {SPEECHMATICS_PUNCTUATION_ALLOWED:
-            speechmaticsOptions.transcription_config.punctuation_overrides.permitted_marks.join(',')}),
-        ...(speechmaticsOptions.transcription_config?.punctuation_overrides?.sensitivity &&
-          {SPEECHMATICS_PUNCTUATION_SENSITIVITY:
-            speechmaticsOptions.transcription_config?.punctuation_overrides?.sensitivity}),
-        ...(speechmaticsOptions.transcription_config?.operating_point &&
-          {SPEECHMATICS_OPERATING_POINT: speechmaticsOptions.transcription_config.operating_point}),
-        ...(speechmaticsOptions.transcription_config?.enable_entities &&
-          {SPEECHMATICS_ENABLE_ENTTIES: speechmaticsOptions.transcription_config.enable_entities}),
-        ...(speechmaticsOptions.transcription_config?.audio_filtering_config?.volume_threshold &&
-          {SPEECHMATICS_VOLUME_THRESHOLD:
-            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})
      };
    }
    else if (vendor.startsWith('custom:')) {
--- a/lib/utils/tts-streaming-buffer.js
+++ b/lib/utils/tts-streaming-buffer.js
@@ -1,327 +0,0 @@
-const Emitter = require('events');
-const assert = require('assert');
-const {
-  TtsStreamingEvents,
-  TtsStreamingConnectionStatus
-} = require('../utils/constants');
-const MAX_CHUNK_SIZE = 1800;
-const HIGH_WATER_BUFFER_SIZE = 1000;
-const LOW_WATER_BUFFER_SIZE = 200;
-const TIMEOUT_RETRY_MSECS = 3000;
-
-class TtsStreamingBuffer extends Emitter {
-  constructor(cs) {
-    super();
-    this.cs = cs;
-    this.logger = cs.logger;
-
-    this.tokens = '';
-    this.eventHandlers = [];
-    this._isFull = false;
-    this._connectionStatus = TtsStreamingConnectionStatus.NotConnected;
-    this._flushPending = false;
-    this.timer = null;
-  }
-
-  get isEmpty() {
-    return this.tokens.length === 0;
-  }
-
-  get isFull() {
-    return this._isFull;
-  }
-
-  get size() {
-    return this.tokens.length;
-  }
-
-  get ep() {
-    return this.cs?.ep;
-  }
-
-  async start() {
-    assert.ok(
-      this._connectionStatus === TtsStreamingConnectionStatus.NotConnected,
-      'TtsStreamingBuffer:start already started, or has failed');
-
-    this.vendor = this.cs.getTsStreamingVendor();
-    if (!this.vendor) {
-      this.logger.info('TtsStreamingBuffer:start No TTS streaming vendor configured');
-      throw new Error('No TTS streaming vendor configured');
-    }
-
-    this.logger.info(`TtsStreamingBuffer:start Connecting to TTS streaming with vendor ${this.vendor}`);
-
-    this._connectionStatus = TtsStreamingConnectionStatus.Connecting;
-    try {
-      if (this.eventHandlers.length === 0) this._initHandlers(this.ep);
-      await  this._api(this.ep, [this.ep.uuid, 'connect']);
-    } catch (err) {
-      this.logger.info({err}, 'TtsStreamingBuffer:start Error connecting to TTS streaming');
-      this._connectionStatus = TtsStreamingConnectionStatus.Failed;
-    }
-  }
-
-  stop() {
-    clearTimeout(this.timer);
-    this.removeCustomEventListeners();
-    if (this.ep) {
-      this._api(this.ep, [this.ep.uuid, 'close'])
-        .catch((err) => this.logger.info({err}, 'TtsStreamingBuffer:kill Error closing TTS streaming'));
-    }
-    this.timer = null;
-    this.tokens = '';
-    this._connectionStatus = TtsStreamingConnectionStatus.NotConnected;
-  }
-
-  /**
-   * Add tokens to the buffer and start feeding them to the endpoint if necessary.
-   */
-  async bufferTokens(tokens) {
-
-    if (this._connectionStatus === TtsStreamingConnectionStatus.Failed) {
-      this.logger.info('TtsStreamingBuffer:bufferTokens TTS streaming connection failed, rejecting request');
-      return {status: 'failed', reason: `connection to ${this.vendor} failed`};
-    }
-
-    const displayedTokens = tokens.length <= 40 ? tokens : tokens.substring(0, 40);
-    const totalLength = tokens.length;
-
-    /* if we crossed the high water mark, reject the request */
-    if (this.tokens.length + totalLength > HIGH_WATER_BUFFER_SIZE) {
-      this.logger.info(
-        `TtsStreamingBuffer throttling: buffer is full, rejecting request to buffer ${totalLength} tokens`);
-
-      if (!this._isFull) {
-        this._isFull = true;
-        this.emit(TtsStreamingEvents.Pause);
-      }
-      return {status: 'failed', reason: 'full'};
-    }
-
-    this.logger.debug(
-      `TtsStreamingBuffer:bufferTokens "${displayedTokens}" (length: ${totalLength}), starting? ${this.isEmpty}`
-    );
-    this.tokens += (tokens || '');
-
-    await this._feedTokens();
-
-    return {status: 'ok'};
-  }
-
-  flush() {
-    this.logger.debug('TtsStreamingBuffer:flush');
-    if (this._connectionStatus === TtsStreamingConnectionStatus.Connecting) {
-      this.logger.debug('TtsStreamingBuffer:flush TTS stream is not quite ready - wait for connect');
-      this._flushPending = true;
-      return;
-    }
-    else if (this._connectionStatus === TtsStreamingConnectionStatus.Connected) {
-
-      if (this.size === 0) {
-        this._doFlush();
-      }
-      else {
-        /* we have tokens queued, so flush after they have been sent */
-        this._pendingFlush = true;
-      }
-    }
-  }
-
-  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) => this.logger.info({err}, 'TtsStreamingBuffer:clear Error clearing TTS streaming'));
-    this.tokens = '';
-    this.timer = null;
-    this._isFull = false;
-  }
-
-  /**
-   * Send tokens to the TTS engine in sentence chunks for best playout
-   */
-  async _feedTokens(handlingTimeout = false) {
-    this.logger.debug({tokens: this.tokens}, '_feedTokens');
-
-    try {
-
-      /* are we in a state where we can feed tokens to the TTS? */
-      if (!this.cs.isTtsStreamOpen || !this.ep || !this.tokens) {
-        this.logger.debug('TTS stream is not open or no tokens to send');
-        return this.tokens?.length || 0;
-      }
-
-      if (this._connectionStatus === TtsStreamingConnectionStatus.NotConnected ||
-        this._connectionStatus === TtsStreamingConnectionStatus.Failed) {
-        this.logger.debug('TtsStreamingBuffer:_feedTokens TTS stream is not connected');
-        return;
-      }
-
-      if (this._connectionStatus === TtsStreamingConnectionStatus.Connecting) {
-        this.logger.debug('TtsStreamingBuffer:_feedTokens TTS stream is not ready, waiting for connect');
-        return;
-      }
-
-      /* must send at least one sentence */
-      const limit = Math.min(MAX_CHUNK_SIZE, this.tokens.length);
-      let chunkEnd = findSentenceBoundary(this.tokens, limit);
-
-      if (chunkEnd <= 0) {
-        if (handlingTimeout) {
-          /* on a timeout we've left some tokens sitting around, so be more aggressive now in sending them */
-          chunkEnd = findWordBoundary(this.tokens, limit);
-          if (chunkEnd <= 0) {
-            this.logger.debug('TtsStreamingBuffer:_feedTokens: no word boundary found');
-            this._setTimerIfNeeded();
-            return;
-          }
-        }
-        else {
-          /* if we just received tokens, we wont send unless we have at least a full sentence */
-          this.logger.debug('TtsStreamingBuffer:_feedTokens: no sentence boundary found');
-          this._setTimerIfNeeded();
-          return;
-        }
-      }
-
-      const chunk = this.tokens.slice(0, chunkEnd);
-      this.tokens = this.tokens.slice(chunkEnd);
-
-      /* freeswitch looks for sequence of 2 newlines to determine end of message, so insert a space */
-      const modifiedChunk = chunk.replace(/\n\n/g, '\n \n');
-      await this._api(this.ep, [this.ep.uuid, 'send', modifiedChunk]);
-      this.logger.debug(`TtsStreamingBuffer:_feedTokens: sent ${chunk.length}, remaining: ${this.tokens.length}`);
-
-      if (this._pendingFlush) {
-        this._doFlush();
-        this._pendingFlush = false;
-      }
-
-      if (this.isFull && this.tokens.length <= LOW_WATER_BUFFER_SIZE) {
-        this.logger.info('TtsStreamingBuffer throttling: TTS streaming buffer is no longer full - resuming');
-        this._isFull = false;
-        this.emit(TtsStreamingEvents.Resume);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TtsStreamingBuffer:_feedTokens Error sending TTS chunk');
-      this.tokens = '';
-    }
-
-    return;
-  }
-
-  async _api(ep, args) {
-    const apiCmd = `uuid_${this.vendor.startsWith('custom:') ? 'custom' : this.vendor}_tts_streaming`;
-    const res = await ep.api(apiCmd, `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      this.logger.info({args}, `Error calling ${apiCmd}: ${res.body}`);
-      throw new Error(`Error calling ${apiCmd}: ${res.body}`);
-    }
-  }
-
-  _onConnectFailure(vendor) {
-    this.logger.info(`streaming tts connection failed to ${vendor}`);
-    this._connectionStatus = TtsStreamingConnectionStatus.Failed;
-    this.tokens = '';
-    this.emit(TtsStreamingEvents.ConnectFailure, {vendor});
-  }
-
-  _doFlush() {
-    this._api(this.ep, [this.ep.uuid, 'flush'])
-      .catch((err) => this.logger.info({err},
-        `TtsStreamingBuffer:_doFlush Error flushing TTS streaming: ${JSON.stringify(err)}`));
-  }
-
-  async _onConnect(vendor) {
-    this.logger.info(`streaming tts connection made to ${vendor}`);
-    this._connectionStatus = TtsStreamingConnectionStatus.Connected;
-    if (this.tokens.length > 0) {
-      await this._feedTokens();
-    }
-    if (this._flushPending) {
-      this.flush();
-      this._flushPending = false;
-    }
-  }
-
-  _setTimerIfNeeded() {
-    if (this.tokens.length > 0 && !this.timer) {
-      this.timer = setTimeout(this._onTimeout.bind(this), TIMEOUT_RETRY_MSECS);
-    }
-  }
-
-  _onTimeout() {
-    this.logger.info('TtsStreamingBuffer:_onTimeout');
-    this.timer = null;
-    this._feedTokens(true);
-  }
-
-  _onTtsEmpty(vendor) {
-    this.emit(TtsStreamingEvents.Empty, {vendor});
-  }
-
-  addCustomEventListener(ep, event, handler) {
-    this.eventHandlers.push({ep, event, handler});
-    ep.addCustomEventListener(event, handler);
-  }
-
-  removeCustomEventListeners() {
-    this.eventHandlers.forEach((h) => h.ep.removeCustomEventListener(h.event, h.handler));
-  }
-
-  _initHandlers(ep) {
-    [
-      // DH: add other vendors here as modules are added
-      'deepgram',
-      'cartesia',
-      'elevenlabs',
-      'rimelabs',
-      'custom'
-    ].forEach((vendor) => {
-      const eventClassName = `${vendor.charAt(0).toUpperCase() + vendor.slice(1)}TtsStreamingEvents`;
-      const eventClass = require('../utils/constants')[eventClassName];
-      if (!eventClass) throw new Error(`Event class for vendor ${vendor} not found`);
-
-      this.addCustomEventListener(ep, eventClass.Connect, this._onConnect.bind(this, vendor));
-      this.addCustomEventListener(ep, eventClass.ConnectFailure, this._onConnectFailure.bind(this, vendor));
-      this.addCustomEventListener(ep, eventClass.Empty, this._onTtsEmpty.bind(this, vendor));
-    });
-  }
-}
-
-const findSentenceBoundary = (text, limit) => {
-  // Match traditional sentence boundaries or double newlines
-  const sentenceEndRegex = /[.!?](?=\s|$)|\n\n/g;
-  let lastSentenceBoundary = -1;
-  let match;
-
-  while ((match = sentenceEndRegex.exec(text)) && match.index < limit) {
-    const precedingText = text.slice(0, match.index).trim(); // Extract text before the match and trim whitespace
-    if (precedingText.length > 0) { // Check if there's actual content
-      if (
-        match[0] === '\n\n' || // It's a double newline
-        (match.index === 0 || !/\d$/.test(text[match.index - 1])) // Standard punctuation rules
-      ) {
-        lastSentenceBoundary = match.index + (match[0] === '\n\n' ? 2 : 1); // Include the boundary
-      }
-    }
-  }
-
-  return lastSentenceBoundary;
-};
-
-const findWordBoundary = (text, limit) => {
-  const wordBoundaryRegex = /\s+/g;
-  let lastWordBoundary = -1;
-  let match;
-
-  while ((match = wordBoundaryRegex.exec(text)) && match.index < limit) {
-    lastWordBoundary = match.index;
-  }
-  return lastWordBoundary;
-};
-
-module.exports = TtsStreamingBuffer;
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -1,7 +1,7 @@
 const assert = require('assert');
 const BaseRequestor = require('./base-requestor');
 const short = require('short-uuid');
-const {HookMsgTypes, WS_CLOSE_CODES} = require('./constants.json');
+const {HookMsgTypes} = require('./constants.json');
 const Websocket = require('ws');
 const snakeCaseKeys = require('./snakecase-keys');
 const {
@@ -12,20 +12,6 @@ const {
  JAMBONES_WS_MAX_PAYLOAD,
  HTTP_USER_AGENT_HEADER
 } = require('../config');
-const MTYPE_WANTS_ACK = [
-  'call:status',
-  'verb:status',
-  'jambonz:error',
-  'llm:event',
-  'llm:tool-call',
-  'tts:streaming-event',
-  'tts:tokens-result',
-];
-const MTYPE_NO_DATA = [
-  'llm:tool-output',
-  'tts:flush',
-  'tts:clear'
-];

 class WsRequestor extends BaseRequestor {
  constructor(logger, account_sid, hook, secret) {
@@ -58,7 +44,7 @@ class WsRequestor extends BaseRequestor {
  async request(type, hook, params, httpHeaders = {}) {
    assert(HookMsgTypes.includes(type));
    const url = hook.url || hook;
-    const wantsAck = !MTYPE_WANTS_ACK.includes(type);
+    const wantsAck = !['call:status', 'verb:status', 'jambonz:error', 'llm:event', 'llm:tool-call'].includes(type);

    if (this.maliciousClient) {
      this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
@@ -261,13 +247,13 @@ class WsRequestor extends BaseRequestor {
    }
  }

-  close(code = WS_CLOSE_CODES.NormalClosure) {
+  close() {
    this.closedGracefully = true;
-    this.logger.debug(`WsRequestor:close closing socket with code ${code}`);
+    this.logger.debug('WsRequestor:close closing socket');
    this._stopPingTimer();
    try {
      if (this.ws) {
-        this.ws.close(code);
+        this.ws.close(1000);
        this.ws.removeAllListeners();
        this.ws = null;
      }
@@ -422,7 +408,7 @@ class WsRequestor extends BaseRequestor {

        case 'command':
          assert.ok(command, 'command property not supplied');
-          assert.ok(data || MTYPE_NO_DATA.includes(command), 'data property not supplied');
+          assert.ok(data || command === 'llm:tool-output', 'data property not supplied');
          this._recvCommand(msgid, command, call_sid, queueCommand, tool_call_id, data);
          break;

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.9.3",
+  "version": "0.9.2",
  "main": "app.js",
  "engines": {
    "node": ">= 18.x"
@@ -31,10 +31,10 @@
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "^0.2.7",
    "@jambonz/realtimedb-helpers": "^0.8.8",
-    "@jambonz/speech-utils": "^0.2.1",
+    "@jambonz/speech-utils": "^0.1.20",
    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/verb-specifications": "^0.0.94",
    "@jambonz/time-series": "^0.2.13",
+    "@jambonz/verb-specifications": "^0.0.91",
    "@opentelemetry/api": "^1.8.0",
    "@opentelemetry/exporter-jaeger": "^1.23.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
@@ -47,8 +47,8 @@
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^4.0.1",
-    "drachtio-srf": "^5.0.1",
+    "drachtio-fsmrf": "^3.0.45",
+    "drachtio-srf": "^4.5.35",
    "express": "^4.19.2",
    "express-validator": "^7.0.1",
    "moment": "^2.30.1",
@@ -56,7 +56,7 @@
    "pino": "^8.20.0",
    "polly-ssml-split": "^0.1.0",
    "proxyquire": "^2.1.3",
-    "sdp-transform": "^2.15.0",
+    "sdp-transform": "^2.14.2",
    "short-uuid": "^5.1.0",
    "sinon": "^17.0.1",
    "to-snake-case": "^1.0.0",
--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -351,8 +351,6 @@ speech_credential_sid CHAR(36) NOT NULL,
 model VARCHAR(512) NOT NULL,
 reported_usage ENUM('REPORTED_USAGE_UNSPECIFIED','REALTIME','OFFLINE') DEFAULT 'REALTIME',
 name VARCHAR(64) NOT NULL,
-voice_cloning_key MEDIUMTEXT,
-use_voice_cloning_key BOOLEAN DEFAULT false,
 PRIMARY KEY (google_custom_voice_sid)
 );

--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -42,7 +42,7 @@ services:
        ipv4_address: 172.38.0.7

  drachtio:
-    image: drachtio/drachtio-server:0.8.26
+    image: drachtio/drachtio-server:0.8.25-rc8
    restart: always
    command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
    ports:
@@ -57,7 +57,7 @@ services:
        condition: service_healthy

  freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.9.2-4
+    image: drachtio/drachtio-freeswitch-mrf:latest
    restart: always
    command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
    environment:
--- a/tracer.js
+++ b/tracer.js
@@ -25,38 +25,29 @@ module.exports = (serviceName) => {
      }),
    });

-    const exporters = [];
-
+    let exporter;
    if (OTEL_EXPORTER_JAEGER_AGENT_HOST  || OTEL_EXPORTER_JAEGER_ENDPOINT) {
-      exporters.push(new JaegerExporter());
+      exporter = new JaegerExporter();
    }
-
-    if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporters.push(new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL}));
+    else if (OTEL_EXPORTER_ZIPKIN_URL) {
+      exporter = new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL});
    }
-
-    if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporters.push(new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL}));
-    }
-
-    if (OTEL_EXPORTER_COLLECTOR_URL) {
-      exporters.push(new OTLPTraceExporter({
+    else {
+      exporter = new OTLPTraceExporter({
        url: OTEL_EXPORTER_COLLECTOR_URL
-      }));
+      });
    }

-    exporters.forEach((element) => {
-      provider.addSpanProcessor(new BatchSpanProcessor(element, {
-        // The maximum queue size. After the size is reached spans are dropped.
-        maxQueueSize: 100,
-        // The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
-        maxExportBatchSize: 10,
-        // The interval between two consecutive exports
-        scheduledDelayMillis: 500,
-        // How long the export can run before it is cancelled
-        exportTimeoutMillis: 30000,
-      }));
-    });
+    provider.addSpanProcessor(new BatchSpanProcessor(exporter, {
+      // The maximum queue size. After the size is reached spans are dropped.
+      maxQueueSize: 100,
+      // The maximum batch size of every export. It must be smaller or equal to maxQueueSize.
+      maxExportBatchSize: 10,
+      // The interval between two consecutive exports
+      scheduledDelayMillis: 500,
+      // How long the export can run before it is cancelled
+      exportTimeoutMillis: 30000,
+    }));

    // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
    provider.register();
Author	SHA1	Message	Date
Dave Horton	7521fadbd6	lint	2025-03-05 20:25:25 -05:00
Dave Horton	ef9edd2125	fix crashing bug with uncaught exception in session.updateCall	2025-03-05 20:09:53 -05:00
Quan HL	4dd3a4a4e7	rest:dial support timeLimit (#1024 ) * rest:dial support timeLimit * wip * wip * clear maxCallDuration timer	2025-02-26 20:39:40 +07:00
Hoan Luu Huu	db3f7937e9	rest:dial support timeLimit (#1024 ) * rest:dial support timeLimit * wip * wip * clear maxCallDuration timer	2025-02-26 20:39:15 +07:00
Dave Horton	380cd7f792	patch fix for #962	2025-02-03 09:51:40 -05:00
Hoan Luu Huu	6889f0e4ab	support SIP Privacy (#970 )	2024-11-24 21:43:04 -05:00