wip

lint
wip
2026-01-25 02:07:56 +00:00 · 2024-08-28 15:08:46 -04:00 · 2024-08-27 11:49:49 -04:00 · 2024-08-27 11:43:18 -04:00 · 2024-08-27 10:12:28 -04:00 · 2024-08-22 08:14:51 -04:00
44 changed files with 1106 additions and 2647 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/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ Configuration is provided via environment variables:
 |ENCRYPTION_SECRET| secret for credential encryption(JWT_SECRET is deprecated) |yes|
 |GOOGLE_APPLICATION_CREDENTIALS| path to gcp service key file|yes|
 |HTTP_PORT| tcp port to listen on for API requests from jambonz-api-server|yes|
-|HTTP_IP| IP Address for API requests from jambonz-api-server |no|
 |JAMBONES_GATHER_EARLY_HINTS_MATCH| if true and hints are provided, gather will opportunistically review interim transcripts if possible to reduce ASR latency |no|
 |JAMBONES_FREESWITCH| IP:port:secret for Freeswitch server (e.g. '127.0.0.1:8021:JambonzR0ck$'|yes|
 |JAMBONES_LOGLEVEL| log level for application, 'info' or 'debug'|no|
--- 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,20 +100,8 @@ createHttpListener(logger, srf)
  });


-const monInterval = setInterval(async() => {
+setInterval(() => {
  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');
-  }
 }, 20000);

 const disconnect = () => {
@@ -136,25 +112,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
@@ -73,7 +73,6 @@ const JAMBONES_LOGLEVEL = process.env.JAMBONES_LOGLEVEL || 'info';
 const JAMBONES_INJECT_CONTENT = process.env.JAMBONES_INJECT_CONTENT;

 const PORT = parseInt(process.env.HTTP_PORT, 10) || 3000;
-const HTTP_IP = process.env.HTTP_IP;
 const HTTP_PORT_MAX = parseInt(process.env.HTTP_PORT_MAX, 10);

 const K8S = process.env.K8S;
@@ -108,8 +107,6 @@ const DEEPGRAM_API_KEY = process.env.DEEPGRAM_API_KEY;
 const ANCHOR_MEDIA_ALWAYS = process.env.ANCHOR_MEDIA_ALWAYS;
 const VMD_HINTS_FILE = process.env.VMD_HINTS_FILE;

-const JAMBONES_AWS_TRANSCRIBE_USE_GRPC = process.env.JAMBONES_AWS_TRANSCRIBE_USE_GRPC;
-
 /* security, secrets */
 const LEGACY_CRYPTO = !!process.env.LEGACY_CRYPTO;
 const JWT_SECRET = process.env.JWT_SECRET;
@@ -136,7 +133,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;

 module.exports = {
  JAMBONES_MYSQL_HOST,
@@ -174,7 +170,6 @@ module.exports = {
  JAMBONES_CLUSTER_ID,
  PORT,
  HTTP_PORT_MAX,
-  HTTP_IP,
  K8S,
  K8S_SBC_SIP_SERVICE_NAME,
  JAMBONES_SUBNET,
@@ -193,7 +188,6 @@ module.exports = {
  ANCHOR_MEDIA_ALWAYS,
  VMD_HINTS_FILE,
  JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS,
-  JAMBONES_AWS_TRANSCRIBE_USE_GRPC,

  LEGACY_CRYPTO,
  JWT_SECRET,
@@ -222,6 +216,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_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 = {
@@ -99,8 +97,7 @@ router.post('/',
        'X-Trace-ID': rootSpan.traceId,
        ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid}),
        ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost}),
-        ...(record_all_calls && {'X-Record-All-Calls': recordOutputFormat}),
-        ...target.headers
+        ...(record_all_calls && {'X-Record-All-Calls': recordOutputFormat})
      };

      switch (target.type) {
@@ -142,16 +139,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 +195,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
@@ -273,8 +257,6 @@ router.post('/',
              callId: inviteReq.get('Call-ID'),
              accountSid,
              traceId: rootSpan.traceId
-            }, {
-              ...(account.enable_debug_log && {level: 'debug'})
            });
            app.requestor.logger = app.notifier.logger = sipLogger;
            const callInfo = new CallInfo({
@@ -308,8 +290,6 @@ router.post('/',
          },
          cbProvisional: (prov) => {
            const callStatus = prov.body ? CallStatus.EarlyMedia : CallStatus.Ringing;
-            // Update call-id for sbc outbound INVITE
-            cs.callInfo.sbcCallid = prov.get('X-CID');
            if ([180, 183].includes(prov.status) && prov.body) connectStream(prov.body);
            restDial.emit('callStatus', prov.status, !!prov.body);
            cs.emit('callStatusChange', {callStatus, sipStatus: prov.status});
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -187,20 +187,14 @@ module.exports = function(srf, logger) {

    const {span} = rootSpan.startChildSpan('lookupAccountDetails');
    try {
-      const accountDetail = await lookupAccountDetails(account_sid);
-      const account = accountDetail?.account;
-      req.locals.accountInfo = accountDetail;
-      req.locals.service_provider_sid = account?.service_provider_sid;
+      req.locals.accountInfo = await lookupAccountDetails(account_sid);
+      req.locals.service_provider_sid = req.locals.accountInfo?.account?.service_provider_sid;
      span.end();
-      if (!account?.is_active) {
+      if (!req.locals.accountInfo.account.is_active) {
        logger.info(`Account is inactive or suspended ${account_sid}`);
        // TODO: alert
        return res.send(503, {headers: {'X-Reason': 'Account exists but is inactive'}});
      }
-      // Change the default log level to debug
-      if (account?.enable_debug_log) {
-        req.locals.logger.level = 'debug';
-      }
      logger.debug({accountInfo: req.locals?.accountInfo?.account}, `retrieved account info for ${account_sid}`);
      next();
    } catch (err) {
@@ -336,9 +330,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
@@ -387,7 +379,7 @@ module.exports = function(srf, logger) {
    const {rootSpan, siprec, application:app} = req.locals;
    let span;
    try {
-      if (app.tasks && app.tasks?.length > 0 && !JAMBONES_MYSQL_REFRESH_TTL) {
+      if (app.tasks && !JAMBONES_MYSQL_REFRESH_TTL) {
        app.tasks = normalizeJambones(logger, app.tasks).map((tdata) => makeTask(logger, tdata));
        if (0 === app.tasks.length) throw new Error('no application provided');
        return next();
--- 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-info.js
+++ b/lib/session/call-info.js
@@ -32,7 +32,6 @@ class CallInfo {
      this.sipStatus = 100;
      this.sipReason = 'Trying';
      this.callStatus = CallStatus.Trying;
-      this.sbcCallid = req.get('X-CID');
      this.originatingSipIp = req.get('X-Forwarded-For');
      this.originatingSipTrunkName = req.get('X-Originating-Carrier');
      const {siprec} = req.locals;
@@ -130,7 +129,6 @@ class CallInfo {
      from: this.from,
      to: this.to,
      callId: this.callId,
-      sbcCallid: this.sbcCallid,
      sipStatus: this.sipStatus,
      sipReason: this.sipReason,
      callStatus: this.callStatus,
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -2,7 +2,6 @@ const Emitter = require('events');
 const fs = require('fs');
 const {
  CallDirection,
-  MediaPath,
  TaskPreconditions,
  CallStatus,
  TaskName,
@@ -21,7 +20,6 @@ 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 {parseUri} = require('drachtio-srf');
 const {
  JAMBONES_INJECT_CONTENT,
  JAMBONES_EAGERLY_PRE_CACHE_AUDIO,
@@ -30,10 +28,9 @@ const {
 } = 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 = 
 (
@@ -342,18 +339,6 @@ class CallSession extends Emitter {
    this.application.fallback_speech_recognizer_language = language;
  }

-  /**
-   * global referHook
-   */
-
-  set referHook(hook) {
-    this._referHook = hook;
-  }
-
-  get referHook() {
-    return this._referHook;
-  }
-
  /**
   * Vad
   */
@@ -535,6 +520,15 @@ class CallSession extends Emitter {
    this._actionHookDelayRetries = e;
  }

+  // Getter/setter for current tts vendor
+  get currentTtsVendor() {
+    return this._currentTtsVendor;
+  }
+
+  set currentTtsVendor(vendor) {
+    this._currentTtsVendor = vendor;
+  }
+
  get actionHookDelayProcessor() {
    return this._actionHookDelayProcessor;
  }
@@ -559,17 +553,6 @@ class CallSession extends Emitter {
            this.wakeupResolver = null;
          }
        });
-        this._actionHookDelayProcessor.on('giveupWithTasks', (tasks) => {
-          this.logger.info('CallSession: ActionHookDelayProcessor: giveupWithTasks event');
-          const giveUpTasks = normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata));
-          this.logger.info({tasks: listTaskNames(giveUpTasks)}, 'CallSession:giveupWithTasks task list');
-
-          // we need to clear the ahd, as we do not want to execute actionHookDelay actions again
-          this.clearActionHookDelayProcessor();
-
-          // replace the application with giveUpTasks
-          this.replaceApplication(giveUpTasks);
-        });
      } catch (err) {
        this.logger.error({err}, 'CallSession: Error creating ActionHookDelayProcessor');
      }
@@ -583,7 +566,9 @@ class CallSession extends Emitter {
        //this.logger.debug('CallSession:clearOrRestoreActionHookDelayProcessor - ahd settings');
        //await this.clearActionHookDelayProcessor();
      }
-      this.logger.debug('CallSession:clearOrRestoreActionHookDelayProcessor - say or play action completed');
+      else {
+        this.logger.debug('CallSession:clearOrRestoreActionHookDelayProcessor - restore ahd after gather override');
+      }
    }
  }

@@ -965,56 +950,42 @@ class CallSession extends Emitter {
            speech_credential_sid: credential.speech_credential_sid,
            cobalt_server_uri: credential.cobalt_server_uri
          };
-        }
-        else if ('elevenlabs' === vendor) {
+        } else if ('elevenlabs' === vendor) {
          return {
            api_key: credential.api_key,
            model_id: credential.model_id,
            options: credential.options
          };
-        }
-        else if ('playht' === vendor) {
+        } else if ('playht' === vendor) {
          return {
            api_key: credential.api_key,
            user_id: credential.user_id,
            voice_engine: credential.voice_engine,
            options: credential.options
          };
-        }
-        else if ('rimelabs' === vendor) {
+        } else if ('rimelabs' === vendor) {
          return {
            api_key: credential.api_key,
            model_id: credential.model_id,
            options: credential.options
          };
-        }
-        else if ('assemblyai' === vendor) {
+        } else if ('assemblyai' === vendor) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
            api_key: credential.api_key
          };
-        }
-        else if ('whisper' === vendor) {
+        } else if ('whisper' === vendor) {
          return {
            api_key: credential.api_key,
            model_id: credential.model_id
          };
-        }
-        else if ('verbio' === vendor) {
+        }  else if ('verbio' === vendor) {
          return {
            client_id: credential.client_id,
            client_secret: credential.client_secret,
            engine_version: credential.engine_version
          };
-        }
-        else if ('speechmatics' === vendor) {
-          this.logger.info({credential}, 'CallSession:getSpeechCredentials - speechmatics credential');
-          return {
-            api_key: credential.api_key,
-            speechmatics_stt_uri: credential.speechmatics_stt_uri,
-          };
-        }
-        else if (vendor.startsWith('custom:')) {
+        } else if (vendor.startsWith('custom:')) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
            auth_token: credential.auth_token,
@@ -1042,16 +1013,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';
-    }
-
    while (this.tasks.length && !this.callGone) {
      const taskNum = ++this.taskIdx;
      const stackNum = this.stackIdx;
@@ -1092,8 +1053,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}`);
@@ -1110,7 +1069,7 @@ class CallSession extends Emitter {
        try {
          await this._awaitCommandsOrHangup();

-          //await this.clearOrRestoreActionHookDelayProcessor();
+          await this.clearOrRestoreActionHookDelayProcessor();

          //TODO: remove filler noise code and simply create as action hook delay
          if (this._isPlayingFillerNoise) {
@@ -1603,38 +1562,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;
-    if (!task || !task.name.startsWith('Llm')) {
-      return this.logger.info('CallSession:_lccToolOutput - invalid command since we are not in an llm');
-    }
-
-    task.processToolOutput(tool_call_id, opts, callSid)
-      .catch((err) => this.logger.error(err, 'CallSession:_lccToolOutput'));
-  }
-
-
-  _lccLlmUpdate(opts, callSid) {
-    // only valid if we are in an LLM verb
-    const task = this.currentTask;
-    if (!task || !task.name.startsWith('Llm')) {
-      return this.logger.info('CallSession:_lccLlmUpdate - invalid command since we are not in an llm');
-    }
-
-    task.processLlmUpdate(opts, callSid)
-      .catch((err) => this.logger.error(err, 'CallSession:_lccLlmUpdate'));
-  }
-

  /**
   * perform call hangup by jambonz
@@ -1690,20 +1617,11 @@ Duration=${duration} `
      return this._lccConferenceParticipantAction(opts.conferenceParticipantAction);
    }
    else if (opts.dub) {
-      return this._lccDub(opts.dub, callSid);
+      return this._lccDub(opts);
    }
    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);
-    }

    // 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..
@@ -1900,7 +1818,7 @@ Duration=${duration} `
    this._jambonzHangup();
  }

-  async _onCommand({msgid, command, call_sid, queueCommand, tool_call_id, data}) {
+  async _onCommand({msgid, command, call_sid, queueCommand, data}) {
    this.logger.info({msgid, command, queueCommand, data}, 'CallSession:_onCommand - received command');
    let resolution;
    switch (command) {
@@ -2001,21 +1919,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;
-
-      case 'llm:update':
-        this._lccLlmUpdate(data, call_sid);
-        break;
-
      default:
        this.logger.info(`CallSession:_onCommand - invalid command ${command}`);
    }
@@ -2073,8 +1976,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.
@@ -2173,9 +2074,6 @@ Duration=${duration} `
    // When this call kicked out from conference, session need to replace endpoint
    // but this.ms might be undefined/null at this case.
    this.ms = this.ms || this.getMS();
-    // Destroy previous ep if it's still running.
-    if (this.ep?.connected) this.ep.destroy();
-
    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
    this._configMsEndpoint();

@@ -2333,66 +2231,17 @@ Duration=${duration} `
  }

  /**
-   * Handle incoming REFER
+   * Handle incoming REFER if we are in a dial task
   * @param {*} req
   * @param {*} res
   */
  _onRefer(req, res) {
    const task = this.currentTask;
    const sd = task.sd;
-    if (task && TaskName.Dial === task.name && sd && task.referHook) {
+    if (task && TaskName.Dial === task.name && sd) {
      task.handleRefer(this, req, res);
    }
    else {
-      this._handleRefer(req, res);
-    }
-  }
-
-  async _handleRefer(req, res) {
-    if (this._referHook) {
-      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, {
-          ...(this.callInfo.toJSON()),
-          refer_details: {
-            sip_refer_to: req.get('Refer-To'),
-            sip_referred_by: req.get('Referred-By'),
-            sip_user_agent: req.get('User-Agent'),
-            refer_to_user: to.scheme === 'tel' ? to.number : to.user,
-            referred_by_user: by.scheme === 'tel' ? by.number : by.user,
-            referring_call_sid: this.callSid,
-            referred_call_sid: null,
-            ...customHeaders
-          }
-        }, httpHeaders);
-
-        if (json && Array.isArray(json)) {
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          if (tasks && tasks.length > 0) {
-            this.logger.info('CallSession:handleRefer received REFER, get new tasks');
-            this.replaceApplication(tasks);
-            if (this.wakeupResolver) {
-              this.wakeupResolver({reason: 'CallSession: referHook new taks'});
-              this.wakeupResolver = null;
-            }
-          }
-        }
-        res.send(202);
-        this.logger.info('CallSession:handleRefer - sent 202 Accepted');
-      } catch (err) {
-        this.logger.error({err}, 'CallSession:handleRefer - error while asking referHook');
-        res.send(err.statusCode || 501);
-      }
-    } else {
      res.send(501);
    }
  }
@@ -2547,35 +2396,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) {
@@ -2642,7 +2483,6 @@ Duration=${duration} `
  }

  _configMsEndpoint() {
-    this._enableInbandDtmfIfRequired(this.ep);
    const opts = {
      ...(this.onHoldMusic && {holdMusic: `shout://${this.onHoldMusic.replace(/^https?:\/\//, '')}`}),
      ...(JAMBONES_USE_FREESWITCH_TIMER_FD && {timer_name: 'timerfd'})
@@ -2652,20 +2492,6 @@ Duration=${duration} `
    }
  }

-  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
   */
--- 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
@@ -72,8 +72,6 @@ class InboundCallSession extends CallSession {

  _jambonzHangup() {
    this.dlg?.destroy();
-    // kill current task or wakeup the call session.
-    this._callReleased();
  }

  _hangup(terminatedBy = 'jambonz') {
--- a/lib/session/rest-call-session.js
+++ b/lib/session/rest-call-session.js
@@ -1,6 +1,10 @@
 const CallSession = require('./call-session');
 const {CallStatus} = require('../utils/constants');
 const moment = require('moment');
+const {parseUri} = require('drachtio-srf');
+const { normalizeJambones } = require('@jambonz/verb-specifications');
+const makeTask = require('../tasks/make_task');
+
 /**
 * @classdesc Subclass of CallSession.  This represents a CallSession that is
 * created for an outbound call that is initiated via the REST API.
@@ -45,6 +49,59 @@ class RestCallSession extends CallSession {
    dlg.on('modify', this._onReinvite.bind(this));
    this.wrapDialog(dlg);
  }
+
+  /**
+   * global referHook
+   */
+
+  set referHook(hook) {
+    this._referHook = hook;
+  }
+
+  /**
+   * This is invoked when the called party sends REFER to Jambonz.
+   */
+  async _onRefer(req, res) {
+    if (this._referHook) {
+      try {
+        const to = parseUri(req.getParsedHeader('Refer-To').uri);
+        const by = parseUri(req.getParsedHeader('Referred-By').uri);
+        const b3 = this.b3;
+        const httpHeaders = b3 && {b3};
+        const json = await this.requestor.request('verb:hook', this._referHook, {
+          ...(this.callInfo.toJSON()),
+          refer_details: {
+            sip_refer_to: req.get('Refer-To'),
+            sip_referred_by: req.get('Referred-By'),
+            sip_user_agent: req.get('User-Agent'),
+            refer_to_user: to.scheme === 'tel' ? to.number : to.user,
+            referred_by_user: by.scheme === 'tel' ? by.number : by.user,
+            referring_call_sid: this.callSid,
+            referred_call_sid: null,
+          }
+        }, httpHeaders);
+
+        if (json && Array.isArray(json)) {
+          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
+          if (tasks && tasks.length > 0) {
+            this.logger.info('RestCallSession:handleRefer received REFER, get new tasks');
+            this.replaceApplication(tasks);
+            if (this.wakeupResolver) {
+              this.wakeupResolver({reason: 'RestCallSession: referHook new taks'});
+              this.wakeupResolver = null;
+            }
+          }
+        }
+        res.send(202);
+        this.logger.info('RestCallSession:handleRefer - sent 202 Accepted');
+      } catch (err) {
+        this.logger.error({err}, 'RestCallSession:handleRefer - error while asking referHook');
+        res.send(err.statusCode || 501);
+      }
+    } else {
+      res.send(501);
+    }
+  }
  /**
   * This is invoked when the called party hangs up, in order to calculate the call duration.
   */
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -118,9 +118,7 @@ class Conference extends Task {
    this.emitter.emit('kill');
    await this._doFinalMemberCheck(cs);
    if (this.ep && this.ep.connected) {
-      // drachtio-fsmrf override esl::event::CUSTOM to conference join listerner, After finish the conference
-      // the application need to reset the esl::event::CUSTOM for another use on the same endpoint
-      this.ep.resetEslCustomEvent();
+      this.ep.conn.removeAllListeners('esl::event::CUSTOM::*');
      this.ep.api(`conference ${this.confName} kick ${this.memberId}`)
        .catch((err) => this.logger.info({err}, 'Error kicking participant'));
    }
@@ -653,8 +651,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
@@ -34,8 +34,7 @@ class TaskConfig extends Task {
        'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
        'interDigitTimeout', 'bargein', 'dtmfBargein', 'minBargeinWordCount', 'actionHook'
      ].forEach((k) => {
-        const val = this.bargeIn[k];
-        if (val !== undefined && val !== null) this.gatherOpts[k] = val;
+        if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
      });
    }
    if (this.transcribe?.enable) {
@@ -74,7 +73,6 @@ class TaskConfig extends Task {
  get hasDub() { return Object.keys(this.dub).length; }
  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 summary() {
    const phrase = [];
@@ -84,13 +82,13 @@ class TaskConfig extends Task {

    if (this.bargeIn.enable) phrase.push('enable barge-in');
    if (this.hasSynthesizer) {
-      const {vendor:v, language:l, voice, label} = this.synthesizer;
-      const s = `{${v},${l},${voice},${label || 'None'}}`;
+      const {vendor:v, language:l, voice} = this.synthesizer;
+      const s = `{${v},${l},${voice}}`;
      phrase.push(`set synthesizer${s}`);
    }
    if (this.hasRecognizer) {
-      const {vendor:v, language:l, label} = this.recognizer;
-      const s = `{${v},${l},${label || 'None'}}`;
+      const {vendor:v, language:l} = this.recognizer;
+      const s = `{${v},${l}}`;
      phrase.push(`set recognizer${s}`);
    }
    if (this.hasRecording) phrase.push(this.record.action);
@@ -105,7 +103,6 @@ class TaskConfig extends Task {
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
    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');
    return `${this.name}{${phrase.join(',')}}`;
  }

@@ -298,13 +295,9 @@ class TaskConfig extends Task {
        voiceMs: this.vad.voiceMs || 250,
        silenceMs: this.vad.silenceMs || 150,
        strategy: this.vad.strategy || 'one-shot',
-        mode: (this.vad.mode !== undefined && this.vad.mode !== null) ? this.vad.mode : 2
+        mode: this.vad.mod || 2
      };
    }
-
-    if (this.hasReferHook) {
-      cs.referHook = this.data.referHook;
-    }
  }

  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;
@@ -86,8 +82,6 @@ function filterAndLimit(logger, tasks) {
  return unique;
 }

-const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-
 class TaskDial extends Task {
  constructor(logger, opts) {
    super(logger, opts);
@@ -109,7 +103,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 || {});
@@ -157,21 +150,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];
@@ -192,16 +181,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}`);
@@ -224,16 +203,7 @@ class TaskDial extends Task {
      else {
        this.epOther = cs.ep;
        if (this.dialMusic && this.epOther && this.epOther.connected) {
-          (async() => {
-            do {
-              try {
-                await this.epOther.play(this.dialMusic);
-              } catch (err) {
-                this.logger.error(err, `TaskDial:exec error playing ${this.dialMusic}`);
-                await sleepFor(1000);
-              }
-            } while (!this.killed || !this.bridged);
-          })();
+          this.epOther.play(this.dialMusic).catch((err) => {});
        }
      }
      if (!this.killed) await this._attemptCalls(cs);
@@ -319,7 +289,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) {
@@ -359,26 +329,17 @@ class TaskDial extends Task {

        const to = parseUri(req.getParsedHeader('Refer-To').uri);
        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()),
          refer_details: {
            sip_refer_to: req.get('Refer-To'),
+            sip_referred_by: req.get('Referred-By'),
+            sip_user_agent: req.get('User-Agent'),
            refer_to_user: to.scheme === 'tel' ? to.number : to.user,
-            ...(referredBy && {sip_referred_by: referredBy}),
-            ...(userAgent && {sip_user_agent: userAgent}),
-            ...(by && {referred_by_user: by.scheme === 'tel' ? by.number : by.user}),
+            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)) {
@@ -404,13 +365,9 @@ 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) {
-        this.logger.info({err}, 'DialTask:handleRefer - error processing incoming REFER');
        res.send(err.statusCode || 501);
      }
    }
@@ -516,11 +473,11 @@ class TaskDial extends Task {
  }

  async _attemptCalls(cs) {
-    const {req, callInfo, direction, srf} = cs;
+    const {req, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
-    let sbcAddress = this.proxy || getSBC();
+    const sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;

@@ -528,23 +485,17 @@ class TaskDial extends Task {
    this.headers = {
      'X-Account-Sid': cs.accountSid,
      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
-      ...(direction === 'outbound' && callInfo.sbcCallid && {'X-CID': callInfo.sbcCallid}),
-      ...(!JAMBONZ_DISABLE_DIAL_PAI_HEADER && req && {
-        ...(req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
-        ...(req.has('Privacy') && {'Privacy': req.get('Privacy')}),
-      }),
+      ...(req && req.has('P-Asserted-Identity') && !JAMBONZ_DISABLE_DIAL_PAI_HEADER &&
+        {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
      ...(req && req.has('X-Voip-Carrier-Sid') && {'X-Voip-Carrier-Sid': req.get('X-Voip-Carrier-Sid')}),
      // Put headers at the end to make sure opt.headers override all default behavior.
      ...this.headers
    };

-    // 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)
    };
@@ -590,15 +541,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}`);
@@ -659,7 +601,6 @@ class TaskDial extends Task {
                dialCallStatus: obj.callStatus,
                dialSipStatus: obj.sipStatus,
                dialCallSid: sd.callSid,
-                dialSbcCallid: sd.callInfo.sbcCallid
              });
            }
            switch (obj.callStatus) {
@@ -775,7 +716,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');
@@ -884,9 +825,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);
-    }
+    if (this.canReleaseMedia) setTimeout(this._releaseMedia.bind(this, cs, sd), 200);
  }

  _bridgeEarlyMedia(sd) {
@@ -898,57 +837,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');
    }
@@ -958,14 +862,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.
@@ -984,12 +882,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;
@@ -1048,8 +945,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/dialogflow/index.js
+++ b/lib/tasks/dialogflow/index.js
@@ -1,3 +1,4 @@
+const assert = require('assert');
 const Task = require('../task');
 const {TaskName, TaskPreconditions} = require('../../utils/constants');
 const Intent = require('./intent');
@@ -10,19 +11,29 @@ class Dialogflow extends Task {
    super(logger, opts);
    this.preconditions = TaskPreconditions.Endpoint;
    this.credentials = this.data.credentials;
+    this.project = this.data.project;
+    this.agent = this.data.agent;
+    this.region = this.data.region || 'default';
+    this.model = this.data.model || 'es';
+    this.queryInput = this.data.queryInput || {};

-    /* set project id with environment and region (optionally) */
-    if (this.data.environment && this.data.region) {
-      this.project = `${this.data.project}:${this.data.environment}:${this.data.region}`;
-    }
-    else if (this.data.environment) {
-      this.project = `${this.data.project}:${this.data.environment}`;
-    }
-    else if (this.data.region) {
-      this.project = `${this.data.project}::${this.data.region}`;
+    assert(this.agent || !this.isCX, 'agent is required for dialogflow cx');
+    assert(this.credentials, 'dialogflow credentials are required');
+
+    if (this.isCX) {
+      this.environment = this.data.environment || 'default';
    }
    else {
-      this.project = this.data.project;
+      /* ES: set project id with environment and region (optionally) */
+      if (this.data.environment && this.data.region) {
+        this.project = `${this.data.project}:${this.data.environment}:${this.data.region}`;
+      }
+      else if (this.data.environment) {
+        this.project = `${this.data.project}:${this.data.environment}`;
+      }
+      else if (this.data.region) {
+        this.project = `${this.data.project}::${this.data.region}`;
+      }
    }

    this.lang = this.data.lang || 'en-US';
@@ -67,31 +78,23 @@ class Dialogflow extends Task {
      this.fallbackLabel = this.data.tts.fallbackLabel;
    }
    this.bargein = this.data.bargein;
+
+    this.cmd = this.model === 'cx' ? 'dialogflow_cx_start' : 'dialogflow_start';
+    this.cmdStop = this.model === 'cx' ? 'dialogflow_cx_stop' : 'dialogflow_stop';
  }

  get name() { return TaskName.Dialogflow; }

+  get isCX() { return this.model === 'cx'; }
+
+  get isES() { return !this.isCX; }
+
  async exec(cs, {ep}) {
    await super.exec(cs);

    try {
      await this.init(cs, ep);
-
-      this.logger.debug(`starting dialogflow bot ${this.project}`);
-
-      // kick it off
-      const baseArgs = `${this.ep.uuid} ${this.project} ${this.lang} ${this.welcomeEvent}`;
-      if (this.welcomeEventParams) {
-        this.ep.api('dialogflow_start', `${baseArgs} '${JSON.stringify(this.welcomeEventParams)}'`);
-      }
-      else if (this.welcomeEvent.length) {
-        this.ep.api('dialogflow_start', baseArgs);
-      }
-      else {
-        this.ep.api('dialogflow_start', `${this.ep.uuid} ${this.project} ${this.lang}`);
-      }
-      this.logger.debug(`started dialogflow bot ${this.project}`);
-
+      await this.startBot('default');
      await this.awaitTaskDone();
    } catch (err) {
      this.logger.error({err}, 'Dialogflow:exec error');
@@ -108,6 +111,12 @@ class Dialogflow extends Task {
      this.ep.removeCustomEventListener('dialogflow::end_of_utterance');
      this.ep.removeCustomEventListener('dialogflow::error');

+      this.ep.removeCustomEventListener('dialogflow_cx::intent');
+      this.ep.removeCustomEventListener('dialogflow_cx::transcription');
+      this.ep.removeCustomEventListener('dialogflow_cx::audio_provided');
+      this.ep.removeCustomEventListener('dialogflow_cx::end_of_utterance');
+      this.ep.removeCustomEventListener('dialogflow_cx::error');
+
      this._clearNoinputTimer();

      if (!this.reportedFinalAction) this.performAction({dialogflowResult: 'caller hungup'})
@@ -141,6 +150,12 @@ class Dialogflow extends Task {
      this.ep.addCustomEventListener('dialogflow::end_of_utterance', this._onEndOfUtterance.bind(this, ep, cs));
      this.ep.addCustomEventListener('dialogflow::error', this._onError.bind(this, ep, cs));

+      this.ep.addCustomEventListener('dialogflow_cx::intent', this._onIntent.bind(this, ep, cs));
+      this.ep.addCustomEventListener('dialogflow_cx::transcription', this._onTranscription.bind(this, ep, cs));
+      this.ep.addCustomEventListener('dialogflow_cx::audio_provided', this._onAudioProvided.bind(this, ep, cs));
+      this.ep.addCustomEventListener('dialogflow_cx::end_of_utterance', this._onEndOfUtterance.bind(this, ep, cs));
+      this.ep.addCustomEventListener('dialogflow_cx::error', this._onError.bind(this, ep, cs));
+
      const obj = typeof this.credentials === 'string' ? JSON.parse(this.credentials) : this.credentials;
      const creds = JSON.stringify(obj);
      await this.ep.set('GOOGLE_APPLICATION_CREDENTIALS', creds);
@@ -151,6 +166,51 @@ class Dialogflow extends Task {
    }
  }

+  async startBot(intent) {
+    if (this.isCX) {
+      await this.startBotCX(intent);
+    }
+    else {
+      await this.startBotES(intent);
+    }
+  }
+
+  async startBotES() {
+    this.logger.info('starting dialogflow ES bot');
+    const baseArgs = `${this.ep.uuid} ${this.project} ${this.lang} ${this.welcomeEvent}`;
+    if (this.welcomeEventParams) {
+      await this.ep.api(this.cmd, `${baseArgs} '${JSON.stringify(this.welcomeEventParams)}'`);
+    }
+    else if (this.welcomeEvent.length) {
+      await this.ep.api(this.cmd, baseArgs);
+    }
+    else {
+      await this.ep.api(this.cmd, `${this.ep.uuid} ${this.project} ${this.lang}`);
+    }
+  }
+
+  async startBotCX(intent) {
+    const baseArgs = [
+      this.ep.uuid,
+      this.region,
+      this.project,
+      this.agent,
+      this.environment,
+      this.lang,
+    ];
+    if (intent) {
+      baseArgs.push(intent);
+    }
+    /*
+    if (Object.keys(this.queryInput).length > 0) {
+      baseArgs.push(`'${JSON.stringify(this.queryInput)}'`);
+    }
+      */
+    this.logger.info({args: baseArgs}, 'starting dialogflow CX bot');
+
+    await this.ep.api(this.cmd, `${baseArgs.join(' ')}`);
+  }
+
  /**
   * An intent has been returned.  Since we are using SINGLE_UTTERANCE on the dialogflow side,
   * we may get an empty intent, signified by the lack of a 'response_id' attribute.
@@ -171,20 +231,20 @@ class Dialogflow extends Task {
      if (this.noinput && this.greetingPlayed) {
        this.logger.info('no input timer fired, reprompting..');
        this.noinput = false;
-        ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang} ${this.noInputEvent}`);
+        ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang} ${this.noInputEvent}`);
      }
      else if (this.dtmfEntry && this.greetingPlayed) {
        this.logger.info('dtmf detected, reprompting..');
-        ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang} none \'${this.dtmfEntry}\'`);
+        ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang} none \'${this.dtmfEntry}\'`);
        this.dtmfEntry = null;
      }
      else if (this.greetingPlayed) {
        this.logger.info('starting another intent');
-        ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang}`);
+        ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang}`);
      }
      else {
        this.logger.info('got empty intent');
-        ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang}`);
+        ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang}`);
      }
      return;
    }
@@ -231,7 +291,7 @@ class Dialogflow extends Task {
      // start a new intent, (we want to continue to listen during the audio playback)
      // _unless_ we are transferring or ending the session
      if (!this.hangupAfterPlayDone) {
-        ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang}`);
+        ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang}`);
      }

      try {
@@ -386,10 +446,12 @@ class Dialogflow extends Task {
    // kill filler audio
    await ep.api('uuid_break', ep.uuid);

-    // start a new intent, (we want to continue to listen during the audio playback)
+    // if ES start a new intent (for CX we do not set single_utterance on),
+    // (we want to continue to listen during the audio playback)
    // _unless_ we are transferring or ending the session
-    if (/*this.greetingPlayed &&*/ !this.hangupAfterPlayDone) {
-      ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang}`);
+    if (!this.hangupAfterPlayDone) {
+      this.startBot();
+      //ep.api(this.cmd, `${ep.uuid} ${this.project} ${this.lang}`);
    }

    this.playInProgress = true;
@@ -414,12 +476,7 @@ class Dialogflow extends Task {
        return;
      }
    }
-    /*
-    if (!this.inbound && !this.greetingPlayed) {
-      this.logger.info('finished greeting on outbound call, starting new intent');
-      this.ep.api('dialogflow_start', `${ep.uuid} ${this.project} ${this.lang}`);
-    }
-    */
+
    this.greetingPlayed = true;

    if (this.hangupAfterPlayDone) {
@@ -454,7 +511,7 @@ class Dialogflow extends Task {
    }

    // kill the current dialogflow, which will result in us getting an immediate intent
-    ep.api('dialogflow_stop', `${ep.uuid}`)
+    ep.api(this.cmdStop, `${ep.uuid}`)
      .catch((err) => this.logger.info(`dialogflow_stop failed: ${err.message}`));
  }

@@ -472,7 +529,7 @@ class Dialogflow extends Task {
    }

    // kill the current dialogflow, which will result in us getting an immediate intent
-    ep.api('dialogflow_stop', `${ep.uuid}`)
+    ep.api(this.cmdStop, `${ep.uuid}`)
      .catch((err) => this.logger.info(`dialogflow_stop failed: ${err.message}`));
  }

--- a/lib/tasks/dialogflow/intent.js
+++ b/lib/tasks/dialogflow/intent.js
@@ -4,19 +4,31 @@ class Intent {
    this.evt = evt;

    this.logger.debug({evt}, 'intent');
-    this.dtmfRequest = checkIntentForDtmfEntry(logger, evt);
+    this.qr = this.isCX ? evt.detect_intent_response.query_result : evt.query_result;
+    this.dtmfRequest = this._checkIntentForDtmfEntry(logger, evt);
+  }
+
+  get response_id() {
+    return this.isCX ? this.evt.detect_intent_response.response_id : this.evt.response_id;
  }

  get isEmpty() {
-    return this.evt.response_id.length === 0;
+    return !(this.response_id?.length > 0);
  }

  get fulfillmentText() {
-    return this.evt.query_result.fulfillment_text;
+    return this.qr.fulfillment_text;
  }

  get saysEndInteraction() {
-    return this.evt.query_result.intent.end_interaction ;
+    if (this.isCX) {
+      const end_interaction = this.qr.response_messages
+        .find((m) => typeof m === 'object' && 'end_interaction' in m)?.end_interaction;
+
+      //TODO: need to do more checking on the actual contents
+      return end_interaction && Object.keys(end_interaction).length > 0;
+    }
+    else return this.qr.intent.end_interaction ;
  }

  get saysCollectDtmf() {
@@ -28,7 +40,22 @@ class Intent {
  }

  get name() {
-    if (!this.isEmpty) return this.evt.query_result.intent.display_name;
+    if (!this.isEmpty) {
+      if (this.isCX) {
+        return this.qr.match?.intent?.display_name;
+      }
+      else {
+        return this.qr.intent.display_name;
+      }
+    }
+  }
+
+  get isCX() {
+    return typeof this.evt.detect_intent_response === 'object';
+  }
+
+  get isES() {
+    return !this.isCX;
  }

  toJSON() {
@@ -38,11 +65,7 @@ class Intent {
    };
  }

-}
-
-module.exports = Intent;
-
-/**
+  /**
 * Parse a returned intent for DTMF entry information
 * i.e.
 * allow-dtmf-x-y-z
@@ -55,35 +78,39 @@ module.exports = Intent;
 * allow-dtmf-1-4-# : collect 1-4 digits, terminating if '#' is entered
 * @param {*} intent - dialogflow intent
 */
-const checkIntentForDtmfEntry = (logger, intent) => {
-  const qr = intent.query_result;
-  if (!qr || !qr.fulfillment_messages || !qr.output_contexts) {
-    logger.info({f: qr.fulfillment_messages, o: qr.output_contexts}, 'no dtmfs');
-    return;
-  }
+  _checkIntentForDtmfEntry(logger, intent) {
+    const qr = this.isCX ? intent.detect_intent_response.query_result : intent.query_result;

-  // check for custom payloads with a gather verb
-  const custom = qr.fulfillment_messages.find((f) => f.payload && f.payload.verb === 'gather');
-  if (custom && custom.payload && custom.payload.verb === 'gather') {
-    logger.info({custom}, 'found dtmf custom payload');
-    return {
-      max: custom.payload.numDigits,
-      term: custom.payload.finishOnKey,
-      template: custom.payload.responseTemplate
-    };
-  }
+    if (!qr || !qr.fulfillment_messages || !qr.output_contexts) {
+      logger.info({f: qr.fulfillment_messages, o: qr.output_contexts}, 'no dtmfs');
+      return;
+    }

-  // check for an output context with a specific naming convention
-  const context = qr.output_contexts.find((oc) => oc.name.includes('/contexts/allow-dtmf-'));
-  if (context) {
-    const arr = /allow-dtmf-(\d+)(?:-(\d+))?(?:-(.*))?/.exec(context.name);
-    if (arr) {
-      logger.info({custom}, 'found dtmf output context');
+    // check for custom payloads with a gather verb
+    const custom = qr.fulfillment_messages.find((f) => f.payload && f.payload.verb === 'gather');
+    if (custom && custom.payload && custom.payload.verb === 'gather') {
+      logger.info({custom}, 'found dtmf custom payload');
      return {
-        min: parseInt(arr[1]),
-        max: arr.length > 2 ? parseInt(arr[2]) : null,
-        term: arr.length > 3 ? arr[3] : null
+        max: custom.payload.numDigits,
+        term: custom.payload.finishOnKey,
+        template: custom.payload.responseTemplate
      };
    }
+
+    // check for an output context with a specific naming convention
+    const context = qr.output_contexts.find((oc) => oc.name.includes('/contexts/allow-dtmf-'));
+    if (context) {
+      const arr = /allow-dtmf-(\d+)(?:-(\d+))?(?:-(.*))?/.exec(context.name);
+      if (arr) {
+        logger.info({custom}, 'found dtmf output context');
+        return {
+          min: parseInt(arr[1]),
+          max: arr.length > 2 ? parseInt(arr[2]) : null,
+          term: arr.length > 3 ? arr[3] : null
+        };
+      }
+    }
  }
-};
+}
+
+module.exports = Intent;
--- 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
@@ -12,8 +12,7 @@ const {
  JambonzTranscriptionEvents,
  AssemblyAiTranscriptionEvents,
  VadDetection,
-  VerbioTranscriptionEvents,
-  SpeechmaticsTranscriptionEvents
+  VerbioTranscriptionEvents
 } = require('../utils/constants.json');
 const {
  JAMBONES_GATHER_EARLY_HINTS_MATCH,
@@ -23,7 +22,6 @@ const {
 const makeTask = require('./make_task');
 const assert = require('assert');
 const SttTask = require('./stt-task');
-const { SpeechCredentialError } = require('../utils/error');

 class TaskGather extends SttTask {
  constructor(logger, opts, parentTask) {
@@ -124,22 +122,10 @@ class TaskGather extends SttTask {
    return s;
  }

-  async exec(cs, obj) {
-    try {
-      await this.handling(cs, obj);
-    } catch (error) {
-      if (error instanceof SpeechCredentialError) {
-        this.logger.info('Gather failed due to SpeechCredentialError, finished!');
-        this.notifyTaskDone();
-        return;
-      }
-      throw error;
-    }
-  }
-
-  async handling(cs, {ep}) {
+  async exec(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 || {}),
@@ -155,8 +141,7 @@ 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},
@@ -192,10 +177,8 @@ class TaskGather extends SttTask {
    this._startVad();

    const startDtmfListener = () => {
-      assert(!this._dtmfListenerStarted);
      if (this.input.includes('digits') || this.dtmfBargein || this.asrDtmfTerminationDigit) {
        ep.on('dtmf', this._onDtmf.bind(this, cs, ep));
-        this._dtmfListenerStarted = true;
      }
    };

@@ -210,6 +193,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});
        }
@@ -289,14 +273,15 @@ 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');
        }
      }

-      // https://github.com/jambonz/jambonz-feature-server/issues/913
-      if (this.listenDuringPrompt || (!this.sayTask && !this.playTask)) {
+      if (this.listenDuringPrompt) {
        startDtmfListener();
      }

@@ -343,13 +328,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');
@@ -372,6 +350,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;
@@ -512,24 +497,6 @@ class TaskGather extends SttTask {
        this.addCustomEventListener(ep, AssemblyAiTranscriptionEvents.ConnectFailure,
          this._onVendorConnectFailure.bind(this, cs, ep));
        break;
-
-      case 'speechmatics':
-        this.bugname = `${this.bugname_prefix}speechmatics_transcribe`;
-        this.addCustomEventListener(
-          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,
-          this._onSpeechmaticsRecognitionStarted.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Error,
-          this._onSpeechmaticsErrror.bind(this, cs, ep));
-
-        break;
-
      default:
        if (this.vendor.startsWith('custom:')) {
          this.bugname = `${this.bugname_prefix}${this.vendor}_transcribe`;
@@ -768,7 +735,7 @@ class TaskGather extends SttTask {

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

    if (evt.alternatives.length === 0) {
      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
@@ -847,10 +814,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 */
@@ -924,7 +888,7 @@ class TaskGather extends SttTask {
        }
      }
      // If transcription received, reset timeout timer.
-      if (this._timeoutTimer && !emptyTranscript) {
+      if (this._timeoutTimer) {
        this._startTimer();
      }
      /* restart asr timer if we get a partial transcript (only if the asr timer is already running) */
@@ -969,6 +933,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',
@@ -977,6 +942,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}`);
@@ -1004,11 +970,10 @@ class TaskGather extends SttTask {
      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
    }
    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    const errMessage = evt.error || evt.Message;
    writeAlerts({
      account_sid: cs.accountSid,
      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${errMessage}`,
+      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
      vendor: this.vendor,
      target_sid: cs.callSid
    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
@@ -1024,25 +989,12 @@ class TaskGather extends SttTask {
    }
  }

-  async _onSpeechmaticsErrror(cs, _ep, evt) {
-    // eslint-disable-next-line no-unused-vars
-    const {message, ...e} = evt;
-    this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
-  }
-
  async _onVendorError(cs, _ep, evt) {
    super._onVendorError(cs, _ep, evt);
    if (!(await this._startFallback(cs, _ep, evt))) {
      this._resolve('stt-error', evt);
    }
  }
-  async _onSpeechmaticsRecognitionStarted(_cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsRecognitionStarted');
-  }
-
-  async _onSpeechmaticsInfo(_cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsInfo');
-  }

  _onVadDetected(cs, ep) {
    if (this.bargein && this.minBargeinWordCount === 0) {
@@ -1101,7 +1053,6 @@ class TaskGather extends SttTask {

    this.span.setAttributes({
      channel: 1,
-      'stt.label': this.label || 'None',
      'stt.resolve': reason,
      'stt.result': JSON.stringify(evt)
    });
--- a/lib/tasks/llm/index.js
+++ b/lib/tasks/llm/index.js
@@ -1,96 +0,0 @@
-const Task = require('../task');
-const {TaskPreconditions} = require('../../utils/constants');
-const TaskLlmOpenAI_S2S = require('./llms/openai_s2s');
-
-class TaskLlm extends Task {
-  constructor(logger, opts) {
-    super(logger, opts);
-    this.preconditions = TaskPreconditions.Endpoint;
-
-    ['vendor', 'model', 'auth', 'connectOptions'].forEach((prop) => {
-      this[prop] = this.data[prop];
-    });
-
-    this.eventHandlers = [];
-
-    // delegate to the specific llm model
-    this.llm = this.createSpecificLlm();
-  }
-
-  get name() { return this.llm.name ; }
-
-  get toolHook() { return this.llm?.toolHook; }
-
-  get eventHook() { return this.llm?.eventHook; }
-
-  get ep() { return this.cs.ep; }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs, {ep});
-    await this.llm.exec(cs, {ep});
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    await this.llm.kill(cs);
-  }
-
-  createSpecificLlm() {
-    let llm;
-    switch (this.vendor) {
-      case 'openai':
-      case 'microsoft':
-        if (this.model.startsWith('gpt-4o-realtime')) {
-          llm = new TaskLlmOpenAI_S2S(this.logger, this.data, this);
-        }
-        break;
-      default:
-        throw new Error(`Unsupported vendor ${this.vendor} for LLM`);
-    }
-
-    if (!llm) {
-      throw new Error(`Unsupported vendor:model ${this.vendor}:${this.model}`);
-    }
-    return llm;
-  }
-
-  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));
-  }
-
-  async sendEventHook(data) {
-    await this.cs?.requestor.request('llm:event', this.eventHook, data);
-  }
-
-  async sendToolHook(tool_call_id, data) {
-    await this.cs?.requestor.request('llm:tool-call', this.toolHook, {tool_call_id, ...data});
-  }
-
-  async processToolOutput(tool_call_id, data) {
-    if (!this.ep.connected) {
-      this.logger.info('TaskLlm:processToolOutput - no connected endpoint');
-      return;
-    }
-    this.llm.processToolOutput(this.ep, tool_call_id, data);
-  }
-
-  async processLlmUpdate(data, callSid) {
-    if (this.ep.connected) {
-      if (typeof this.llm.processLlmUpdate === 'function') {
-        this.llm.processLlmUpdate(this.ep, data, callSid);
-      }
-      else {
-        const {vendor, model} = this.llm;
-        this.logger.info({data, callSid},
-          `TaskLlm:_processLlmUpdate: LLM ${vendor}:${model} does not support llm:update`);
-      }
-    }
-  }
-}
-
-module.exports = TaskLlm;
--- a/lib/tasks/llm/llms/openai_s2s.js
+++ b/lib/tasks/llm/llms/openai_s2s.js
@@ -1,357 +0,0 @@
-const Task = require('../../task');
-const TaskName = 'Llm_OpenAI_s2s';
-const {LlmEvents_OpenAI} = require('../../../utils/constants');
-const ClientEvent = 'client.event';
-const SessionDelete = 'session.delete';
-
-const openai_server_events = [
-  'error',
-  'session.created',
-  'session.updated',
-  'conversation.created',
-  'input_audio_buffer.committed',
-  'input_audio_buffer.cleared',
-  'input_audio_buffer.speech_started',
-  'input_audio_buffer.speech_stopped',
-  'conversation.item.created',
-  'conversation.item.input_audio_transcription.completed',
-  'conversation.item.input_audio_transcription.failed',
-  'conversation.item.truncated',
-  'conversation.item.deleted',
-  'response.created',
-  'response.done',
-  'response.output_item.added',
-  'response.output_item.done',
-  'response.content_part.added',
-  'response.content_part.done',
-  'response.text.delta',
-  'response.text.done',
-  'response.audio_transcript.delta',
-  'response.audio_transcript.done',
-  'response.audio.delta',
-  'response.audio.done',
-  'response.function_call_arguments.delta',
-  'response.function_call_arguments.done',
-  'rate_limits.updated',
-  'output_audio.playback_started',
-  'output_audio.playback_stopped',
-];
-
-const expandWildcards = (events) => {
-  const expandedEvents = [];
-
-  events.forEach((evt) => {
-    if (evt.endsWith('.*')) {
-      const prefix = evt.slice(0, -2); // Remove the wildcard ".*"
-      const matchingEvents = openai_server_events.filter((e) => e.startsWith(prefix));
-      expandedEvents.push(...matchingEvents);
-    } else {
-      expandedEvents.push(evt);
-    }
-  });
-
-  return expandedEvents;
-};
-
-class TaskLlmOpenAI_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 OpenAI S2S');
-
-    if (['openai', 'microsoft'].indexOf(this.vendor) === -1) {
-      throw new Error(`Invalid vendor ${this.vendor} for OpenAI S2S`);
-    }
-
-    if ('microsoft' === this.vendor && !this.connectionOptions?.host) {
-      throw new Error('connectionOptions.host is required for Microsoft OpenAI S2S');
-    }
-
-    this.apiKey = apiKey;
-    this.authType = 'microsoft' === this.vendor ? 'query' : 'bearer';
-    this.actionHook = this.data.actionHook;
-    this.eventHook = this.data.eventHook;
-    this.toolHook = this.data.toolHook;
-    const {response_create, session_update} = this.data.llmOptions;
-
-    if (typeof response_create !== 'object') {
-      throw new Error('llmOptions with an initial response.create is required for OpenAI S2S');
-    }
-
-    this.response_create = response_create;
-    this.session_update = session_update;
-
-    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 || openai_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 || (this.vendor === 'openai' ? 'api.openai.com' : void 0);
-  }
-
-  get path() {
-    const {path} = this.connectionOptions || {};
-    if (path) return path;
-
-    switch (this.vendor) {
-      case 'openai':
-        return 'v1/realtime?model=gpt-4o-realtime-preview-2024-10-01';
-      case 'microsoft':
-        return 'openai/realtime?api-version=2024-10-01-preview&deployment=gpt-4o-realtime-preview-1001&';
-    }
-  }
-
-  async _api(ep, args) {
-    const res = await ep.api('uuid_openai_s2s', `^^|${args.join('|')}`);
-    if (!res.body?.startsWith('+OK')) {
-      throw new Error({args}, `Error calling uuid_openai_s2s: ${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}, 'TaskLlmOpenAI_S2S:kill - error deleting session'));
-
-    this.notifyTaskDone();
-  }
-
-  /**
-   * Send function call output to the OpenAI server in the form of conversation.item.create
-   * per https://platform.openai.com/docs/guides/realtime/function-calls
-   */
-  async processToolOutput(ep, tool_call_id, data) {
-    try {
-      this.logger.debug({tool_call_id, data}, 'TaskLlmOpenAI_S2S:processToolOutput');
-
-      if (!data.type || data.type !== 'conversation.item.create') {
-        this.logger.info({data},
-          'TaskLlmOpenAI_S2S:processToolOutput - invalid tool output, must be conversation.item.create');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-
-        // spec also recommends to send immediate response.create
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify({type: 'response.create'})]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmOpenAI_S2S:processToolOutput');
-    }
-  }
-
-  /**
-   * Send a session.update to the OpenAI 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}, 'TaskLlmOpenAI_S2S:processLlmUpdate');
-
-      if (!data.type || ![
-        'session.update',
-        'conversation.item.create',
-        'conversation.item.delete',
-        'response.cancel'
-      ].includes(data.type)) {
-        this.logger.info({data}, 'TaskLlmOpenAI_S2S:processLlmUpdate - invalid mid-call request');
-      }
-      else {
-        await this._api(ep, [ep.uuid, ClientEvent, JSON.stringify(data)]);
-      }
-    } catch (err) {
-      this.logger.info({err}, 'TaskLlmOpenAI_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}, 'TaskLlmOpenAI_S2S:_startListening');
-      this.notifyTaskDone();
-    }
-  }
-
-  async _sendClientEvent(ep, obj) {
-    let ok = true;
-    this.logger.debug({obj}, 'TaskLlmOpenAI_S2S:_sendClientEvent');
-    try {
-      const args = [ep.uuid, ClientEvent, JSON.stringify(obj)];
-      await this._api(ep, args);
-    } catch (err) {
-      ok = false;
-      this.logger.error({err}, 'TaskLlmOpenAI_S2S:_sendClientEvent - Error');
-    }
-    return ok;
-  }
-
-  async _sendInitialMessage(ep) {
-    let obj = {type: 'response.create', response: this.response_create};
-    if (!await this._sendClientEvent(ep, obj)) {
-      this.notifyTaskDone();
-    }
-
-    /* send immediate session.update if present */
-    else if (this.session_update) {
-      obj = {type: 'session.update', session: this.session_update};
-      this.logger.debug({obj}, 'TaskLlmOpenAI_S2S:_sendInitialMessage - sending session.update');
-      if (!await this._sendClientEvent(ep, obj)) {
-        this.notifyTaskDone();
-      }
-    }
-  }
-
-  _registerHandlers(ep) {
-    this.addCustomEventListener(ep, LlmEvents_OpenAI.Connect, this._onConnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_OpenAI.ConnectFailure, this._onConnectFailure.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_OpenAI.Disconnect, this._onDisconnect.bind(this, ep));
-    this.addCustomEventListener(ep, LlmEvents_OpenAI.ServerEvent, this._onServerEvent.bind(this, ep));
-  }
-
-  _unregisterHandlers() {
-    this.removeCustomEventListeners();
-  }
-
-  _onError(ep, evt) {
-    this.logger.info({evt}, 'TaskLlmOpenAI_S2S:_onError');
-    this.notifyTaskDone();
-  }
-
-  _onConnect(ep) {
-    this.logger.debug('TaskLlmOpenAI_S2S:_onConnect');
-    this._sendInitialMessage(ep);
-  }
-  _onConnectFailure(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmOpenAI_S2S:_onConnectFailure');
-    this.results = {completionReason: 'connection failure'};
-    this.notifyTaskDone();
-  }
-  _onDisconnect(_ep, evt) {
-    this.logger.info(evt, 'TaskLlmOpenAI_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}, 'TaskLlmOpenAI_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 === 'response.output_item.done' && evt.item?.type === 'function_call') {
-      this.logger.debug({evt}, 'TaskLlmOpenAI_S2S:_onServerEvent - function_call');
-      if (!this.toolHook) {
-        this.logger.warn({evt}, 'TaskLlmOpenAI_S2S:_onServerEvent - no toolHook defined!');
-      }
-      else {
-        const {name, call_id} = evt.item;
-        const args = JSON.parse(evt.item.arguments);
-
-        try {
-          await this.parent.sendToolHook(call_id, {name, args});
-        } catch (err) {
-          this.logger.info({err, evt}, 'TaskLlmOpenAI - 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}, 'TaskLlmOpenAI_S2S:_onServerEvent - error sending event hook'));
-    }
-
-    if (endConversation) {
-      this.logger.info({results: this.results}, 'TaskLlmOpenAI_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 = openai_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
-    }, 'TaskLlmOpenAI_S2S:_populateEvents');
-  }
-}
-
-module.exports = TaskLlmOpenAI_S2S;
--- a/lib/tasks/make_task.js
+++ b/lib/tasks/make_task.js
@@ -62,9 +62,6 @@ function makeTask(logger, obj, parent) {
    case TaskName.Message:
      const TaskMessage = require('./message');
      return new TaskMessage(logger, data, parent);
-    case TaskName.Llm:
-      const TaskLlm = require('./llm');
-      return new TaskLlm(logger, data, parent);
    case TaskName.Rasa:
      const TaskRasa = require('./rasa');
      return new TaskRasa(logger, data, parent);
--- 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/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -39,9 +39,9 @@ class TaskRestDial extends Task {

    if (this.data.amd) {
      this.startAmd = cs.startAmd;
+      this.stopAmd = cs.stopAmd;
      this.on('amd', this._onAmdEvent.bind(this, cs));
    }
-    this.stopAmd = cs.stopAmd;

    this._setCallTimer();
    await this.awaitTaskDone();
@@ -77,13 +77,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,7 +1,6 @@
 const TtsTask = require('./tts-task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const pollySSMLSplit = require('polly-ssml-split');
-const { SpeechCredentialError } = require('../utils/error');

 const breakLengthyTextIfNeeded = (logger,  text) => {
  const chunkSize = 1000;
@@ -62,23 +61,7 @@ class TaskSay extends TtsTask {
    }
  }

-  async exec(cs, obj) {
-    try {
-      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('Say failed due to SpeechCredentialError, finished!');
-        this.emit('playDone');
-        return;
-      }
-      throw error;
-    }
-  }
-
-  async handling(cs, {ep}) {
+  async exec(cs, {ep}) {
    const {srf, accountSid:account_sid, callSid:target_sid} = cs;
    const {writeAlerts, AlertType} = srf.locals;
    const {addFileToCache} = srf.locals.dbHelpers;
@@ -96,7 +79,10 @@ class TaskSay extends TtsTask {
    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
      this.synthesizer.voice :
      cs.speechSynthesisVoice;
-    let label = this.taskInlcudeSynthesizer ? this.synthesizer.label : cs.speechSynthesisLabel;
+    // label can be null/empty in synthesizer config, just use application level label if it's default
+    let label = this.synthesizer.label === 'default' ?
+      cs.speechSynthesisLabel :
+      this.synthesizer.label;

    const fallbackVendor = this.synthesizer.fallbackVendor && this.synthesizer.fallbackVendor !== 'default' ?
      this.synthesizer.fallbackVendor :
@@ -107,8 +93,10 @@ class TaskSay extends TtsTask {
    const fallbackVoice =  this.synthesizer.fallbackVoice && this.synthesizer.fallbackVoice !== 'default' ?
      this.synthesizer.fallbackVoice :
      cs.fallbackSpeechSynthesisVoice;
-    const fallbackLabel = this.taskInlcudeSynthesizer ?
-      this.synthesizer.fallbackLabel : cs.fallbackSpeechSynthesisLabel;
+    // label can be null/empty in synthesizer config, just use application level label if it's default
+    const fallbackLabel = this.synthesizer.fallbackLabel === 'default' ?
+      cs.fallbackSpeechSynthesisLabel :
+      this.synthesizer.fallbackLabel;

    if (cs.hasFallbackTts) {
      vendor = fallbackVendor;
@@ -134,7 +122,7 @@ class TaskSay extends TtsTask {
      } else {
        this.notifyError(
          { msg: 'TTS error', details:`TTS vendor ${vendor} error: ${error}`, failover: 'not available'});
-        throw new SpeechCredentialError(error.message);
+        throw error;
      }
    };
    let filepath;
@@ -153,12 +141,12 @@ class TaskSay extends TtsTask {
          await this.playToConfMember(ep, memberId, confName, confUuid, filepath[segment]);
        }
        else {
-          const isStreaming = filepath[segment].startsWith('say:{');
-          if (isStreaming) {
+          let tts_cache_filename;
+          if (filepath[segment].startsWith('say:{')) {
            const arr = /^say:\{.*\}\s*(.*)$/.exec(filepath[segment]);
            if (arr) this.logger.debug(`Say:exec sending streaming tts request: ${arr[1].substring(0, 64)}..`);
          }
-          else this.logger.debug(`Say:exec sending ${filepath[segment].substring(0, 64)}`);
+          else this.logger.debug(`Say:exec sending  ${filepath[segment].substring(0, 64)}`);
          ep.once('playback-start', (evt) => {
            this.logger.debug({evt}, 'Say got playback-start');
            if (this.otelSpan) {
@@ -166,52 +154,43 @@ class TaskSay extends TtsTask {
              this.otelSpan.end();
              this.otelSpan = null;
              if (evt.variable_tts_cache_filename) {
+                tts_cache_filename = evt.variable_tts_cache_filename;
                cs.trackTmpFile(evt.variable_tts_cache_filename);
              }
+              else {
+                this.logger.info('No tts_cache_filename in playback-start event');
+              }
            }
          });
          ep.once('playback-stop', (evt) => {
-            this.logger.debug({evt}, 'Say got playback-stop');
-            if (evt.variable_tts_error) {
-              writeAlerts({
-                account_sid,
-                alert_type: AlertType.TTS_FAILURE,
-                vendor,
-                detail: evt.variable_tts_error,
-                target_sid
-              }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
+            if (!tts_cache_filename || evt.variable_tts_cache_filename !== tts_cache_filename) {
+              this.logger.info({evt}, 'Say: discarding playback-stop from other say verb');
            }
-            if (evt.variable_tts_cache_filename && !this.killed) {
-              const text = parseTextFromSayString(this.text[segment]);
-              addFileToCache(evt.variable_tts_cache_filename, {
-                account_sid,
-                vendor,
-                language,
-                voice,
-                engine,
-                text
-              }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
-            }
-
-            function extractResponseCode(evt) {
-              for (const key in evt) {
-                if (key.startsWith('variable_tts_') && key.endsWith('_response_code')) {
-                  return evt[key];
-                }
+            else {
+              this.logger.debug({evt}, 'Say got playback-stop');
+              if (evt.variable_tts_error) {
+                writeAlerts({
+                  account_sid,
+                  alert_type: AlertType.TTS_FAILURE,
+                  vendor,
+                  detail: evt.variable_tts_error,
+                  target_sid
+                }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
+              }
+              if (evt.variable_tts_cache_filename && !this.killed) {
+                const text = parseTextFromSayString(this.text[segment]);
+                addFileToCache(evt.variable_tts_cache_filename, {
+                  account_sid,
+                  vendor,
+                  language,
+                  voice,
+                  engine,
+                  text
+                }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
              }
-              return 0;
            }
-
-            const response_code = extractResponseCode(evt);
-
            if (this._playResolve) {
-              //if tts vendor return bad response code or there is variable_tts_error,
-              // say task should reject the promise.
-              ((response_code < 200 && response_code > 299) || evt.variable_tts_error) ?
-                this._playReject(
-                  new Error(evt.variable_tts_error ||
-                    `Synthesizing error, received ${evt.variable_tts_whisper_response_code} from vendor ${vendor}`)) :
-                this._playResolve();
+              evt.variable_tts_error ? this._playReject(new Error(evt.variable_tts_error)) : this._playResolve();
            }
          });
          // wait for playback-stop event received to confirm if the playback is successful
@@ -230,7 +209,6 @@ class TaskSay extends TtsTask {
              continue;
            } catch (err) {
              this.logger.info({err}, 'Error waiting for playback-stop event');
-              throw err;
            }
          } finally {
            this._playPromise = null;
@@ -248,6 +226,7 @@ class TaskSay extends TtsTask {
        segment++;
      }
    }
+    this.emit('playDone');
  }

  async kill(cs) {
--- 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
@@ -2,8 +2,6 @@ const Task = require('./task');
 const assert = require('assert');
 const crypto = require('crypto');
 const { TaskPreconditions, CobaltTranscriptionEvents } = require('../utils/constants');
-const { SpeechCredentialError } = require('../utils/error');
-const {JAMBONES_AWS_TRANSCRIBE_USE_GRPC} = require('../config');

 class SttTask extends Task {

@@ -18,22 +16,14 @@ class SttTask extends Task {
      normalizeTranscription,
      setSpeechCredentialsAtRuntime,
      compileSonioxTranscripts,
-      consolidateTranscripts,
-      updateSpeechmaticsPayload
+      consolidateTranscripts
    } = require('../utils/transcription-utils')(logger);
    this.setChannelVarsForStt = setChannelVarsForStt;
    this.normalizeTranscription = normalizeTranscription;
    this.compileSonioxTranscripts = compileSonioxTranscripts;
    this.consolidateTranscripts = consolidateTranscripts;
-    this.updateSpeechmaticsPayload = updateSpeechmaticsPayload;
    this.eventHandlers = [];
    this.isHandledByPrimaryProvider = true;
-    /**
-     * Task use taskIncludeRecognizer to identify
-     * if taskIncludeRecognizer === true, use label from verb.recognizer, even it's empty
-     * if taskIncludeRecognizer === false, use label from application.recognizer
-     */
-    this.taskIncludeRecognizer = !!this.data.recognizer;
    if (this.data.recognizer) {
      const recognizer = this.data.recognizer;
      this.vendor = recognizer.vendor;
@@ -43,6 +33,7 @@ class SttTask extends Task {
      //fallback
      this.fallbackVendor = recognizer.fallbackVendor || 'default';
      this.fallbackLanguage = recognizer.fallbackLanguage || 'default';
+      // label can be empty and should not have default value.
      this.fallbackLabel = recognizer.fallbackLabel;

      /* let credentials be supplied in the recognizer object at runtime */
@@ -91,7 +82,8 @@ class SttTask extends Task {
      this.language = cs.speechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.language = this.language;
    }
-    if (!this.taskIncludeRecognizer) {
+    // label can be empty, should not assign application level label
+    if ('default' === this.label) {
      this.label = cs.speechRecognizerLabel;
      if (this.data.recognizer) this.data.recognizer.label = this.label;
    }
@@ -104,21 +96,17 @@ class SttTask extends Task {
      this.fallbackLanguage = cs.fallbackSpeechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.fallbackLanguage = this.fallbackLanguage;
    }
-    if (!this.taskIncludeRecognizer) {
+    // label can be empty, should not assign application level label
+    if ('default' === this.fallbackLabel) {
      this.fallbackLabel = cs.fallbackSpeechRecognizerLabel;
      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
    }
-
+    // If call is already fallback to 2nd ASR vendor
+    // use that.
    if (cs.hasFallbackAsr) {
-      if (this.taskIncludeRecognizer) {
-        // reset fallback ASR from previous run if this verb contains data.recognizer.
-        cs.hasFallbackAsr = false;
-      } else {
-        this.logger.debug('Call session has fallback to 2nd ASR, use 2nd recognizer configuration');
-        this.vendor = this.fallbackVendor;
-        this.language = this.fallbackLanguage;
-        this.label = this.fallbackLabel;
-      }
+      this.vendor = this.fallbackVendor;
+      this.language = this.fallbackLanguage;
+      this.label = this.fallbackLabel;
    }
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
@@ -193,8 +181,8 @@ class SttTask extends Task {
        vendor,
        target_sid: cs.callSid
      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
-      // the ASR might have fallback configuration, should not done task here.
-      throw new SpeechCredentialError(`No speech-to-text service credentials for ${vendor} have been configured`);
+      this.notifyTaskDone();
+      throw new Error(`No speech-to-text service credentials for ${vendor} have been configured`);
    }

    if (vendor === 'nuance' && credentials.client_id) {
@@ -218,30 +206,14 @@ class SttTask extends Task {
          region,
          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};
-    }
-    else if (vendor === 'verbio' && credentials.client_id && credentials.client_secret) {
+      this.logger.debug({roleArn}, `got aws access token ${servedFromCache ? 'from cache' : ''}`);
+      credentials = {...credentials, accessKeyId, secretAccessKey, sessionToken};
+    } else if (vendor === 'verbio' && credentials.client_id && credentials.client_secret) {
      const {access_token, servedFromCache} = await getVerbioAccessToken(credentials);
      this.logger.debug({client_id: credentials.client_id},
        `got verbio access token ${servedFromCache ? 'from cache' : ''}`);
      credentials.access_token = access_token;
    }
-    else if (vendor == 'aws' && !JAMBONES_AWS_TRANSCRIBE_USE_GRPC) {
-      /* get AWS access token */
-      const {speech_credential_sid, accessKeyId, secretAccessKey, securityToken, region } = credentials;
-      if (!securityToken) {
-        const { servedFromCache, ...newCredentials} = await getAwsAuthToken({
-          speech_credential_sid,
-          accessKeyId,
-          secretAccessKey,
-          region});
-        this.logger.debug({newCredentials}, `got aws security token ${servedFromCache ? 'from cache' : ''}`);
-        credentials = {...newCredentials, region};
-      }
-    }
-
    return credentials;
  }

@@ -251,12 +223,12 @@ class SttTask extends Task {

  async _initFallback() {
    assert(this.fallbackVendor, 'fallback failed without fallbackVendor configuration');
-    this.logger.info(`Failed to use primary STT provider, fallback to ${this.fallbackVendor}`);
    this.isHandledByPrimaryProvider = false;
    this.cs.hasFallbackAsr = true;
-    this.vendor = this.cs.fallbackSpeechRecognizerVendor = this.fallbackVendor;
-    this.language = this.cs.fallbackSpeechRecognizerLanguage = this.fallbackLanguage;
-    this.label = this.cs.fallbackSpeechRecognizerLabel = this.fallbackLabel;
+    this.logger.info(`Failed to use primary STT provider, fallback to ${this.fallbackVendor}`);
+    this.vendor = this.fallbackVendor;
+    this.language = this.fallbackLanguage;
+    this.label = this.fallbackLabel;
    this.data.recognizer.vendor = this.vendor;
    this.data.recognizer.language = this.language;
    this.data.recognizer.label = this.label;
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -12,13 +12,10 @@ const {
  NvidiaTranscriptionEvents,
  JambonzTranscriptionEvents,
  TranscribeStatus,
-  AssemblyAiTranscriptionEvents,
-  VerbioTranscriptionEvents,
-  SpeechmaticsTranscriptionEvents
+  AssemblyAiTranscriptionEvents
 } = require('../utils/constants.json');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
 const SttTask = require('./stt-task');
-const { SpeechCredentialError } = require('../utils/error');

 const STT_LISTEN_SPAN_NAME = 'stt-listen';

@@ -27,7 +24,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) {
@@ -77,20 +73,7 @@ class TaskTranscribe extends SttTask {
    return this.channel === 2 || this.separateRecognitionPerChannel && this.ep2;
  }

-  async exec(cs, obj) {
-    try {
-      await this.handling(cs, obj);
-    } catch (error) {
-      if (error instanceof SpeechCredentialError) {
-        this.logger.info('Transcribe failed due to SpeechCredentialError, finished!');
-        this.notifyTaskDone();
-        return;
-      }
-      throw error;
-    }
-  }
-
-  async handling(cs, {ep, ep2}) {
+  async exec(cs, {ep, ep2}) {
    await super.exec(cs, {ep, ep2});

    if (this.data.recognizer.vendor === 'nuance') {
@@ -101,6 +84,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 +101,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');
@@ -236,13 +223,6 @@ class TaskTranscribe extends SttTask {
        this.addCustomEventListener(ep, SonioxTranscriptionEvents.Transcription,
          this._onTranscription.bind(this, cs, ep, channel));
        break;
-
-      case 'verbio':
-        this.bugname = `${this.bugname_prefix}verbio_transcribe`;
-        this.addCustomEventListener(
-          ep, VerbioTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        break;
-
      case 'cobalt':
        this.bugname = `${this.bugname_prefix}cobalt_transcribe`;
        this.addCustomEventListener(ep, CobaltTranscriptionEvents.Transcription,
@@ -300,24 +280,6 @@ class TaskTranscribe extends SttTask {
          this._onVendorConnectFailure.bind(this, cs, ep, channel));
        break;

-      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));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Info,
-          this._onSpeechmaticsInfo.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.RecognitionStarted,
-          this._onSpeechmaticsRecognitionStarted.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Connect,
-          this._onVendorConnect.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.ConnectFailure,
-          this._onVendorConnectFailure.bind(this, cs, ep));
-        this.addCustomEventListener(ep, SpeechmaticsTranscriptionEvents.Error,
-          this._onSpeechmaticsError.bind(this, cs, ep));
-        break;
-
      default:
        if (this.vendor.startsWith('custom:')) {
          this.bugname = `${this.bugname_prefix}${this.vendor}_transcribe`;
@@ -444,7 +406,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 +431,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,54 +457,12 @@ 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 */
      if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
        this.childSpan[channel - 1].span.setAttributes({
          channel,
-          'stt.label': this.label || 'None',
          'stt.resolve': 'transcript',
          'stt.result': JSON.stringify(evt)
        });
@@ -596,8 +516,7 @@ class TaskTranscribe extends SttTask {
    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
      this.childSpan[channel - 1].span.setAttributes({
        channel,
-        'stt.resolve': 'timeout',
-        'stt.label': this.label || 'None',
+        'stt.resolve': 'timeout'
      });
      this.childSpan[channel - 1].span.end();
    }
@@ -614,8 +533,7 @@ class TaskTranscribe extends SttTask {
    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
      this.childSpan[channel - 1].span.setAttributes({
        channel,
-        'stt.resolve': 'max duration exceeded',
-        'stt.label': this.label || 'None',
+        'stt.resolve': 'max duration exceeded'
      });
      this.childSpan[channel - 1].span.end();
    }
@@ -641,6 +559,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 +570,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',
@@ -697,8 +617,7 @@ class TaskTranscribe extends SttTask {
    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
      this.childSpan[channel - 1].span.setAttributes({
        channel,
-        'stt.resolve': 'connection failure',
-        'stt.label': this.label || 'None',
+        'stt.resolve': 'connection failure'
      });
      this.childSpan[channel - 1].span.end();
    }
@@ -707,20 +626,6 @@ class TaskTranscribe extends SttTask {
    }
  }

-  async _onSpeechmaticsRecognitionStarted(_cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsRecognitionStarted');
-  }
-
-  async _onSpeechmaticsInfo(_cs, _ep, evt) {
-    this.logger.debug({evt}, 'TaskGather:_onSpeechmaticsInfo');
-  }
-
-  async _onSpeechmaticsError(cs, _ep, evt) {
-    // eslint-disable-next-line no-unused-vars
-    const {message, ...e} = evt;
-    this._onVendorError(cs, _ep, {error: JSON.stringify(e)});
-  }
-
  _startAsrTimer(channel) {
    if (this.vendor === 'deepgram') return; // no need
    assert(this.isContinuousAsr);
--- a/lib/tasks/tts-task.js
+++ b/lib/tasks/tts-task.js
@@ -1,7 +1,5 @@
 const Task = require('./task');
 const { TaskPreconditions } = require('../utils/constants');
-const { SpeechCredentialError } = require('../utils/error');
-const dbUtils = require('../utils/db-utils');

 class TtsTask extends Task {

@@ -12,12 +10,6 @@ class TtsTask extends Task {
    this.preconditions = TaskPreconditions.Endpoint;

    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
-    /**
-     * 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.taskInlcudeSynthesizer = !!this.data.synthesizer;
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
    this.options = this.synthesizer.options || {};
@@ -46,16 +38,13 @@ class TtsTask extends Task {

  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';
    const salt = cs.callSid;

    let 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`);
-    }
    /* parse Nuance voices into name and model */
    let model;
    if (vendor === 'nuance' && voice) {
@@ -83,51 +72,16 @@ class TtsTask extends Task {
      credentials.optimize_streaming_latency = this.options.optimize_streaming_latency
      || credentials.optimize_streaming_latency;
      voice = this.options.voice_id || voice;
-    } else if (vendor === 'rimelabs') {
-      credentials = credentials || {};
-      credentials.model_id = this.options.model_id || credentials.model_id;
-    } else if (vendor === 'whisper') {
-      credentials = credentials || {};
-      credentials.model_id = this.options.model_id || credentials.model_id;
-    } else if (vendor === 'verbio') {
-      credentials = credentials || {};
-      credentials.engine_version = this.options.engine_version || credentials.engine_version;
-    } 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,
-          };
-        }
-      }
    }

-    /**
-     * note on cache_speech_handles.  This was found to be risky.
-     * It can cause a crash in the following sequence on a single call:
-     * 1. Stream tts on vendor A with cache_speech_handles=1, then
-     * 2. Stream tts on vendor B with cache_speech_handles=1
-     *
-     * we previously tried to track when vendors were switched and manage the flag accordingly,
-     * but it difficult to track all the scenarios and the benefit (slightly faster start to tts playout)
-     * is probably minimal.  DH.
-     */
    ep.set({
      tts_engine: vendor.startsWith('custom:') ? 'custom' : vendor,
      tts_voice: voice,
-      //cache_speech_handles: !cs.currentTtsVendor || cs.currentTtsVendor === vendor ? 1 : 0,
-      cache_speech_handles: 0,
+      cache_speech_handles: !cs.currentTtsVendor || cs.currentTtsVendor === vendor ? 1 : 0,
    }).catch((err) => this.logger.info({err}, 'Error setting tts_engine on endpoint'));
    // set the current vendor on the call session
    // If vendor is changed from the previous one, then reset the cache_speech_handles flag
-    //cs.currentTtsVendor = vendor;
+    cs.currentTtsVendor = vendor;

    if (!preCache && !this._disableTracing) this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
    try {
@@ -138,8 +92,10 @@ class TtsTask extends Task {
          vendor,
          target_sid: cs.callSid
        }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
-        throw new SpeechCredentialError('no provisioned speech credentials for TTS');
+        throw new Error('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) => {
@@ -151,8 +107,7 @@ class TtsTask extends Task {
          const {span} = this.startChildSpan('tts-generation', {
            'tts.vendor': vendor,
            'tts.language': language,
-            'tts.voice': voice,
-            'tts.label': label || 'None',
+            'tts.voice': voice
          });
          this.otelSpan = span;
        }
@@ -179,6 +134,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
@@ -2,6 +2,7 @@ const makeTask = require('../tasks/make_task');
 const Emitter = require('events');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
 const {TaskName} = require('../utils/constants');
+const assert = require('assert');

 /**
 * ActionHookDelayProcessor
@@ -24,12 +25,10 @@ class ActionHookDelayProcessor extends Emitter {
    this._active = false;

    const enabled = this.init(opts);
-    if (enabled && this.noResponseTimeout &&
-          (!this.actions || !Array.isArray(this.actions) || this.actions.length === 0)) {
+    if (enabled && (!this.actions || !Array.isArray(this.actions) || this.actions.length === 0)) {
      throw new Error('ActionHookDelayProcessor: no actions specified');
    }
-    else if (enabled && this.actions &&
-          this.actions.some((a) => !a.verb || ![TaskName.Say, TaskName.Play].includes(a.verb))) {
+    else if (enabled && this.actions.some((a) => !a.verb || ![TaskName.Say, TaskName.Play].includes(a.verb))) {
      throw new Error(`ActionHookDelayProcessor: invalid actions specified: ${JSON.stringify(this.actions)}`);
    }
  }
@@ -52,9 +51,8 @@ class ActionHookDelayProcessor extends Emitter {

    this.actions = opts.actions;
    this.retries = opts.retries || 0;
-    this.noResponseTimeout = opts.noResponseTimeout;
+    this.noResponseTimeout = opts.noResponseTimeout || 0;
    this.noResponseGiveUpTimeout = opts.noResponseGiveUpTimeout;
-    this.giveUpActions = opts.giveUpActions;

    // return false if these options actually disable the ahdp
    return ('enable' in opts && opts.enable === true) ||
@@ -68,16 +66,11 @@ class ActionHookDelayProcessor extends Emitter {
      this.logger.debug('ActionHookDelayProcessor#start: already started due to prior gather which is continuing');
      return;
    }
+    assert(!this._noResponseTimer);
    this._active = true;
    this._retryCount = 0;
-    if (this.noResponseTimeout > 0) {
-      const timeoutMs =  this.noResponseTimeout * 1000;
-      this._noResponseTimer = setTimeout(this._onNoResponseTimer.bind(this), timeoutMs);
-    } else {
-      this.logger.debug(
-        'ActionHookDelayProcessor#start: noResponseTimeout is 0 or undefined hence not calling _onNoResponseTimer'
-      );
-    }
+    const timeoutMs =  this.noResponseTimeout === 0 ? 1 : this.noResponseTimeout * 1000;
+    this._noResponseTimer = setTimeout(this._onNoResponseTimer.bind(this), timeoutMs);

    if (this.noResponseGiveUpTimeout > 0) {
      const timeoutMs = this.noResponseGiveUpTimeout * 1000;
@@ -86,6 +79,7 @@ class ActionHookDelayProcessor extends Emitter {
  }

  async stop() {
+    this.logger.debug('ActionHookDelayProcessor#stop');
    this._active = false;

    if (this._noResponseTimer) {
@@ -97,19 +91,25 @@ class ActionHookDelayProcessor extends Emitter {
      this._noResponseGiveUpTimer = null;
    }
    if (this._taskInProgress) {
-      this.logger.debug(`ActionHookDelayProcessor#stop: stopping ${this._taskInProgress.name}`);
+      this.logger.debug(`ActionHookDelayProcessor#stop: killing task in progress: ${this._taskInProgress.name}`);

-      this._sayResolver = () => {
-        this.logger.debug('ActionHookDelayProcessor#stop: play/say is done, continue on..');
-        //this._taskInProgress.kill(this.cs);
-        this._taskInProgress = null;
-      };
-
-      /* we let Say finish, but interrupt Play */
-      if (TaskName.Play === this._taskInProgress.name) {
-        await this._taskInProgress.kill(this.cs);
+      /** if we are doing a play, kill it immediately
+       * if we are doing a say, wait for it to finish
+       */
+      if (TaskName.Say === this._taskInProgress.name) {
+        this._sayResolver = () => {
+          this.logger.debug('ActionHookDelayProcessor#stop: say is done, continue on..');
+          this._taskInProgress.kill(this.cs);
+          this._taskInProgress = null;
+        };
+        this.logger.debug('ActionHookDelayProcessor#stop returning promise');
+        return new Promise((resolve) => this._sayResolver = resolve);
+      }
+      else {
+        /* play */
+        this._taskInProgress.kill(this.cs);
+        this._taskInProgress = null;
      }
-      return new Promise((resolve) => this._sayResolver = resolve);
    }
    this.logger.debug('ActionHookDelayProcessor#stop returning');
  }
@@ -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;
@@ -142,9 +137,7 @@ class ActionHookDelayProcessor extends Emitter {
      this.logger.debug({evt}, 'got playback-start');
      if (!this._active) {
        this.logger.info({evt}, 'ActionHookDelayProcessor#_onNoResponseTimer: killing audio immediately');
-
-        /* note: in race condition we may have just hung up and cs.ep cleared */
-        this.ep?.api('uuid_break', this.ep?.uuid)
+        this.ep.api('uuid_break', this.ep.uuid)
          .catch((err) => this.logger.info(err,
            'ActionHookDelayProcessor#_onNoResponseTimer Error killing audio'));
      }
@@ -154,7 +147,7 @@ class ActionHookDelayProcessor extends Emitter {
      this._taskInProgress = null;
      if (this._sayResolver) {
        /* we were waiting for the play to finish before continuing to next task */
-        this.logger.debug({evt}, 'ActionHookDelayProcessor#_onNoResponseTimer got playback-stop');
+        this.logger.debug({evt}, 'got playback-stop');
        this._sayResolver();
        this._sayResolver = null;
      }
@@ -173,14 +166,9 @@ class ActionHookDelayProcessor extends Emitter {

  _onNoResponseGiveUpTimer() {
    this._active = false;
-    if (!this.giveUpActions) {
-      this.logger.info('ActionHookDelayProcessor#_onNoResponseGiveUpTimer');
-      this.stop().catch((err) => {});
-      this.emit('giveup');
-    } else {
-      this.logger.info('ActionHookDelayProcessor#_onNoResponseGiveUpTimer - giveUpActions');
-      this.emit('giveupWithTasks', this.giveUpActions);
-    }
+    this.logger.info('ActionHookDelayProcessor#_onNoResponseGiveUpTimer');
+    this.stop().catch((err) => {});
+    this.emit('giveup');
  }
 }

--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -14,7 +14,6 @@
    "Leave": "leave",
    "Lex": "lex",
    "Listen": "listen",
-    "Llm": "llm",
    "Message": "message",
    "Pause": "pause",
    "Play": "play",
@@ -127,15 +126,6 @@
    "NoSpeechDetected": "azure_transcribe::no_speech_detected",
    "VadDetected": "azure_transcribe::vad_detected"
  },
-  "SpeechmaticsTranscriptionEvents": {
-    "Transcription": "speechmatics_transcribe::transcription",
-    "Translation": "speechmatics_transcribe::translation",
-    "Info": "speechmatics_transcribe::info",
-    "RecognitionStarted": "speechmatics_transcribe::recognition_started",
-    "ConnectFailure": "speechmatics_transcribe::connect_failed",
-    "Connect": "speechmatics_transcribe::connect",
-    "Error": "speechmatics_transcribe::error"
-  },
  "JambonzTranscriptionEvents": {
    "Transcription": "jambonz_transcribe::transcription",
    "ConnectFailure": "jambonz_transcribe::connect_failed",
@@ -168,13 +158,6 @@
    "StandbyEnter": "standby-enter",
    "StandbyExit": "standby-exit"
  },
-  "LlmEvents_OpenAI": {
-    "Error": "error",
-    "Connect": "openai_s2s::connect",
-    "ConnectFailure": "openai_s2s::connect_failed",
-    "Disconnect": "openai_s2s::disconnect",
-    "ServerEvent": "openai_s2s::server_event"
-  },
  "QueueResults": {
    "Bridged": "bridged",
    "Error": "error",
@@ -201,8 +184,6 @@
    "dial:confirm",
    "verb:hook",
    "verb:status",
-    "llm:event",
-    "llm:tool-call",
    "jambonz:error"
  ],
  "RecordState": {
@@ -221,18 +202,7 @@
    "ToneTimeout": "amd_tone_timeout",
    "Stopped": "amd_stopped"
  },
-  "MediaPath": {
-    "NoMedia": "no-media",
-    "PartialMedia": "partial-media",
-    "FullMedia": "full-media"
-  },
  "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"
+  "FS_UUID_SET_NAME": "fsUUIDs"
 }
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -91,47 +91,35 @@ const speechMapper = (cred) => {
    else if ('cobalt' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.cobalt_server_uri = o.cobalt_server_uri;
-    }
-    else if ('elevenlabs' === obj.vendor) {
+    } else if ('elevenlabs' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
      obj.options = o.options;
-    }
-    else if ('playht' === obj.vendor) {
+    } else if ('playht' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.user_id = o.user_id;
      obj.voice_engine = o.voice_engine;
      obj.options = o.options;
-    }
-    else if ('rimelabs' === obj.vendor) {
+    } else if ('rimelabs' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
      obj.options = o.options;
-    }
-    else if ('assemblyai' === obj.vendor) {
+    } else if ('assemblyai' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
-    }
-    else if ('whisper' === obj.vendor) {
+    } else if ('whisper' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
-    }
-    else if ('verbio' === obj.vendor) {
+    }  else if ('verbio' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.client_id = o.client_id;
      obj.client_secret = o.client_secret;
      obj.engine_version = o.engine_version;
-    }
-    else if ('speechmatics' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.speechmatics_stt_uri = o.speechmatics_stt_uri;
-    }
-    else if (obj.vendor.startsWith('custom:')) {
+    } else if (obj.vendor.startsWith('custom:')) {
      const o = JSON.parse(decrypt(credential));
      obj.auth_token = o.auth_token;
      obj.custom_stt_url = o.custom_stt_url;
@@ -215,23 +203,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,24 +0,0 @@
-class NonFatalTaskError 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;
-  }
-}
-
-module.exports = {
-  SpeechCredentialError,
-  NonFatalTaskError,
-  PlayFileNotFoundError
-};
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -1,5 +1,5 @@
 const Mrf = require('drachtio-fsmrf');
-const os = require('os');
+const ip = require('ip');
 const {
  JAMBONES_MYSQL_HOST,
  JAMBONES_MYSQL_USER,
@@ -12,25 +12,11 @@ const {
  JAMBONES_TIME_SERIES_HOST,
  JAMBONES_ESL_LISTEN_ADDRESS,
  PORT,
-  HTTP_IP,
  NODE_ENV,
 } = require('../config');
 const Registrar = require('@jambonz/mw-registrar');
 const assert = require('assert');

-function getLocalIp() {
-  const interfaces = os.networkInterfaces();
-  for (const interfaceName in interfaces) {
-    const interface = interfaces[interfaceName];
-    for (const iface of interface) {
-      if (iface.family === 'IPv4' && !iface.internal) {
-        return iface.address;
-      }
-    }
-  }
-  return '127.0.0.1'; // Fallback to localhost if no suitable interface found
-}
-
 function initMS(logger, wrapper, ms) {
  Object.assign(wrapper, {ms, active: true, connects: 1});
  logger.info(`connected to freeswitch at ${ms.address}`);
@@ -152,8 +138,7 @@ function installSrfLocals(srf, logger) {
    lookupAccountBySid,
    lookupAccountCapacitiesBySid,
    lookupSmppGateways,
-    lookupClientByAccountAndUsername,
-    lookupSystemInformation
+    lookupClientByAccountAndUsername
  } = require('@jambonz/db-helpers')({
    host: JAMBONES_MYSQL_HOST,
    user: JAMBONES_MYSQL_USER,
@@ -199,8 +184,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,
@@ -209,8 +193,7 @@ function installSrfLocals(srf, logger) {

  let localIp;
  try {
-    // Either use the configured IP address or discover it
-    localIp = HTTP_IP || getLocalIp();
+    localIp = ip.address();
  } catch (err) {
    logger.error({err}, 'installSrfLocals - error detecting local ipv4 address');
  }
@@ -230,7 +213,6 @@ function installSrfLocals(srf, logger) {
      lookupAccountCapacitiesBySid,
      lookupSmppGateways,
      lookupClientByAccountAndUsername,
-      lookupSystemInformation,
      updateCallStatus,
      retrieveCall,
      listCalls,
@@ -270,8 +252,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');
@@ -213,8 +213,6 @@ class SingleDialer extends Emitter {
        },
        cbProvisional: (prov) => {
          const status = {sipStatus: prov.status, sipReason: prov.reason};
-          // Update call-id for sbc outbound INVITE
-          this.callInfo.sbcCallid = prov.get('X-CID');
          if ([180, 183].includes(prov.status) && prov.body) {
            if (status.callStatus !== CallStatus.EarlyMedia) {
              status.callStatus = CallStatus.EarlyMedia;
@@ -381,8 +379,7 @@ class SingleDialer extends Emitter {
        callInfo: this.callInfo,
        accountInfo: this.accountInfo,
        tasks,
-        rootSpan: this.rootSpan,
-        req: this.req
+        rootSpan: this.rootSpan
      });
      await cs.exec();

@@ -450,32 +447,25 @@ class SingleDialer extends Emitter {
    });

    cs.req = this.req;
-    // fixed hangup an adulting session does not send status callback Completed
-    cs.wrapDialog(this.dlg);
    cs.exec().catch((err) => newLogger.error({err}, 'doAdulting: error executing session'));
    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, {
@@ -483,11 +473,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
@@ -1,4 +1,7 @@
-const {TaskName} = require('./constants.json');
+const {
+  TaskName,
+} = require('./constants.json');
+
 const stickyVars = {
  google: [
    'GOOGLE_SPEECH_HINTS',
@@ -48,13 +51,7 @@ const stickyVars = {
  aws: [
    'AWS_VOCABULARY_NAME',
    'AWS_VOCABULARY_FILTER_METHOD',
-    'AWS_VOCABULARY_FILTER_NAME',
-    'AWS_LANGUAGE_MODEL_NAME',
-    'AWS_ACCESS_KEY_ID',
-    'AWS_SECRET_ACCESS_KEY',
-    'AWS_REGION',
-    'AWS_SECURITY_TOKEN',
-    'AWS_PII_ENTITY_TYPES',
+    'AWS_VOCABULARY_FILTER_NAME'
  ],
  nuance: [
    'NUANCE_ACCESS_TOKEN',
@@ -103,14 +100,6 @@ const stickyVars = {
  assemblyai: [
    'ASSEMBLYAI_API_KEY',
    'ASSEMBLYAI_WORD_BOOST'
-  ],
-  speechmatics: [
-    'SPEECHMATICS_API_KEY',
-    'SPEECHMATICS_HOST',
-    'SPEECHMATICS_PATH',
-    'SPEECHMATICS_SPEECH_HINTS',
-    'SPEECHMATICS_TRANSLATION_LANGUAGES',
-    'SPEECHMATICS_TRANSLATION_PARTIALS'
  ]
 };

@@ -153,6 +142,7 @@ const optimalDeepramModels = {
  tr: ['nova-2', 'nova-2'],
  uk: ['nova-2', 'nova-2']
 };
+
 const selectDefaultDeepgramModel = (task, language) => {
  if (language in optimalDeepramModels) {
    const [gather, transcribe] = optimalDeepramModels[language];
@@ -161,34 +151,8 @@ const selectDefaultDeepgramModel = (task, language) => {
  return 'base';
 };

-const optimalGoogleModels = {
-  'v1' : {
-    'en-IN':['telephony', 'telephony'],
-    'es-DO':['default', 'default'],
-    'es-MX':['default', 'default'],
-    'en-AU':['telephony', 'telephony'],
-    'en-GB':['telephony', 'telephony'],
-    'en-NZ':['telephony', 'telephony']
-  },
-  'v2' : {
-    'en-IN':['telephony', 'long']
-  }
-};
-const selectDefaultGoogleModel = (task, language, version) => {
-  const useV2 = version === 'v2';
-  if (language in optimalGoogleModels[version]) {
-    const [gather, transcribe] = optimalGoogleModels[version][language];
-    return task.name === TaskName.Gather ? gather : transcribe;
-  }
-  return task.name === TaskName.Gather ?
-    (useV2 ? 'telephony_short' : 'command_and_search') :
-    (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;
@@ -460,41 +424,16 @@ const normalizeMicrosoft = (evt, channel, language, punctuation = true) => {

 const normalizeAws = (evt, channel, language) => {
  const copy = JSON.parse(JSON.stringify(evt));
-  const isGrpcPayload = Array.isArray(evt);
-  if (isGrpcPayload) {
-    /* legacy grpc api */
-    return {
-      language_code: language,
-      channel_tag: channel,
-      is_final: evt[0].is_final,
-      alternatives: evt[0].alternatives,
-      vendor: {
-        name: 'aws',
-        evt: copy
-      }
-    };
-  }
-  else {
-    /* websocket api */
-    const alternatives = evt.Transcript?.Results[0]?.Alternatives.map((alt) => {
-      const items = alt.Items.filter((item) => item.Type === 'pronunciation' && 'Confidence' in item);
-      const confidence = items.reduce((acc, item) => acc + item.Confidence, 0) / items.length;
-      return {
-        transcript: alt.Transcript,
-        confidence
-      };
-    });
-    return {
-      language_code: language,
-      channel_tag: channel,
-      is_final: evt.Transcript?.Results[0].IsPartial === false,
-      alternatives,
-      vendor: {
-        name: 'aws',
-        evt: copy
-      }
-    };
-  }
+  return {
+    language_code: language,
+    channel_tag: channel,
+    is_final: evt[0].is_final,
+    alternatives: evt[0].alternatives,
+    vendor: {
+      name: 'aws',
+      evt: copy
+    }
+  };
 };

 const normalizeAssemblyAi = (evt, channel, language) => {
@@ -510,37 +449,12 @@ const normalizeAssemblyAi = (evt, channel, language) => {
      }
    ],
    vendor: {
-      name: 'assemblyai',
+      name: 'ASSEMBLYAI',
      evt: copy
    }
  };
 };

-const normalizeSpeechmatics = (evt, channel, language) => {
-  const copy = JSON.parse(JSON.stringify(evt));
-  const is_final = evt.message === 'AddTranscript';
-  const words = evt.results?.filter((r) => r.type === 'word') || [];
-  const confidence = words.length > 0 ?
-    words.reduce((acc, word) => acc + word.alternatives[0].confidence, 0) / words.length :
-    0;
-
-  const alternative = {
-    confidence,
-    transcript: evt.metadata?.transcript
-  };
-  const obj = {
-    language_code: language,
-    channel_tag: channel,
-    is_final,
-    alternatives: [alternative],
-    vendor: {
-      name: 'speechmatics',
-      evt: copy
-    }
-  };
-  return obj;
-};
-
 module.exports = (logger) => {
  const normalizeTranscription = (evt, vendor, channel, language, shortUtterance, punctuation) => {

@@ -568,8 +482,6 @@ module.exports = (logger) => {
        return normalizeAssemblyAi(evt, channel, language, shortUtterance);
      case 'verbio':
        return normalizeVerbio(evt, channel, language);
-      case 'speechmatics':
-        return normalizeSpeechmatics(evt, channel, language);
      default:
        if (vendor.startsWith('custom:')) {
          return normalizeCustom(evt, channel, language, vendor);
@@ -585,9 +497,9 @@ module.exports = (logger) => {

    if ('google' === vendor) {
      const useV2 = rOpts.googleOptions?.serviceVersion === 'v2';
-      const version = useV2 ? 'v2' : 'v1';
-      let {model} = rOpts;
-      model = model || selectDefaultGoogleModel(task, language, version);
+      const model = task.name === TaskName.Gather ?
+        (useV2 ? 'telephony_short' : 'command_and_search') :
+        (useV2 ? 'long' : 'latest_long');
      opts = {
        ...opts,
        ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
@@ -643,29 +555,17 @@ module.exports = (logger) => {
      };
    }
    else if (['aws', 'polly'].includes(vendor)) {
-      const {awsOptions = {}} = rOpts;
-      const vocabularyName = awsOptions.vocabularyName || rOpts.vocabularyName;
-      const vocabularyFilterName = awsOptions.vocabularyFilterName || rOpts.vocabularyFilterName;
-      const filterMethod = awsOptions.vocabularyFilterMethod || rOpts.filterMethod;
      opts = {
        ...opts,
-        ...(vocabularyName && {AWS_VOCABULARY_NAME: vocabularyName}),
-        ...(vocabularyFilterName && {AWS_VOCABULARY_FILTER_NAME: vocabularyFilterName}),
-        ...(filterMethod && {AWS_VOCABULARY_FILTER_METHOD: filterMethod}),
+        ...(rOpts.vocabularyName && {AWS_VOCABULARY_NAME: rOpts.vocabularyName}),
+        ...(rOpts.vocabularyFilterName && {AWS_VOCABULARY_FILTER_NAME: rOpts.vocabularyFilterName}),
+        ...(rOpts.filterMethod && {AWS_VOCABULARY_FILTER_METHOD: rOpts.filterMethod}),
        ...(sttCredentials && {
-          AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
-          AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
+          ...(sttCredentials.accessKeyId && {AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId}),
+          ...(sttCredentials.secretAccessKey && {AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey}),
          AWS_REGION: sttCredentials.region,
-          AWS_SECURITY_TOKEN: sttCredentials.securityToken
+          ...(sttCredentials.sessionToken && {AWS_SESSION_TOKEN: sttCredentials.sessionToken}),
        }),
-        ...(awsOptions.accessKey && {AWS_ACCESS_KEY_ID: awsOptions.accessKey}),
-        ...(awsOptions.secretKey && {AWS_SECRET_ACCESS_KEY: awsOptions.secretKey}),
-        ...(awsOptions.region && {AWS_REGION: awsOptions.region}),
-        ...(awsOptions.securityToken && {AWS_SECURITY_TOKEN: awsOptions.securityToken}),
-        ...(awsOptions.languageModelName && {AWS_LANGUAGE_MODEL_NAME: awsOptions.languageModelName}),
-        ...(awsOptions.piiEntityTypes?.length && {AWS_PII_ENTITY_TYPES: awsOptions.piiEntityTypes.join(',')}),
-        ...(awsOptions.piiIdentifyEntities && {AWS_PII_IDENTIFY_ENTITIES: true}),
-        ...(awsOptions.languageModelName && {AWS_LANGUAGE_MODEL_NAME: awsOptions.languageModelName}),
      };
    }
    else if ('microsoft' === vendor) {
@@ -911,8 +811,7 @@ module.exports = (logger) => {
        ...(cobaltOptions.enableConfusionNetwork && {COBALT_ENABLE_CONFUSION_NETWORK: 1}),
        ...(cobaltOptions.compiledContextData && {COBALT_COMPILED_CONTEXT_DATA: cobaltOptions.compiledContextData}),
      };
-    }
-    else if ('assemblyai' === vendor) {
+    } else if ('assemblyai' === vendor) {
      opts = {
        ...opts,
        ...(sttCredentials.api_key) &&
@@ -920,8 +819,7 @@ module.exports = (logger) => {
        ...(rOpts.hints?.length > 0 &&
          {ASSEMBLYAI_WORD_BOOST: JSON.stringify(rOpts.hints)})
      };
-    }
-    else if ('verbio' === vendor) {
+    } else if ('verbio' === vendor) {
      const {verbioOptions = {}} = rOpts;
      opts = {
        ...opts,
@@ -940,24 +838,8 @@ module.exports = (logger) => {
        ...(verbioOptions.speech_incomplete_timeout &&
          {VERBIO_SPEECH_INCOMPLETE_TIMEOUT: verbioOptions.speech_incomplete_timeout}),
      };
-    }
-    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
-          }
-        ),
-      };
-    }
-    else if (vendor.startsWith('custom:')) {
-      let {options = {}} = rOpts.customOptions || {};
+    } else if (vendor.startsWith('custom:')) {
+      let {options = {}} = rOpts;
      const {sampleRate} = rOpts.customOptions || {};
      const {auth_token, custom_stt_url} = sttCredentials;
      options = {
@@ -1024,6 +906,6 @@ module.exports = (logger) => {
    setChannelVarsForStt,
    setSpeechCredentialsAtRuntime,
    compileSonioxTranscripts,
-    consolidateTranscripts,
+    consolidateTranscripts
  };
 };
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -44,7 +44,7 @@ class WsRequestor extends BaseRequestor {
  async request(type, hook, params, httpHeaders = {}) {
    assert(HookMsgTypes.includes(type));
    const url = hook.url || hook;
-    const wantsAck = !['call:status', 'verb:status', 'jambonz:error', 'llm:event', 'llm:tool-call'].includes(type);
+    const wantsAck = !['call:status', 'verb:status', 'jambonz:error'].includes(type);

    if (this.maliciousClient) {
      this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
@@ -132,7 +132,7 @@ class WsRequestor extends BaseRequestor {
      type,
      msgid,
      call_sid: this.call_sid,
-      hook: ['verb:hook', 'session:redirect', 'llm:event', 'llm:tool-call'].includes(type) ? url : undefined,
+      hook: ['verb:hook', 'session:redirect'].includes(type) ? url : undefined,
      data: {...payload},
      ...b3
    };
@@ -392,9 +392,8 @@ class WsRequestor extends BaseRequestor {
    /* messages must be JSON format */
    try {
      const obj = JSON.parse(content);
-      this.logger.debug({obj}, 'WsRequestor:_onMessage - received message');
      //const {type, msgid, command, call_sid = this.call_sid, queueCommand = false, data} = obj;
-      const {type, msgid, command, queueCommand = false, tool_call_id, data} = obj;
+      const {type, msgid, command, queueCommand = false, data} = obj;
      const call_sid = obj.callSid || this.call_sid;

      //this.logger.debug({obj}, 'WsRequestor:request websocket: received');
@@ -408,8 +407,8 @@ class WsRequestor extends BaseRequestor {

        case 'command':
          assert.ok(command, 'command 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);
+          assert.ok(data, 'data property not supplied');
+          this._recvCommand(msgid, command, call_sid, queueCommand, data);
          break;

        default:
@@ -433,10 +432,10 @@ class WsRequestor extends BaseRequestor {
    success && success(data);
  }

-  _recvCommand(msgid, command, call_sid, queueCommand, tool_call_id, data) {
+  _recvCommand(msgid, command, call_sid, queueCommand, data) {
    // TODO: validate command
    this.logger.debug({msgid, command, call_sid, queueCommand, data}, 'received command');
-    this.emit('command', {msgid, command, call_sid, queueCommand, tool_call_id, data});
+    this.emit('command', {msgid, command, call_sid, queueCommand, data});
  }
 }

--- 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.2",
+  "version": "0.9.0",
  "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.1.22",
+    "@jambonz/speech-utils": "^0.1.15",
    "@jambonz/stats-collector": "^0.1.10",
-    "@jambonz/time-series": "^0.2.12",
-    "@jambonz/verb-specifications": "^0.0.90",
+    "@jambonz/time-series": "^0.2.9",
+    "@jambonz/verb-specifications": "^0.0.79",
    "@opentelemetry/api": "^1.8.0",
    "@opentelemetry/exporter-jaeger": "^1.23.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
@@ -47,10 +47,11 @@
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.46",
+    "drachtio-fsmrf": "^3.0.43",
    "drachtio-srf": "^4.5.35",
    "express": "^4.19.2",
    "express-validator": "^7.0.1",
+    "ip": "^2.0.1",
    "moment": "^2.30.1",
    "parse-url": "^9.2.0",
    "pino": "^8.20.0",
@@ -60,10 +61,10 @@
    "short-uuid": "^5.1.0",
    "sinon": "^17.0.1",
    "to-snake-case": "^1.0.0",
-    "undici": "^6.20.0",
+    "undici": "^6.19.2",
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
-    "ws": "^8.18.0",
+    "ws": "^8.17.1",
    "xml2js": "^0.6.2"
  },
  "devDependencies": {
--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -1,5 +1,4 @@
 /* SQLEditor (MySQL (2))*/
-
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -54,8 +53,6 @@ DROP TABLE IF EXISTS signup_history;

 DROP TABLE IF EXISTS smpp_addresses;

-DROP TABLE IF EXISTS google_custom_voices;
-
 DROP TABLE IF EXISTS speech_credentials;

 DROP TABLE IF EXISTS system_information;
@@ -139,9 +136,6 @@ account_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
 username VARCHAR(64),
 password VARCHAR(1024),
-allow_direct_app_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_queue_calling BOOLEAN NOT NULL DEFAULT 1,
-allow_direct_user_calling BOOLEAN NOT NULL DEFAULT 1,
 PRIMARY KEY (client_sid)
 );

@@ -344,25 +338,11 @@ label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );

-CREATE TABLE google_custom_voices
-(
-google_custom_voice_sid CHAR(36) NOT NULL UNIQUE ,
-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)
-);
-
 CREATE TABLE system_information
 (
 domain_name VARCHAR(255),
 sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255),
-private_network_cidr VARCHAR(8192),
-log_level ENUM('info', 'debug') NOT NULL DEFAULT 'info'
+monitoring_domain_name VARCHAR(255)
 );

 CREATE TABLE users
@@ -457,14 +437,11 @@ CREATE TABLE sip_gateways
 sip_gateway_sid CHAR(36),
 ipv4 VARCHAR(128) NOT NULL COMMENT 'ip address or DNS name of the gateway.  For gateways providing inbound calling service, ip address is required.',
 netmask INTEGER NOT NULL DEFAULT 32,
-port INTEGER COMMENT 'sip signaling port',
+port INTEGER NOT NULL DEFAULT 5060 COMMENT 'sip signaling port',
 inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound calls from the gateway',
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-send_options_ping BOOLEAN NOT NULL DEFAULT 0,
-use_sips_scheme BOOLEAN NOT NULL DEFAULT 0,
-pad_crypto BOOLEAN NOT NULL DEFAULT 0,
 protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';
@@ -501,19 +478,11 @@ messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
 app_json TEXT,
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
-speech_synthesis_voice VARCHAR(256),
+speech_synthesis_voice VARCHAR(64),
 speech_synthesis_label VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
 speech_recognizer_label VARCHAR(64),
-use_for_fallback_speech BOOLEAN DEFAULT false,
-fallback_speech_synthesis_vendor VARCHAR(64),
-fallback_speech_synthesis_language VARCHAR(12),
-fallback_speech_synthesis_voice VARCHAR(256),
-fallback_speech_synthesis_label VARCHAR(64),
-fallback_speech_recognizer_vendor VARCHAR(64),
-fallback_speech_recognizer_language VARCHAR(64),
-fallback_speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
@@ -556,7 +525,6 @@ siprec_hook_sid CHAR(36),
 record_all_calls BOOLEAN NOT NULL DEFAULT false,
 record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
 bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
-enable_debug_log BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -651,10 +619,6 @@ ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (ser
 CREATE INDEX account_sid_idx ON speech_credentials (account_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY account_sid_idxfk_8 (account_sid) REFERENCES accounts (account_sid);

-CREATE INDEX google_custom_voice_sid_idx ON google_custom_voices (google_custom_voice_sid);
-CREATE INDEX speech_credential_sid_idx ON google_custom_voices (speech_credential_sid);
-ALTER TABLE google_custom_voices ADD FOREIGN KEY speech_credential_sid_idxfk (speech_credential_sid) REFERENCES speech_credentials (speech_credential_sid) ON DELETE CASCADE;
-
 CREATE INDEX user_sid_idx ON users (user_sid);
 CREATE INDEX email_idx ON users (email);
 CREATE INDEX phone_idx ON users (phone);
@@ -740,5 +704,4 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
-
-SET FOREIGN_KEY_CHECKS=1;
+SET FOREIGN_KEY_CHECKS=1;
--- 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	fd1e1ecefc	wip	2024-08-28 15:08:46 -04:00
Dave Horton	f65506a905	lint	2024-08-27 11:49:49 -04:00
Dave Horton	1b1ea7a05f	wip	2024-08-27 11:43:18 -04:00
Dave Horton	df9bcd9845	update docker env to latest freeswitch	2024-08-27 10:12:28 -04:00
Dave Horton	ad7de3e5e3	wip	2024-08-22 08:14:51 -04:00
Dave Horton	8d4d09ddd3	wip	2024-08-20 21:27:51 -04:00
Dave Horton	af958d0222	wip	2024-08-20 21:22:33 -04:00
Dave Horton	d6edb34f09	logging	2024-08-20 21:17:02 -04:00
Dave Horton	e61f086ba7	wip	2024-08-20 21:10:48 -04:00
Dave Horton	731d36b047	wip	2024-08-20 21:02:20 -04:00
Dave Horton	3d7ba0ba0a	wip	2024-08-20 16:01:04 -04:00
Dave Horton	cda6047942	wip	2024-08-20 09:56:41 -04:00