From 70a7e6863bd8cd8735b0a59a946956a8d0b1b43d Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Fri, 9 Jan 2026 11:34:01 +0530
Subject: [PATCH 1/8] voice_agents_module - inbound support, enhancement

- added alembic migration for removing phone_numbers from telephony_config, having inbound outbound numbers, supported default languages in voice_agents
- respective changes in service, controller files
- added phone and language validation
---
 ...49da528_add_inbound_voice_agent_support.py |  91 +++++
 .../db_repo_module/models/telephony_config.py |   5 +-
 .../db_repo_module/models/voice_agent.py      |  46 ++-
 .../telephony_config_controller.py            |   3 -
 .../controllers/voice_agent_controller.py     | 142 ++++++--
 .../models/telephony_schemas.py               |   9 +-
 .../models/voice_agent_schemas.py             |  26 +-
 .../services/telephony_config_service.py      |   5 +-
 .../services/voice_agent_service.py           | 300 +++++++++++++++-
 .../utils/cache_invalidation.py               |  10 +-
 .../voice_agents_module/utils/cache_utils.py  |   5 +
 .../utils/language_validation.py              | 337 ++++++++++++++++++
 .../utils/phone_validation.py                 |  67 ++++
 13 files changed, 974 insertions(+), 72 deletions(-)
 create mode 100644 wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
 create mode 100644 wavefront/server/modules/voice_agents_module/voice_agents_module/utils/language_validation.py
 create mode 100644 wavefront/server/modules/voice_agents_module/voice_agents_module/utils/phone_validation.py

diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
new file mode 100644
index 00000000..20a189ec
--- /dev/null
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
@@ -0,0 +1,91 @@
+"""add_inbound_voice_agent_support
+
+Revision ID: 6010e49da528
+Revises: f7572bcd9510
+Create Date: 2026-01-08 15:47:54.502531
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision: str = '6010e49da528'
+down_revision: Union[str, None] = 'f7572bcd9510'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Add new columns to voice_agents table (initially nullable)
+    op.add_column(
+        'voice_agents',
+        sa.Column(
+            'inbound_numbers', postgresql.JSONB(astext_type=sa.Text()), nullable=True
+        ),
+    )
+    op.add_column(
+        'voice_agents',
+        sa.Column(
+            'outbound_numbers', postgresql.JSONB(astext_type=sa.Text()), nullable=True
+        ),
+    )
+    op.add_column(
+        'voice_agents',
+        sa.Column(
+            'supported_languages',
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        'voice_agents',
+        sa.Column('default_language', sa.String(length=10), nullable=True),
+    )
+
+    # Set defaults for existing agents
+    op.execute("""
+        UPDATE voice_agents
+        SET
+            inbound_numbers = '[]'::jsonb,
+            outbound_numbers = '[]'::jsonb,
+            supported_languages = '["en"]'::jsonb,
+            default_language = 'en'
+        WHERE inbound_numbers IS NULL
+    """)
+
+    # Make columns non-nullable after setting defaults
+    op.alter_column('voice_agents', 'inbound_numbers', nullable=False)
+    op.alter_column('voice_agents', 'outbound_numbers', nullable=False)
+    op.alter_column('voice_agents', 'supported_languages', nullable=False)
+    op.alter_column('voice_agents', 'default_language', nullable=False)
+
+    # Create GIN index for fast inbound number lookups (JSONB containment queries)
+    op.execute("""
+        CREATE INDEX idx_voice_agents_inbound_numbers_gin
+        ON voice_agents USING gin (inbound_numbers jsonb_path_ops)
+    """)
+
+    # Remove phone_numbers column from telephony_configs table
+    # Phone numbers are now managed at the voice_agent level
+    op.drop_column('telephony_configs', 'phone_numbers')
+
+
+def downgrade() -> None:
+    # Restore phone_numbers column to telephony_configs table
+    op.add_column(
+        'telephony_configs', sa.Column('phone_numbers', sa.Text(), nullable=True)
+    )
+
+    # Drop GIN index
+    op.drop_index('idx_voice_agents_inbound_numbers_gin', table_name='voice_agents')
+
+    # Drop columns from voice_agents
+    op.drop_column('voice_agents', 'default_language')
+    op.drop_column('voice_agents', 'supported_languages')
+    op.drop_column('voice_agents', 'outbound_numbers')
+    op.drop_column('voice_agents', 'inbound_numbers')
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/telephony_config.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/telephony_config.py
index ace8edf2..44f76d85 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/models/telephony_config.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/telephony_config.py
@@ -22,7 +22,6 @@ class TelephonyConfig(Base):
     provider: Mapped[str] = mapped_column(String(length=64), nullable=False)
     connection_type: Mapped[str] = mapped_column(String(length=64), nullable=False)
     credentials: Mapped[str] = mapped_column(Text, nullable=False)
-    phone_numbers: Mapped[str] = mapped_column(Text, nullable=False)
     webhook_config: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     sip_config: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     is_deleted: Mapped[bool] = mapped_column(default=False, nullable=False)
@@ -48,9 +47,7 @@ def to_dict(self, exclude_credentials: bool = True):
             elif isinstance(value, datetime):
                 result[column.name] = value.isoformat()
             elif (
-                column.name
-                in ['credentials', 'phone_numbers', 'webhook_config', 'sip_config']
-                and value
+                column.name in ['credentials', 'webhook_config', 'sip_config'] and value
             ):
                 # Parse JSON fields
                 try:
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
index ebfda80b..495acaef 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
@@ -4,6 +4,7 @@
 from typing import Optional
 
 from sqlalchemy import ForeignKey, String, Text, func
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.orm import Mapped, mapped_column
 
 from ..database.base import Base
@@ -33,6 +34,17 @@ class VoiceAgent(Base):
     conversation_config: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     welcome_message: Mapped[str] = mapped_column(Text, nullable=False)
     status: Mapped[str] = mapped_column(String(length=64), nullable=False)
+
+    # Multi-language and phone number support
+    inbound_numbers: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
+    outbound_numbers: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
+    supported_languages: Mapped[list] = mapped_column(
+        JSONB, nullable=False, default=lambda: ['en']
+    )
+    default_language: Mapped[str] = mapped_column(
+        String(length=10), nullable=False, default='en'
+    )
+
     is_deleted: Mapped[bool] = mapped_column(default=False, nullable=False)
     created_at: Mapped[datetime] = mapped_column(default=func.now())
     updated_at: Mapped[datetime] = mapped_column(
@@ -51,12 +63,34 @@ def to_dict(self):
                 result[column.name] = str(value)
             elif isinstance(value, datetime):
                 result[column.name] = value.isoformat()
-            elif column.name == 'conversation_config' and value:
-                # Parse JSON field
-                try:
-                    result[column.name] = json.loads(value)
-                except (json.JSONDecodeError, TypeError):
-                    result[column.name] = value
+            elif column.name in [
+                'conversation_config',
+                'inbound_numbers',
+                'outbound_numbers',
+                'supported_languages',
+            ]:
+                # Parse JSON/JSONB fields
+                if value:
+                    try:
+                        # JSONB fields are already deserialized by SQLAlchemy
+                        if isinstance(value, str):
+                            result[column.name] = json.loads(value)
+                        else:
+                            result[column.name] = value
+                    except (json.JSONDecodeError, TypeError):
+                        result[column.name] = value
+                else:
+                    # Return empty list for JSONB array fields, None for others
+                    result[column.name] = (
+                        []
+                        if column.name
+                        in [
+                            'inbound_numbers',
+                            'outbound_numbers',
+                            'supported_languages',
+                        ]
+                        else None
+                    )
             else:
                 result[column.name] = value
         return result
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/telephony_config_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/telephony_config_controller.py
index 3d41a2ab..862e6654 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/telephony_config_controller.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/telephony_config_controller.py
@@ -51,7 +51,6 @@ async def create_telephony_config(
         provider=payload.provider.value,
         connection_type=payload.connection_type.value,
         credentials=payload.credentials,
-        phone_numbers=payload.phone_numbers,
         webhook_config=payload.webhook_config,
         sip_config=payload.sip_config,
     )
@@ -198,8 +197,6 @@ async def update_telephony_config(
             )
     if payload.credentials is not UNSET:
         update_data['credentials'] = json.dumps(payload.credentials)
-    if payload.phone_numbers is not UNSET:
-        update_data['phone_numbers'] = json.dumps(payload.phone_numbers)
     if payload.webhook_config is not UNSET:
         update_data['webhook_config'] = (
             json.dumps(payload.webhook_config.model_dump())
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
index 6d0bdf15..98305652 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
@@ -57,6 +57,10 @@ async def create_voice_agent(
         welcome_message=payload.welcome_message,
         conversation_config=payload.conversation_config,
         status=payload.status.value,
+        inbound_numbers=payload.inbound_numbers,
+        outbound_numbers=payload.outbound_numbers,
+        supported_languages=payload.supported_languages,
+        default_language=payload.default_language,
     )
 
     return JSONResponse(
@@ -198,6 +202,14 @@ async def update_voice_agent(
                     f'Invalid status value. Must be one of: {valid_values}'
                 ),
             )
+    if payload.inbound_numbers is not UNSET:
+        update_data['inbound_numbers'] = payload.inbound_numbers
+    if payload.outbound_numbers is not UNSET:
+        update_data['outbound_numbers'] = payload.outbound_numbers
+    if payload.supported_languages is not UNSET:
+        update_data['supported_languages'] = payload.supported_languages
+    if payload.default_language is not UNSET:
+        update_data['default_language'] = payload.default_language
 
     if not update_data:
         return JSONResponse(
@@ -317,48 +329,48 @@ async def initiate_call(
             ),
         )
 
-    # Fetch telephony config
-    telephony_config_id = agent_dict.get('telephony_config_id')
-    telephony_config = await voice_agent_service.telephony_config_service.get_config(
-        telephony_config_id
-    )
-
-    if not telephony_config:
-        return JSONResponse(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            content=response_formatter.buildErrorResponse(
-                f'Telephony config not found with id: {telephony_config_id}'
-            ),
-        )
-
-    # Parse phone_numbers from telephony config
-    phone_numbers = telephony_config.get('phone_numbers')
+    # Get outbound numbers from agent
+    outbound_numbers = agent_dict.get('outbound_numbers', [])
     if (
-        not phone_numbers
-        or not isinstance(phone_numbers, list)
-        or len(phone_numbers) == 0
+        not outbound_numbers
+        or not isinstance(outbound_numbers, list)
+        or len(outbound_numbers) == 0
     ):
         return JSONResponse(
             status_code=status.HTTP_400_BAD_REQUEST,
             content=response_formatter.buildErrorResponse(
-                'No phone numbers configured in telephony config'
+                'No outbound phone numbers configured for this agent'
             ),
         )
 
     # Select from_number
     from_number = payload.from_number
     if from_number:
-        # Validate that provided from_number is in the configured numbers
-        if from_number not in phone_numbers:
+        # Validate that provided from_number is in the agent's outbound numbers
+        if from_number not in outbound_numbers:
             return JSONResponse(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 content=response_formatter.buildErrorResponse(
-                    f'from_number {from_number} is not in the configured phone numbers: {phone_numbers}'
+                    f"from_number {from_number} is not in the agent's outbound numbers: {outbound_numbers}"
                 ),
             )
     else:
-        # Default to first configured number
-        from_number = phone_numbers[0]
+        # Default to first outbound number
+        from_number = outbound_numbers[0]
+
+    # Fetch telephony config for Twilio credentials
+    telephony_config_id = agent_dict.get('telephony_config_id')
+    telephony_config = await voice_agent_service.telephony_config_service.get_config(
+        telephony_config_id
+    )
+
+    if not telephony_config:
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content=response_formatter.buildErrorResponse(
+                f'Telephony config not found with id: {telephony_config_id}'
+            ),
+        )
 
     # Extract Twilio credentials from telephony config
     credentials = telephony_config.get('credentials', {})
@@ -413,3 +425,83 @@ async def initiate_call(
             }
         ),
     )
+
+
+@voice_agent_router.get('/v1/voice-agents/by-inbound-number/{phone_number}')
+@inject
+async def get_voice_agent_by_inbound_number(
+    phone_number: str = Path(..., description='Inbound phone number (E.164 format)'),
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    voice_agent_service: VoiceAgentService = Depends(
+        Provide[VoiceAgentsContainer.voice_agent_service]
+    ),
+):
+    """
+    Get voice agent by inbound phone number.
+
+    This endpoint is used by call_processing to lookup which agent handles
+    a specific inbound phone number.
+
+    Args:
+        phone_number: Inbound phone number in E.164 format
+
+    Returns:
+        JSONResponse: Voice agent details or 404 if not found
+    """
+    agent = await voice_agent_service.get_agent_by_inbound_number(phone_number)
+
+    if not agent:
+        return JSONResponse(
+            status_code=status.HTTP_404_NOT_FOUND,
+            content=response_formatter.buildErrorResponse(
+                f'No voice agent found for inbound number: {phone_number}'
+            ),
+        )
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse(agent),
+    )
+
+
+@voice_agent_router.get('/v1/voice-agents/{agent_id}/welcome-audio-url')
+@inject
+async def get_welcome_audio_url(
+    agent_id: UUID = Path(..., description='The ID of the voice agent'),
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    voice_agent_service: VoiceAgentService = Depends(
+        Provide[VoiceAgentsContainer.voice_agent_service]
+    ),
+):
+    """
+    Get welcome message audio presigned URL for a voice agent.
+
+    Returns a presigned URL (2-hour expiration) for accessing the agent's
+    welcome message audio file from cloud storage.
+
+    Args:
+        agent_id: UUID of the voice agent
+
+    Returns:
+        JSONResponse: Object with 'url' field containing presigned URL
+    """
+    try:
+        url = await voice_agent_service.get_welcome_message_audio_url(agent_id)
+
+        return JSONResponse(
+            status_code=status.HTTP_200_OK,
+            content=response_formatter.buildSuccessResponse({'url': url}),
+        )
+
+    except Exception as e:
+        logger.error(f'Failed to get welcome audio URL for agent {agent_id}: {str(e)}')
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content=response_formatter.buildErrorResponse(
+                f'Failed to generate welcome message URL: {str(e)}'
+            ),
+        )
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/telephony_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/telephony_schemas.py
index 46daf998..e0f5220d 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/telephony_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/telephony_schemas.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Optional, Union, Any, Dict, List, Literal
+from typing import Optional, Union, Any, Dict, Literal
 from enum import Enum
 from datetime import datetime
 import uuid
@@ -78,11 +78,6 @@ class CreateTelephonyConfigPayload(BaseModel):
         ...,
         description='Provider credentials as JSON object (e.g., {account_sid, auth_token})',
     )
-    phone_numbers: List[str] = Field(
-        ...,
-        description='List of phone numbers available for outbound calls',
-        example=['+1234567890', '+0987654321'],
-    )
     webhook_config: Optional[WebhookConfig] = Field(
         None,
         description='Webhook configuration for status callbacks (optional for both connection types)',
@@ -103,7 +98,6 @@ class UpdateTelephonyConfigPayload(BaseModel):
     provider: Union[TelephonyProvider, Any] = Field(default=UNSET)
     connection_type: Union[ConnectionType, Any] = Field(default=UNSET)
     credentials: Union[Dict[str, Any], Any] = Field(default=UNSET)
-    phone_numbers: Union[List[str], Any] = Field(default=UNSET)
     webhook_config: Union[WebhookConfig, None, Any] = Field(default=UNSET)
     sip_config: Union[SipConfig, None, Any] = Field(default=UNSET)
 
@@ -114,7 +108,6 @@ class TelephonyConfigResponse(BaseModel):
     description: Optional[str]
     provider: str
     connection_type: str
-    phone_numbers: List[str]
     webhook_config: Optional[WebhookConfig]
     sip_config: Optional[SipConfig]
     is_deleted: bool
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
index 8499b08b..27ae09d6 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Optional, Union, Any, Dict
+from typing import Optional, Union, Any, Dict, List
 from enum import Enum
 from datetime import datetime
 import uuid
@@ -34,6 +34,22 @@ class CreateVoiceAgentPayload(BaseModel):
         default=VoiceAgentStatus.INACTIVE,
         description='Agent status (active or inactive)',
     )
+    inbound_numbers: Optional[List[str]] = Field(
+        None,
+        description='Phone numbers for receiving inbound calls (E.164 format, globally unique)',
+    )
+    outbound_numbers: Optional[List[str]] = Field(
+        None,
+        description='Phone numbers for making outbound calls (E.164 format)',
+    )
+    supported_languages: Optional[List[str]] = Field(
+        None,
+        description='List of supported language codes (ISO 639-1, e.g., ["en", "hi", "te"])',
+    )
+    default_language: str = Field(
+        'en',
+        description='Default language if detection fails (must be in supported_languages)',
+    )
 
 
 class UpdateVoiceAgentPayload(BaseModel):
@@ -47,6 +63,10 @@ class UpdateVoiceAgentPayload(BaseModel):
     conversation_config: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
     welcome_message: Union[str, Any] = Field(default=UNSET)
     status: Union[VoiceAgentStatus, Any] = Field(default=UNSET)
+    inbound_numbers: Union[List[str], Any] = Field(default=UNSET)
+    outbound_numbers: Union[List[str], Any] = Field(default=UNSET)
+    supported_languages: Union[List[str], Any] = Field(default=UNSET)
+    default_language: Union[str, Any] = Field(default=UNSET)
 
 
 class VoiceAgentResponse(BaseModel):
@@ -61,6 +81,10 @@ class VoiceAgentResponse(BaseModel):
     conversation_config: Optional[Dict[str, Any]]
     welcome_message: str
     status: str
+    inbound_numbers: List[str]
+    outbound_numbers: List[str]
+    supported_languages: List[str]
+    default_language: str
     is_deleted: bool
     created_at: datetime
     updated_at: datetime
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/telephony_config_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/telephony_config_service.py
index 7d133fac..24f02840 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/telephony_config_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/telephony_config_service.py
@@ -42,7 +42,6 @@ async def create_config(
         provider: str = None,
         connection_type: str = None,
         credentials: dict = None,
-        phone_numbers: list = None,
         webhook_config: Optional[WebhookConfig] = None,
         sip_config: Optional[SipConfig] = None,
     ) -> dict:
@@ -54,8 +53,7 @@ async def create_config(
             description: Optional description
             provider: Telephony provider
             connection_type: Connection type (websocket/sip)
-            credentials: Provider credentials
-            phone_numbers: List of phone numbers available for outbound calls
+            credentials: Provider credentials (e.g., Twilio account_sid, auth_token)
             webhook_config: Webhook configuration Pydantic model (optional)
             sip_config: SIP configuration Pydantic model (optional)
 
@@ -72,7 +70,6 @@ async def create_config(
             provider=provider,
             connection_type=connection_type,
             credentials=json.dumps(credentials),
-            phone_numbers=json.dumps(phone_numbers),
             webhook_config=(
                 json.dumps(webhook_config.model_dump()) if webhook_config else None
             ),
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
index 7cbd32e4..26ab4a80 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
@@ -1,6 +1,6 @@
 import json
 import uuid
-from typing import List, Optional
+from typing import List, Optional, Tuple
 from uuid import UUID
 
 from common_module.log.logger import logger
@@ -24,6 +24,12 @@
     invalidate_call_processing_cache,
 )
 from voice_agents_module.utils.storage_utils import generate_welcome_message_key
+from voice_agents_module.utils.language_validation import (
+    validate_languages_for_configs,
+    validate_default_language,
+    format_language_prompt,
+)
+from voice_agents_module.utils.phone_validation import validate_phone_numbers
 
 
 class VoiceAgentService:
@@ -114,16 +120,97 @@ async def _validate_foreign_keys(
 
         return True, None
 
+    async def _validate_language_and_phone_config(
+        self,
+        inbound_numbers: List[str],
+        outbound_numbers: List[str],
+        supported_languages: List[str],
+        default_language: str,
+        tts_config_id: UUID,
+        stt_config_id: UUID,
+        agent_id: Optional[UUID] = None,
+    ) -> Tuple[bool, Optional[str]]:
+        """
+        Validate language and phone number configuration.
+
+        Args:
+            inbound_numbers: List of inbound phone numbers
+            outbound_numbers: List of outbound phone numbers
+            supported_languages: List of language codes
+            default_language: Default language code
+            tts_config_id: TTS config ID
+            stt_config_id: STT config ID
+            agent_id: Agent ID (for update operations, to exclude self from uniqueness check)
+
+        Returns:
+            Tuple of (is_valid, error_message). error_message is None if valid.
+        """
+        # Validate phone numbers format
+        is_valid, error = validate_phone_numbers(inbound_numbers, 'inbound_numbers')
+        if not is_valid:
+            return False, error
+
+        is_valid, error = validate_phone_numbers(outbound_numbers, 'outbound_numbers')
+        if not is_valid:
+            return False, error
+
+        # Validate inbound number uniqueness
+        for number in inbound_numbers:
+            # Query all agents and check if number is already assigned
+            all_agents = await self.voice_agent_repository.find(is_deleted=False)
+            for agent in all_agents:
+                # Skip self when updating
+                if agent_id and agent.id == agent_id:
+                    continue
+
+                agent_dict = agent.to_dict()
+                if number in agent_dict.get('inbound_numbers', []):
+                    return (
+                        False,
+                        f"Inbound number {number} is already assigned to agent '{agent.name}' (ID: {agent.id})",
+                    )
+
+        # Validate default language in supported languages
+        is_valid, error = validate_default_language(
+            default_language, supported_languages
+        )
+        if not is_valid:
+            return False, error
+
+        # Fetch TTS and STT configs to get providers
+        tts_config = await self.tts_config_service.get_config(tts_config_id)
+        stt_config = await self.stt_config_service.get_config(stt_config_id)
+
+        if not tts_config or not stt_config:
+            return False, 'TTS or STT config not found'
+
+        # Validate languages against provider capabilities
+        is_valid, error = validate_languages_for_configs(
+            supported_languages, tts_config['provider'], stt_config['provider']
+        )
+        if not is_valid:
+            return False, error
+
+        return True, None
+
     async def _generate_and_upload_welcome_audio(
-        self, welcome_message: str, tts_config_id: UUID, agent_id: UUID
+        self,
+        welcome_message: str,
+        tts_config_id: UUID,
+        agent_id: UUID,
+        supported_languages: List[str],
+        default_language: str,
     ) -> None:
         """
-        Generate TTS audio for welcome message and upload to cloud storage
+        Generate TTS audio for welcome message and upload to cloud storage.
+        If multiple languages supported, concatenates language selection prompt.
 
         Args:
             welcome_message: Text of the welcome message
             tts_config_id: TTS config ID to use for generation
             agent_id: Voice agent ID (used for generating storage key)
+            supported_languages: List of supported language codes
+            default_language: Default language code for audio generation
 
         Raises:
             Exception: If TTS generation or upload fails
@@ -135,10 +222,29 @@ async def _generate_and_upload_welcome_audio(
         if not tts_config:
             raise ValueError(f'TTS config {tts_config_id} not found')
 
+        # Build welcome audio text
+        audio_text = welcome_message
+
+        # If multiple languages supported, append language selection prompt
+        if len(supported_languages) > 1:
+            language_list = format_language_prompt(supported_languages)
+            audio_text = (
+                f'{welcome_message}. '
+                f'Which language would you like to continue in? {language_list}.'
+            )
+
+        logger.info(f'Welcome audio text: {audio_text}')
+
+        # Update TTS config to use default language
+        tts_config_with_lang = {**tts_config}
+        if 'parameters' not in tts_config_with_lang:
+            tts_config_with_lang['parameters'] = {}
+        tts_config_with_lang['parameters']['language'] = default_language
+
         # Generate audio using TTS service
         try:
             audio_bytes = await self.tts_generator_service.generate_audio(
-                welcome_message, tts_config
+                audio_text, tts_config_with_lang
             )
             logger.info(f'Generated audio: {len(audio_bytes)} bytes')
         except Exception as e:
@@ -175,9 +281,13 @@ async def create_agent(
         description: Optional[str] = None,
         conversation_config: Optional[dict] = None,
         status: str = 'inactive',
+        inbound_numbers: Optional[List[str]] = None,
+        outbound_numbers: Optional[List[str]] = None,
+        supported_languages: Optional[List[str]] = None,
+        default_language: str = 'en',
     ) -> dict:
         """
-        Create a new voice agent
+        Create a new voice agent with inbound/outbound numbers and language support
 
         Args:
             name: Name of the voice agent
@@ -190,16 +300,25 @@ async def create_agent(
             description: Description of the agent (optional)
             conversation_config: Conversation configuration (optional)
             status: Agent status (default: inactive)
+            inbound_numbers: Phone numbers for receiving inbound calls (E.164 format)
+            outbound_numbers: Phone numbers for making outbound calls (E.164 format)
+            supported_languages: List of supported language codes (e.g., ["en", "es", "hi"])
+            default_language: Default language code (must be in supported_languages)
 
         Returns:
             Created voice agent as dict
 
         Raises:
-            ValueError: If any foreign key validation fails
+            ValueError: If any validation fails
             Exception: If TTS generation or upload fails
         """
         logger.info(f'Creating voice agent: {name}')
 
+        # Set defaults
+        inbound_numbers = inbound_numbers or []
+        outbound_numbers = outbound_numbers or []
+        supported_languages = supported_languages or ['en']
+
         # Validate all foreign keys
         is_valid, error_message = await self._validate_foreign_keys(
             llm_config_id, tts_config_id, stt_config_id, telephony_config_id
@@ -208,13 +327,30 @@ async def create_agent(
             logger.error(f'FK validation failed: {error_message}')
             raise ValueError(error_message)
 
+        # Validate language and phone configuration
+        is_valid, error_message = await self._validate_language_and_phone_config(
+            inbound_numbers,
+            outbound_numbers,
+            supported_languages,
+            default_language,
+            tts_config_id,
+            stt_config_id,
+        )
+        if not is_valid:
+            logger.error(f'Language/phone validation failed: {error_message}')
+            raise ValueError(error_message)
+
         # Generate agent ID first
         agent_id = uuid.uuid4()
 
         # Generate and upload welcome message audio BEFORE creating agent
         # If this fails, no agent record is created
         await self._generate_and_upload_welcome_audio(
-            welcome_message, tts_config_id, agent_id
+            welcome_message,
+            tts_config_id,
+            agent_id,
+            supported_languages,
+            default_language,
         )
 
         # Create agent only if audio generation succeeded
@@ -232,6 +368,10 @@ async def create_agent(
             else None,
             welcome_message=welcome_message,
             status=status,
+            inbound_numbers=inbound_numbers,
+            outbound_numbers=outbound_numbers,
+            supported_languages=supported_languages,
+            default_language=default_language,
         )
 
         # Convert to dict
@@ -250,6 +390,10 @@ async def create_agent(
         # Invalidate cache in call_processing
         await invalidate_call_processing_cache('voice_agent', agent.id, 'create')
 
+        # Invalidate inbound number cache for each number
+        for number in inbound_numbers:
+            await self._invalidate_inbound_number_cache(number)
+
         logger.info(f'Successfully created voice agent with id: {agent.id}')
         return agent_dict
 
@@ -326,7 +470,7 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
             Updated agent as dict or None if not found
 
         Raises:
-            ValueError: If any foreign key validation fails
+            ValueError: If any validation fails
             Exception: If TTS generation or upload fails
         """
         logger.info(f'Updating voice agent: {agent_id}')
@@ -337,14 +481,67 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
         if not existing_agent:
             return None
 
-        # Check if welcome_message is being updated
-        welcome_message_changed = False
+        existing_dict = existing_agent.to_dict()
+
+        # Track old inbound numbers for cache invalidation
+        old_inbound_numbers = existing_dict.get('inbound_numbers', [])
+        new_inbound_numbers = update_data.get('inbound_numbers', old_inbound_numbers)
+
+        # Check if language/phone config is being updated
+        language_phone_fields = [
+            'inbound_numbers',
+            'outbound_numbers',
+            'supported_languages',
+            'default_language',
+        ]
+        if any(key in update_data for key in language_phone_fields):
+            # Build full config (use existing if not being updated)
+            inbound_numbers = update_data.get('inbound_numbers', old_inbound_numbers)
+            outbound_numbers = update_data.get(
+                'outbound_numbers', existing_dict.get('outbound_numbers', [])
+            )
+            supported_languages = update_data.get(
+                'supported_languages', existing_dict.get('supported_languages', ['en'])
+            )
+            default_language = update_data.get(
+                'default_language', existing_dict.get('default_language', 'en')
+            )
+            tts_config_id = update_data.get(
+                'tts_config_id', existing_agent.tts_config_id
+            )
+            stt_config_id = update_data.get(
+                'stt_config_id', existing_agent.stt_config_id
+            )
+
+            # Validate language/phone config (pass agent_id to exclude self from uniqueness check)
+            is_valid, error_message = await self._validate_language_and_phone_config(
+                inbound_numbers,
+                outbound_numbers,
+                supported_languages,
+                default_language,
+                tts_config_id,
+                stt_config_id,
+                agent_id=agent_id,
+            )
+            if not is_valid:
+                logger.error(f'Language/phone validation failed: {error_message}')
+                raise ValueError(error_message)
+
+        # Check if welcome_message or language config changed (requires audio regeneration)
+        audio_regeneration_needed = False
         if (
             'welcome_message' in update_data
             and update_data['welcome_message'] != existing_agent.welcome_message
         ):
-            welcome_message_changed = True
-            new_welcome_message = update_data['welcome_message']
+            audio_regeneration_needed = True
+        if 'supported_languages' in update_data and update_data[
+            'supported_languages'
+        ] != existing_dict.get('supported_languages'):
+            audio_regeneration_needed = True
+        if 'default_language' in update_data and update_data[
+            'default_language'
+        ] != existing_dict.get('default_language'):
+            audio_regeneration_needed = True
 
         # If any FK fields are being updated, validate them
         if any(
@@ -377,16 +574,33 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
                 logger.error(f'FK validation failed: {error_message}')
                 raise ValueError(error_message)
 
-        # If welcome message changed, regenerate audio
-        if welcome_message_changed:
-            logger.info('Welcome message changed, regenerating audio')
+        # Regenerate welcome audio if needed
+        if audio_regeneration_needed:
+            logger.info(
+                'Welcome message or language config changed, regenerating audio'
+            )
             try:
-                # Use updated tts_config_id if provided, otherwise use existing
+                # Use updated values if provided, otherwise use existing
+                welcome_message = update_data.get(
+                    'welcome_message', existing_agent.welcome_message
+                )
                 tts_config_id = update_data.get(
                     'tts_config_id', existing_agent.tts_config_id
                 )
+                supported_languages = update_data.get(
+                    'supported_languages',
+                    existing_dict.get('supported_languages', ['en']),
+                )
+                default_language = update_data.get(
+                    'default_language', existing_dict.get('default_language', 'en')
+                )
+
                 await self._generate_and_upload_welcome_audio(
-                    new_welcome_message, tts_config_id, agent_id
+                    welcome_message,
+                    tts_config_id,
+                    agent_id,
+                    supported_languages,
+                    default_language,
                 )
             except Exception as e:
                 logger.error(f'Failed to regenerate welcome audio: {str(e)}')
@@ -406,6 +620,16 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
         # Invalidate cache in call_processing
         await invalidate_call_processing_cache('voice_agent', agent_id, 'update')
 
+        # Invalidate inbound number cache if numbers changed
+        if old_inbound_numbers != new_inbound_numbers:
+            # Invalidate old numbers
+            for number in old_inbound_numbers:
+                if number not in new_inbound_numbers:
+                    await self._invalidate_inbound_number_cache(number)
+            # Invalidate new numbers
+            for number in new_inbound_numbers:
+                await self._invalidate_inbound_number_cache(number)
+
         logger.info(f'Successfully updated voice agent: {agent_id}')
         return updated_agent.to_dict()
 
@@ -488,3 +712,45 @@ async def delete_agent(self, agent_id: UUID) -> bool:
 
         logger.info(f'Successfully deleted voice agent: {agent_id}')
         return True
+
+    async def _invalidate_inbound_number_cache(self, phone_number: str):
+        """Invalidate cache for inbound number lookup in call_processing"""
+        # Invalidate local cache
+        cache_key = f'inbound_number:{phone_number}'
+        self.cache_manager.remove(cache_key)
+
+        # Also invalidate in call_processing
+        await invalidate_call_processing_cache('inbound_number', phone_number, 'update')
+
+    async def get_agent_by_inbound_number(self, phone_number: str) -> Optional[dict]:
+        """
+        Get voice agent by inbound phone number (with caching).
+
+        Args:
+            phone_number: E.164 formatted phone number
+
+        Returns:
+            Voice agent dict or None if not found
+        """
+        cache_key = f'inbound_number:{phone_number}'
+
+        # Try cache first
+        cached_agent_id = self.cache_manager.get_str(cache_key)
+        if cached_agent_id:
+            logger.info(f'Cache hit for inbound number: {phone_number}')
+            return await self.get_agent(UUID(cached_agent_id))
+
+        # Cache miss - query database
+        logger.info(f'Cache miss - fetching agent by inbound number: {phone_number}')
+        all_agents = await self.voice_agent_repository.find(is_deleted=False)
+
+        for agent in all_agents:
+            agent_dict = agent.to_dict()
+            if phone_number in agent_dict.get('inbound_numbers', []):
+                # Cache the mapping
+                self.cache_manager.add(
+                    cache_key, str(agent.id), expiry=self.voice_agent_cache_time
+                )
+                return agent_dict
+
+        return None
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_invalidation.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_invalidation.py
index 099a91c4..42723197 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_invalidation.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_invalidation.py
@@ -8,15 +8,15 @@
 
 async def invalidate_call_processing_cache(
     config_type: str,
-    config_id: UUID,
+    config_id: UUID | str,
     operation: str = 'update',
 ) -> bool:
     """
     Invalidate cache in call_processing app
 
     Args:
-        config_type: Type of config (voice_agent, tts_config, stt_config, telephony_config)
-        config_id: UUID of the config
+        config_type: Type of config (voice_agent, tts_config, stt_config, telephony_config, inbound_number)
+        config_id: UUID of the config or string identifier (e.g., phone number for inbound_number type)
         operation: Operation type (create, update, or delete)
 
     Returns:
@@ -38,7 +38,9 @@ async def invalidate_call_processing_cache(
         'Content-Type': 'application/json',
         'X-Passthrough': passthrough_secret,
     }
-    payload = {'config_type': config_type, 'config_id': str(config_id)}
+    # Convert UUID to string, keep strings as-is
+    resource_id = str(config_id) if isinstance(config_id, UUID) else config_id
+    payload = {'config_type': config_type, 'config_id': resource_id}
 
     try:
         async with httpx.AsyncClient(timeout=10.0) as client:
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_utils.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_utils.py
index 688f23a6..6a3dbef1 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_utils.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/cache_utils.py
@@ -44,3 +44,8 @@ def get_voice_agents_list_cache_key() -> str:
 def get_welcome_message_url_cache_key(agent_id: UUID) -> str:
     """Generate cache key for a voice agent's welcome message presigned URL"""
     return f'voice_agent_welcome_url:{agent_id}'
+
+
+def get_inbound_number_cache_key(phone_number: str) -> str:
+    """Generate cache key for inbound number to agent ID mapping"""
+    return f'inbound_number:{phone_number}'
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/language_validation.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/language_validation.py
new file mode 100644
index 00000000..fe509d48
--- /dev/null
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/language_validation.py
@@ -0,0 +1,337 @@
+"""Language validation utilities for voice agents"""
+
+from typing import List, Dict, Set, Optional, Tuple
+
+# Language code to human-readable name mapping
+LANGUAGE_NAMES: Dict[str, str] = {
+    'ar': 'Arabic',
+    'bg': 'Bulgarian',
+    'bn': 'Bengali',
+    'cs': 'Czech',
+    'da': 'Danish',
+    'de': 'German',
+    'el': 'Greek',
+    'en': 'English',
+    'es': 'Spanish',
+    'fi': 'Finnish',
+    'fil': 'Filipino',
+    'fr': 'French',
+    'gu': 'Gujarati',
+    'he': 'Hebrew',
+    'hi': 'Hindi',
+    'hr': 'Croatian',
+    'hu': 'Hungarian',
+    'id': 'Indonesian',
+    'it': 'Italian',
+    'ja': 'Japanese',
+    'ka': 'Georgian',
+    'kn': 'Kannada',
+    'ko': 'Korean',
+    'ml': 'Malayalam',
+    'mr': 'Marathi',
+    'ms': 'Malay',
+    'nl': 'Dutch',
+    'no': 'Norwegian',
+    'pa': 'Punjabi',
+    'pl': 'Polish',
+    'pt': 'Portuguese',
+    'ro': 'Romanian',
+    'ru': 'Russian',
+    'sk': 'Slovak',
+    'sv': 'Swedish',
+    'ta': 'Tamil',
+    'te': 'Telugu',
+    'th': 'Thai',
+    'tl': 'Tagalog',
+    'tr': 'Turkish',
+    'uk': 'Ukrainian',
+    'vi': 'Vietnamese',
+    'zh': 'Chinese',
+}
+
+# Provider language support (extracted from pipecat language mappings)
+ELEVENLABS_LANGUAGES: Set[str] = {
+    'ar',
+    'bg',
+    'cs',
+    'da',
+    'de',
+    'el',
+    'en',
+    'es',
+    'fi',
+    'fil',
+    'fr',
+    'hi',
+    'hr',
+    'hu',
+    'id',
+    'it',
+    'ja',
+    'ko',
+    'ms',
+    'nl',
+    'no',
+    'pl',
+    'pt',
+    'ro',
+    'ru',
+    'sk',
+    'sv',
+    'ta',
+    'tr',
+    'uk',
+    'vi',
+    'zh',
+}
+
+CARTESIA_LANGUAGES: Set[str] = {
+    'ar',
+    'bg',
+    'bn',
+    'cs',
+    'da',
+    'de',
+    'en',
+    'el',
+    'es',
+    'fi',
+    'fr',
+    'gu',
+    'he',
+    'hi',
+    'hr',
+    'hu',
+    'id',
+    'it',
+    'ja',
+    'ka',
+    'kn',
+    'ko',
+    'ml',
+    'mr',
+    'ms',
+    'nl',
+    'no',
+    'pa',
+    'pl',
+    'pt',
+    'ro',
+    'ru',
+    'sk',
+    'sv',
+    'ta',
+    'te',
+    'th',
+    'tl',
+    'tr',
+    'uk',
+    'vi',
+    'zh',
+}
+
+# Deepgram STT supports 40+ languages
+DEEPGRAM_STT_LANGUAGES: Set[str] = {
+    'ar',
+    'bg',
+    'ca',
+    'cs',
+    'da',
+    'de',
+    'el',
+    'en',
+    'es',
+    'et',
+    'fi',
+    'fr',
+    'hi',
+    'hu',
+    'id',
+    'it',
+    'ja',
+    'ko',
+    'lt',
+    'lv',
+    'ms',
+    'nl',
+    'no',
+    'pl',
+    'pt',
+    'ro',
+    'ru',
+    'sk',
+    'sv',
+    'ta',
+    'te',
+    'th',
+    'tr',
+    'uk',
+    'vi',
+    'zh',
+}
+
+
+def get_tts_supported_languages(provider: str) -> Set[str]:
+    """
+    Get supported languages for a TTS provider.
+
+    Args:
+        provider: TTS provider name (elevenlabs, cartesia, deepgram, etc.)
+
+    Returns:
+        Set of supported language codes
+
+    Raises:
+        ValueError: If provider is unknown
+    """
+    provider = provider.lower()
+
+    if provider == 'elevenlabs':
+        return ELEVENLABS_LANGUAGES
+    elif provider == 'cartesia':
+        return CARTESIA_LANGUAGES
+    elif provider == 'deepgram':
+        # Deepgram TTS: language is implicit in voice_id, no explicit language param
+        # Return empty set to indicate validation should be skipped
+        return set()
+    elif provider in ['azure', 'google', 'aws']:
+        # For providers not yet fully implemented, skip validation
+        return set()
+    else:
+        raise ValueError(f'Unknown TTS provider: {provider}')
+
+
+def get_stt_supported_languages(provider: str) -> Set[str]:
+    """
+    Get supported languages for an STT provider.
+
+    Args:
+        provider: STT provider name (deepgram, assemblyai, whisper, etc.)
+
+    Returns:
+        Set of supported language codes
+
+    Raises:
+        ValueError: If provider is unknown
+    """
+    provider = provider.lower()
+
+    if provider == 'deepgram':
+        return DEEPGRAM_STT_LANGUAGES
+    elif provider in ['assemblyai', 'whisper', 'google', 'azure']:
+        # For providers not yet fully implemented, skip validation
+        return set()
+    else:
+        raise ValueError(f'Unknown STT provider: {provider}')
+
+
+def validate_languages_for_configs(
+    supported_languages: List[str], tts_provider: str, stt_provider: str
+) -> Tuple[bool, Optional[str]]:
+    """
+    Validate that all supported languages are available in both TTS and STT providers.
+
+    Args:
+        supported_languages: List of language codes to validate
+        tts_provider: TTS provider name
+        stt_provider: STT provider name
+
+    Returns:
+        Tuple of (is_valid, error_message). error_message is None if valid.
+    """
+    if not supported_languages:
+        return False, 'supported_languages cannot be empty'
+
+    # Get provider capabilities
+    try:
+        tts_langs = get_tts_supported_languages(tts_provider)
+        stt_langs = get_stt_supported_languages(stt_provider)
+    except ValueError as e:
+        return False, str(e)
+
+    # Skip TTS validation if provider doesn't support explicit language param
+    if not tts_langs:
+        tts_langs = set(supported_languages)  # Assume all are valid
+
+    # Skip STT validation if not implemented
+    if not stt_langs:
+        stt_langs = set(supported_languages)  # Assume all are valid
+
+    # Validate each language
+    unsupported_tts = []
+    unsupported_stt = []
+
+    for lang in supported_languages:
+        if lang not in tts_langs:
+            unsupported_tts.append(lang)
+        if lang not in stt_langs:
+            unsupported_stt.append(lang)
+
+    if unsupported_tts or unsupported_stt:
+        errors = []
+        if unsupported_tts:
+            errors.append(
+                f"TTS provider '{tts_provider}' does not support: {', '.join(unsupported_tts)}"
+            )
+        if unsupported_stt:
+            errors.append(
+                f"STT provider '{stt_provider}' does not support: {', '.join(unsupported_stt)}"
+            )
+        return False, '; '.join(errors)
+
+    return True, None
+
+
+def validate_default_language(
+    default_language: str, supported_languages: List[str]
+) -> Tuple[bool, Optional[str]]:
+    """
+    Validate that default_language is in supported_languages.
+
+    Args:
+        default_language: Default language code
+        supported_languages: List of supported language codes
+
+    Returns:
+        Tuple of (is_valid, error_message). error_message is None if valid.
+    """
+    if default_language not in supported_languages:
+        return (
+            False,
+            f"default_language '{default_language}' must be in supported_languages",
+        )
+    return True, None
+
+
+def get_language_names(language_codes: List[str]) -> List[str]:
+    """
+    Convert language codes to human-readable names.
+
+    Args:
+        language_codes: List of language codes (e.g., ['en', 'es', 'hi'])
+
+    Returns:
+        List of language names (e.g., ['English', 'Spanish', 'Hindi'])
+    """
+    return [LANGUAGE_NAMES.get(code, code) for code in language_codes]
+
+
+def format_language_prompt(supported_languages: List[str]) -> str:
+    """
+    Format language list for welcome audio prompt.
+
+    Args:
+        supported_languages: List of language codes
+
+    Returns:
+        Formatted string for audio prompt (e.g., "English, Spanish, or Hindi")
+    """
+    names = get_language_names(supported_languages)
+
+    if len(names) == 1:
+        return names[0]
+    elif len(names) == 2:
+        return f'{names[0]} or {names[1]}'
+    else:
+        # Oxford comma style: "English, Spanish, or Hindi"
+        return ', '.join(names[:-1]) + f', or {names[-1]}'
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/phone_validation.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/phone_validation.py
new file mode 100644
index 00000000..40684dc8
--- /dev/null
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/utils/phone_validation.py
@@ -0,0 +1,67 @@
+"""Phone number validation utilities"""
+
+import re
+from typing import List, Tuple, Optional
+
+# E.164 phone number format: +[country code][subscriber number]
+# Total length: 1-15 digits (including country code)
+# Must start with + followed by country code (1-3 digits, cannot start with 0)
+E164_PATTERN = re.compile(r'^\+[1-9]\d{1,14}$')
+
+
+def validate_e164_format(phone_number: str) -> bool:
+    """
+    Validate that a phone number is in E.164 format.
+
+    E.164 format:
+    - Starts with +
+    - Followed by country code (1-3 digits, cannot start with 0)
+    - Followed by subscriber number
+    - Total length: 1-15 digits (excluding +)
+    - Examples: +12025551234 (US), +442071838750 (UK), +919876543210 (India)
+
+    Args:
+        phone_number: Phone number string to validate
+
+    Returns:
+        True if valid E.164 format, False otherwise
+    """
+    return bool(E164_PATTERN.match(phone_number))
+
+
+def validate_phone_numbers(
+    phone_numbers: List[str], field_name: str = 'phone_numbers'
+) -> Tuple[bool, Optional[str]]:
+    """
+    Validate that all phone numbers in a list are in E.164 format.
+
+    Args:
+        phone_numbers: List of phone numbers to validate
+        field_name: Name of the field for error messages
+
+    Returns:
+        Tuple of (is_valid, error_message). error_message is None if valid.
+    """
+    if not isinstance(phone_numbers, list):
+        return False, f'{field_name} must be a list'
+
+    if not phone_numbers:
+        # Empty list is valid (agent might not have inbound/outbound numbers yet)
+        return True, None
+
+    invalid_numbers = []
+    for number in phone_numbers:
+        if not isinstance(number, str):
+            invalid_numbers.append(str(number))
+        elif not validate_e164_format(number):
+            invalid_numbers.append(number)
+
+    if invalid_numbers:
+        return False, (
+            f"{field_name} contains invalid E.164 format numbers: "
+            f"{', '.join(invalid_numbers)}. "
+            f"Format must be +[country][number] with 1-15 digits total, "
+            f"e.g., +12025551234 (US), +442071838750 (UK), +919876543210 (India)"
+        )
+
+    return True, None

From d449663efb01d5fae126abc0912a3ed4ea7adb25 Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Fri, 9 Jan 2026 11:53:40 +0530
Subject: [PATCH 2/8] fe changes - inbound support, enhancements

---
 wavefront/client/src/constants/languages.ts   |  65 +++++++
 .../voice-agents/CreateVoiceAgentDialog.tsx   | 168 ++++++++++++++++++
 .../voice-agents/EditVoiceAgentDialog.tsx     | 168 ++++++++++++++++++
 .../voice-agents/OutboundCallDialog.tsx       |   9 +-
 .../pages/apps/[appId]/voice-agents/index.tsx |  19 +-
 .../CreateTelephonyConfigDialog.tsx           |  90 ----------
 .../EditTelephonyConfigDialog.tsx             |  89 ----------
 .../voice-agents/telephony-configs/index.tsx  |   7 +-
 .../client/src/types/telephony-config.ts      |   3 -
 wavefront/client/src/types/voice-agent.ts     |  12 ++
 10 files changed, 435 insertions(+), 195 deletions(-)
 create mode 100644 wavefront/client/src/constants/languages.ts

diff --git a/wavefront/client/src/constants/languages.ts b/wavefront/client/src/constants/languages.ts
new file mode 100644
index 00000000..8de0af4f
--- /dev/null
+++ b/wavefront/client/src/constants/languages.ts
@@ -0,0 +1,65 @@
+/**
+ * Language constants for voice agent multi-language support
+ * Matches backend language validation
+ */
+
+export interface LanguageOption {
+  code: string;
+  name: string;
+  nativeName?: string;
+}
+
+export const SUPPORTED_LANGUAGES: LanguageOption[] = [
+  { code: 'en', name: 'English' },
+  { code: 'es', name: 'Spanish', nativeName: 'Español' },
+  { code: 'hi', name: 'Hindi', nativeName: 'हिंदी' },
+  { code: 'te', name: 'Telugu', nativeName: 'తెలుగు' },
+  { code: 'ta', name: 'Tamil', nativeName: 'தமிழ்' },
+  { code: 'kn', name: 'Kannada', nativeName: 'ಕನ್ನಡ' },
+  { code: 'ml', name: 'Malayalam', nativeName: 'മലയാളം' },
+  { code: 'mr', name: 'Marathi', nativeName: 'मराठी' },
+  { code: 'gu', name: 'Gujarati', nativeName: 'ગુજરાતી' },
+  { code: 'pa', name: 'Punjabi', nativeName: 'ਪੰਜਾਬੀ' },
+  { code: 'bn', name: 'Bengali', nativeName: 'বাংলা' },
+  { code: 'zh', name: 'Chinese', nativeName: '中文' },
+  { code: 'ja', name: 'Japanese', nativeName: '日本語' },
+  { code: 'ko', name: 'Korean', nativeName: '한국어' },
+  { code: 'fr', name: 'French', nativeName: 'Français' },
+  { code: 'de', name: 'German', nativeName: 'Deutsch' },
+  { code: 'it', name: 'Italian', nativeName: 'Italiano' },
+  { code: 'pt', name: 'Portuguese', nativeName: 'Português' },
+  { code: 'ru', name: 'Russian', nativeName: 'Русский' },
+  { code: 'ar', name: 'Arabic', nativeName: 'العربية' },
+  { code: 'tr', name: 'Turkish', nativeName: 'Türkçe' },
+  { code: 'vi', name: 'Vietnamese', nativeName: 'Tiếng Việt' },
+  { code: 'th', name: 'Thai', nativeName: 'ภาษาไทย' },
+  { code: 'id', name: 'Indonesian', nativeName: 'Bahasa Indonesia' },
+  { code: 'ms', name: 'Malay', nativeName: 'Bahasa Melayu' },
+  { code: 'nl', name: 'Dutch', nativeName: 'Nederlands' },
+  { code: 'pl', name: 'Polish', nativeName: 'Polski' },
+  { code: 'uk', name: 'Ukrainian', nativeName: 'Українська' },
+  { code: 'ro', name: 'Romanian', nativeName: 'Română' },
+  { code: 'cs', name: 'Czech', nativeName: 'Čeština' },
+  { code: 'sv', name: 'Swedish', nativeName: 'Svenska' },
+  { code: 'da', name: 'Danish', nativeName: 'Dansk' },
+  { code: 'no', name: 'Norwegian', nativeName: 'Norsk' },
+  { code: 'fi', name: 'Finnish', nativeName: 'Suomi' },
+  { code: 'el', name: 'Greek', nativeName: 'Ελληνικά' },
+  { code: 'he', name: 'Hebrew', nativeName: 'עברית' },
+  { code: 'hu', name: 'Hungarian', nativeName: 'Magyar' },
+  { code: 'sk', name: 'Slovak', nativeName: 'Slovenčina' },
+  { code: 'bg', name: 'Bulgarian', nativeName: 'Български' },
+  { code: 'hr', name: 'Croatian', nativeName: 'Hrvatski' },
+  { code: 'fil', name: 'Filipino' },
+];
+
+export const getLanguageName = (code: string): string => {
+  const lang = SUPPORTED_LANGUAGES.find((l) => l.code === code);
+  return lang ? lang.name : code;
+};
+
+export const getLanguageDisplayName = (code: string): string => {
+  const lang = SUPPORTED_LANGUAGES.find((l) => l.code === code);
+  if (!lang) return code;
+  return lang.nativeName ? `${lang.name} (${lang.nativeName})` : lang.name;
+};
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
index a7d91e68..c3d7f7fc 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
@@ -19,6 +19,7 @@ import {
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Checkbox } from '@app/components/ui/checkbox';
 import {
   useGetLLMConfigs,
   useGetSttConfigs,
@@ -28,6 +29,7 @@ import {
 import { extractErrorMessage } from '@app/lib/utils';
 import { useDashboardStore, useNotifyStore } from '@app/store';
 import { CreateVoiceAgentRequest } from '@app/types/voice-agent';
+import { SUPPORTED_LANGUAGES, getLanguageDisplayName } from '@app/constants/languages';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { langs } from '@uiw/codemirror-extensions-langs';
 import CodeMirror from '@uiw/react-codemirror';
@@ -36,6 +38,8 @@ import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 import { z } from 'zod';
 
+const E164_REGEX = /^\+[1-9]\d{1,14}$/;
+
 const createVoiceAgentSchema = z.object({
   name: z.string().min(1, 'Name is required').max(100, 'Name must be 100 characters or less'),
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
@@ -47,6 +51,10 @@ const createVoiceAgentSchema = z.object({
   welcome_message: z.string().min(1, 'Welcome message is required'),
   conversation_config: z.string().optional(),
   status: z.enum(['active', 'inactive']),
+  inbound_numbers: z.string().optional(),
+  outbound_numbers: z.string().optional(),
+  supported_languages: z.array(z.string()).min(1, 'At least one language is required'),
+  default_language: z.string().min(1, 'Default language is required'),
 });
 
 type CreateVoiceAgentInput = z.infer<typeof createVoiceAgentSchema>;
@@ -83,6 +91,10 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
       welcome_message: '',
       conversation_config: '{}',
       status: 'inactive',
+      inbound_numbers: '',
+      outbound_numbers: '',
+      supported_languages: ['en'],
+      default_language: 'en',
     },
   });
 
@@ -100,6 +112,10 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
         welcome_message: '',
         conversation_config: '{}',
         status: 'inactive',
+        inbound_numbers: '',
+        outbound_numbers: '',
+        supported_languages: ['en'],
+        default_language: 'en',
       });
     }
   }, [isOpen, form]);
@@ -116,6 +132,38 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
       }
     }
 
+    // Parse phone numbers (comma-separated)
+    const parsePhoneNumbers = (input: string): string[] => {
+      if (!input.trim()) return [];
+      return input
+        .split(',')
+        .map((num) => num.trim())
+        .filter((num) => num);
+    };
+
+    const inboundNumbers = parsePhoneNumbers(data.inbound_numbers || '');
+    const outboundNumbers = parsePhoneNumbers(data.outbound_numbers || '');
+
+    // Validate E.164 format
+    const invalidInbound = inboundNumbers.filter((num) => !E164_REGEX.test(num));
+    const invalidOutbound = outboundNumbers.filter((num) => !E164_REGEX.test(num));
+
+    if (invalidInbound.length > 0) {
+      notifyError(`Invalid inbound phone numbers (must be E.164 format): ${invalidInbound.join(', ')}`);
+      return;
+    }
+
+    if (invalidOutbound.length > 0) {
+      notifyError(`Invalid outbound phone numbers (must be E.164 format): ${invalidOutbound.join(', ')}`);
+      return;
+    }
+
+    // Validate default language is in supported languages
+    if (!data.supported_languages.includes(data.default_language)) {
+      notifyError('Default language must be one of the supported languages');
+      return;
+    }
+
     setCreating(true);
     try {
       const requestData: CreateVoiceAgentRequest = {
@@ -129,6 +177,10 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
         welcome_message: data.welcome_message.trim(),
         conversation_config: conversationConfig,
         status: data.status,
+        inbound_numbers: inboundNumbers.length > 0 ? inboundNumbers : undefined,
+        outbound_numbers: outboundNumbers.length > 0 ? outboundNumbers : undefined,
+        supported_languages: data.supported_languages,
+        default_language: data.default_language,
       };
 
       const response = await floConsoleService.voiceAgentService.createVoiceAgent(requestData);
@@ -368,6 +420,122 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
                 </div>
               </div>
 
+              {/* Phone Numbers */}
+              <div className="space-y-4">
+                <h3 className="text-sm font-semibold">Phone Numbers</h3>
+                <div className="grid grid-cols-1 gap-6">
+                  <FormField
+                    control={form.control}
+                    name="inbound_numbers"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Inbound Phone Numbers</FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., +1234567890, +9876543210" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Phone numbers for receiving inbound calls (E.164 format, comma-separated, globally unique)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="outbound_numbers"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Outbound Phone Numbers</FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., +1234567890, +9876543210" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Phone numbers for making outbound calls (E.164 format, comma-separated)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                </div>
+              </div>
+
+              {/* Language Configuration */}
+              <div className="space-y-4">
+                <h3 className="text-sm font-semibold">Language Configuration</h3>
+                <FormField
+                  control={form.control}
+                  name="supported_languages"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        Supported Languages<span className="text-red-500">*</span>
+                      </FormLabel>
+                      <div className="max-h-64 overflow-y-auto rounded-md border p-4">
+                        <div className="grid grid-cols-2 gap-3 md:grid-cols-3">
+                          {SUPPORTED_LANGUAGES.map((lang) => (
+                            <div key={lang.code} className="flex items-center space-x-2">
+                              <Checkbox
+                                checked={field.value?.includes(lang.code)}
+                                onCheckedChange={(checked) => {
+                                  const current = field.value || [];
+                                  if (checked) {
+                                    field.onChange([...current, lang.code]);
+                                  } else {
+                                    field.onChange(current.filter((l) => l !== lang.code));
+                                  }
+                                }}
+                              />
+                              <label className="text-sm leading-none font-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+                                {getLanguageDisplayName(lang.code)}
+                              </label>
+                            </div>
+                          ))}
+                        </div>
+                      </div>
+                      <FormDescription>
+                        Select languages this agent can converse in. If multiple languages are selected, the agent will
+                        detect the caller's language.
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="default_language"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        Default Language<span className="text-red-500">*</span>
+                      </FormLabel>
+                      <Select onValueChange={field.onChange} value={field.value}>
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue placeholder="Select default language" />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          {SUPPORTED_LANGUAGES.filter((lang) =>
+                            form.watch('supported_languages')?.includes(lang.code)
+                          ).map((lang) => (
+                            <SelectItem key={lang.code} value={lang.code}>
+                              {getLanguageDisplayName(lang.code)}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <FormDescription>
+                        Language used if detection fails or for single-language agents. Must be one of the supported
+                        languages.
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+
               {/* Behavior */}
               <div className="space-y-4">
                 <h3 className="text-sm font-semibold">Behavior</h3>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
index 245d7b59..56c1846d 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
@@ -19,6 +19,7 @@ import {
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Checkbox } from '@app/components/ui/checkbox';
 import {
   useGetLLMConfigs,
   useGetSttConfigs,
@@ -28,6 +29,7 @@ import {
 import { extractErrorMessage } from '@app/lib/utils';
 import { useDashboardStore, useNotifyStore } from '@app/store';
 import { UpdateVoiceAgentRequest, VoiceAgent } from '@app/types/voice-agent';
+import { SUPPORTED_LANGUAGES, getLanguageDisplayName } from '@app/constants/languages';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { langs } from '@uiw/codemirror-extensions-langs';
 import CodeMirror from '@uiw/react-codemirror';
@@ -35,6 +37,8 @@ import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
+const E164_REGEX = /^\+[1-9]\d{1,14}$/;
+
 const updateVoiceAgentSchema = z.object({
   name: z.string().min(1, 'Name is required').max(100, 'Name must be 100 characters or less'),
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
@@ -46,6 +50,10 @@ const updateVoiceAgentSchema = z.object({
   welcome_message: z.string().min(1, 'Welcome message is required'),
   conversation_config: z.string().optional(),
   status: z.enum(['active', 'inactive']),
+  inbound_numbers: z.string().optional(),
+  outbound_numbers: z.string().optional(),
+  supported_languages: z.array(z.string()).min(1, 'At least one language is required'),
+  default_language: z.string().min(1, 'Default language is required'),
 });
 
 type UpdateVoiceAgentInput = z.infer<typeof updateVoiceAgentSchema>;
@@ -88,6 +96,10 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
       welcome_message: agent.welcome_message,
       conversation_config: agent.conversation_config ? JSON.stringify(agent.conversation_config, null, 2) : '{}',
       status: agent.status,
+      inbound_numbers: agent.inbound_numbers?.join(', ') || '',
+      outbound_numbers: agent.outbound_numbers?.join(', ') || '',
+      supported_languages: agent.supported_languages || ['en'],
+      default_language: agent.default_language || 'en',
     },
   });
 
@@ -105,6 +117,10 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
         welcome_message: agent.welcome_message,
         conversation_config: agent.conversation_config ? JSON.stringify(agent.conversation_config, null, 2) : '{}',
         status: agent.status,
+        inbound_numbers: agent.inbound_numbers?.join(', ') || '',
+        outbound_numbers: agent.outbound_numbers?.join(', ') || '',
+        supported_languages: agent.supported_languages || ['en'],
+        default_language: agent.default_language || 'en',
       });
     }
   }, [isOpen, agent, form]);
@@ -121,6 +137,38 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
       }
     }
 
+    // Parse phone numbers (comma-separated)
+    const parsePhoneNumbers = (input: string): string[] => {
+      if (!input.trim()) return [];
+      return input
+        .split(',')
+        .map((num) => num.trim())
+        .filter((num) => num);
+    };
+
+    const inboundNumbers = parsePhoneNumbers(data.inbound_numbers || '');
+    const outboundNumbers = parsePhoneNumbers(data.outbound_numbers || '');
+
+    // Validate E.164 format
+    const invalidInbound = inboundNumbers.filter((num) => !E164_REGEX.test(num));
+    const invalidOutbound = outboundNumbers.filter((num) => !E164_REGEX.test(num));
+
+    if (invalidInbound.length > 0) {
+      notifyError(`Invalid inbound phone numbers (must be E.164 format): ${invalidInbound.join(', ')}`);
+      return;
+    }
+
+    if (invalidOutbound.length > 0) {
+      notifyError(`Invalid outbound phone numbers (must be E.164 format): ${invalidOutbound.join(', ')}`);
+      return;
+    }
+
+    // Validate default language is in supported languages
+    if (!data.supported_languages.includes(data.default_language)) {
+      notifyError('Default language must be one of the supported languages');
+      return;
+    }
+
     setUpdating(true);
     try {
       const requestData: UpdateVoiceAgentRequest = {
@@ -134,6 +182,10 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
         welcome_message: data.welcome_message.trim(),
         conversation_config: conversationConfig,
         status: data.status,
+        inbound_numbers: inboundNumbers,
+        outbound_numbers: outboundNumbers,
+        supported_languages: data.supported_languages,
+        default_language: data.default_language,
       };
 
       await floConsoleService.voiceAgentService.updateVoiceAgent(agent.id, requestData);
@@ -366,6 +418,122 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
                 </div>
               </div>
 
+              {/* Phone Numbers */}
+              <div className="space-y-4">
+                <h3 className="text-sm font-semibold">Phone Numbers</h3>
+                <div className="grid grid-cols-1 gap-6">
+                  <FormField
+                    control={form.control}
+                    name="inbound_numbers"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Inbound Phone Numbers</FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., +1234567890, +9876543210" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Phone numbers for receiving inbound calls (E.164 format, comma-separated, globally unique)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="outbound_numbers"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Outbound Phone Numbers</FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., +1234567890, +9876543210" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Phone numbers for making outbound calls (E.164 format, comma-separated)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                </div>
+              </div>
+
+              {/* Language Configuration */}
+              <div className="space-y-4">
+                <h3 className="text-sm font-semibold">Language Configuration</h3>
+                <FormField
+                  control={form.control}
+                  name="supported_languages"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        Supported Languages<span className="text-red-500">*</span>
+                      </FormLabel>
+                      <div className="max-h-64 overflow-y-auto rounded-md border p-4">
+                        <div className="grid grid-cols-2 gap-3 md:grid-cols-3">
+                          {SUPPORTED_LANGUAGES.map((lang) => (
+                            <div key={lang.code} className="flex items-center space-x-2">
+                              <Checkbox
+                                checked={field.value?.includes(lang.code)}
+                                onCheckedChange={(checked) => {
+                                  const current = field.value || [];
+                                  if (checked) {
+                                    field.onChange([...current, lang.code]);
+                                  } else {
+                                    field.onChange(current.filter((l) => l !== lang.code));
+                                  }
+                                }}
+                              />
+                              <label className="text-sm leading-none font-normal peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+                                {getLanguageDisplayName(lang.code)}
+                              </label>
+                            </div>
+                          ))}
+                        </div>
+                      </div>
+                      <FormDescription>
+                        Select languages this agent can converse in. If multiple languages are selected, the agent will
+                        detect the caller's language.
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="default_language"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>
+                        Default Language<span className="text-red-500">*</span>
+                      </FormLabel>
+                      <Select onValueChange={field.onChange} value={field.value}>
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue placeholder="Select default language" />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          {SUPPORTED_LANGUAGES.filter((lang) =>
+                            form.watch('supported_languages')?.includes(lang.code)
+                          ).map((lang) => (
+                            <SelectItem key={lang.code} value={lang.code}>
+                              {getLanguageDisplayName(lang.code)}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                      <FormDescription>
+                        Language used if detection fails or for single-language agents. Must be one of the supported
+                        languages.
+                      </FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
+
               {/* Behavior */}
               <div className="space-y-4">
                 <h3 className="text-sm font-semibold">Behavior</h3>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/OutboundCallDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/OutboundCallDialog.tsx
index 1cf00cc2..dee80587 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/OutboundCallDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/OutboundCallDialog.tsx
@@ -11,7 +11,6 @@ import {
 import { Input } from '@app/components/ui/input';
 import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { useGetTelephonyConfig } from '@app/hooks/data/fetch-hooks';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { VoiceAgent } from '@app/types/voice-agent';
@@ -25,19 +24,17 @@ interface CallInfo {
 interface OutboundCallDialogProps {
   isOpen: boolean;
   onOpenChange: (open: boolean) => void;
-  appId: string;
   agent: VoiceAgent;
 }
 
-const OutboundCallDialog: React.FC<OutboundCallDialogProps> = ({ isOpen, onOpenChange, appId, agent }) => {
+const OutboundCallDialog: React.FC<OutboundCallDialogProps> = ({ isOpen, onOpenChange, agent }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
   const [toNumber, setToNumber] = useState('');
   const [fromNumber, setFromNumber] = useState('');
   const [callLoading, setCallLoading] = useState(false);
 
-  // Fetch the specific telephony config to get phone numbers for call initiation
-  const { data: currentTelephonyConfig } = useGetTelephonyConfig(appId, agent.telephony_config_id);
-  const availablePhoneNumbers = currentTelephonyConfig?.phone_numbers || [];
+  // Get outbound phone numbers from the voice agent (not telephony config)
+  const availablePhoneNumbers = agent.outbound_numbers || [];
 
   // E.164 phone number validation
   const isValidE164PhoneNumber = (phoneNumber: string): boolean => {
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/index.tsx
index a37858ed..64b44495 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/index.tsx
@@ -9,6 +9,7 @@ import { getVoiceAgentsKey } from '@app/hooks/data/query-keys';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
 import { VoiceAgent } from '@app/types/voice-agent';
+import { getLanguageName } from '@app/constants/languages';
 import { useQueryClient } from '@tanstack/react-query';
 import { Pencil, Phone, Trash2 } from 'lucide-react';
 import React, { useState } from 'react';
@@ -133,6 +134,9 @@ const VoiceAgentsPage: React.FC = () => {
                 <TableRow>
                   <TableHead>Name</TableHead>
                   <TableHead>Description</TableHead>
+                  <TableHead>Inbound #s</TableHead>
+                  <TableHead>Outbound #s</TableHead>
+                  <TableHead>Languages</TableHead>
                   <TableHead>Status</TableHead>
                   <TableHead>Created</TableHead>
                   <TableHead className="text-right">Actions</TableHead>
@@ -143,6 +147,20 @@ const VoiceAgentsPage: React.FC = () => {
                   <TableRow key={agent.id}>
                     <TableCell className="font-medium">{agent.name}</TableCell>
                     <TableCell className="max-w-md truncate">{agent.description || '-'}</TableCell>
+                    <TableCell>
+                      <span className="text-sm text-gray-600">{agent.inbound_numbers?.length || 0}</span>
+                    </TableCell>
+                    <TableCell>
+                      <span className="text-sm text-gray-600">{agent.outbound_numbers?.length || 0}</span>
+                    </TableCell>
+                    <TableCell>
+                      <span
+                        className="text-sm text-gray-600"
+                        title={agent.supported_languages?.map(getLanguageName).join(', ')}
+                      >
+                        {agent.supported_languages?.length || 1} ({agent.default_language || 'en'})
+                      </span>
+                    </TableCell>
                     <TableCell>
                       <span
                         className={`rounded-full px-2 py-1 text-xs font-medium ${
@@ -216,7 +234,6 @@ const VoiceAgentsPage: React.FC = () => {
           <OutboundCallDialog
             isOpen={!!callItem}
             onOpenChange={(open) => !open && setCallItem(null)}
-            appId={app}
             agent={callItem}
           />
         )}
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/CreateTelephonyConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/CreateTelephonyConfigDialog.tsx
index 95a3424a..34120d76 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/CreateTelephonyConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/CreateTelephonyConfigDialog.tsx
@@ -18,14 +18,12 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
 import { Textarea } from '@app/components/ui/textarea';
 import {
   getConnectionTypeOptions,
   getTelephonyProviderConfig,
   getTelephonyProviderOptions,
-  isValidE164PhoneNumber,
   requiresSipConfig,
 } from '@app/config/telephony-providers';
 import { extractErrorMessage } from '@app/lib/utils';
@@ -63,7 +61,6 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
 }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
 
-  const [phoneNumbers, setPhoneNumbers] = useState<string[]>(['']);
   const [loading, setLoading] = useState(false);
 
   const form = useForm<CreateTelephonyConfigInput>({
@@ -107,53 +104,10 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
         sip_port: undefined,
         sip_transport: undefined,
       });
-      setPhoneNumbers(['']);
     }
   }, [isOpen, form]);
 
-  const handleAddPhoneNumber = () => {
-    setPhoneNumbers([...phoneNumbers, '']);
-  };
-
-  const handleRemovePhoneNumber = (index: number) => {
-    if (phoneNumbers.length === 1) {
-      notifyError('At least one phone number is required');
-      return;
-    }
-    setPhoneNumbers(phoneNumbers.filter((_, i) => i !== index));
-  };
-
-  const handlePhoneNumberChange = (index: number, value: string) => {
-    const newPhoneNumbers = [...phoneNumbers];
-    newPhoneNumbers[index] = value;
-    setPhoneNumbers(newPhoneNumbers);
-  };
-
-  const validatePhoneNumbers = (): boolean => {
-    const filledPhoneNumbers = phoneNumbers.filter((p) => p.trim());
-
-    if (filledPhoneNumbers.length === 0) {
-      notifyError('At least one phone number is required');
-      return false;
-    }
-
-    for (const phone of filledPhoneNumbers) {
-      if (!isValidE164PhoneNumber(phone.trim())) {
-        notifyError(
-          `Invalid phone number format: ${phone}. Phone numbers must be in E.164 format (e.g., +14155551234)`
-        );
-        return false;
-      }
-    }
-
-    return true;
-  };
-
   const onSubmit = async (data: CreateTelephonyConfigInput) => {
-    if (!validatePhoneNumbers()) {
-      return;
-    }
-
     // Validate SIP config if required
     if (requiresSipConfig(data.provider as TelephonyProvider, data.connection_type)) {
       if (!data.sip_domain?.trim()) {
@@ -162,8 +116,6 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
       }
     }
 
-    const filledPhoneNumbers = phoneNumbers.filter((p) => p.trim()).map((p) => p.trim());
-
     setLoading(true);
     try {
       const requestData: {
@@ -172,7 +124,6 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
         provider: TelephonyProvider;
         connection_type: ConnectionType;
         credentials: { account_sid: string; auth_token: string };
-        phone_numbers: string[];
         webhook_config: null;
         sip_config?: { sip_domain: string; port?: number; transport?: SipTransport };
       } = {
@@ -184,7 +135,6 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
           account_sid: data.account_sid.trim(),
           auth_token: data.auth_token.trim(),
         },
-        phone_numbers: filledPhoneNumbers,
         webhook_config: null,
       };
 
@@ -351,46 +301,6 @@ const CreateTelephonyConfigDialog: React.FC<CreateTelephonyConfigDialogProps> =
               />
             </div>
 
-            <div className="rounded-lg border border-gray-200 p-4">
-              <div className="mb-4 flex items-center justify-between">
-                <Label>
-                  Phone Numbers <span className="text-red-500">*</span>
-                </Label>
-                <Button type="button" variant="outline" size="sm" onClick={handleAddPhoneNumber}>
-                  + Add Number
-                </Button>
-              </div>
-
-              <div className="space-y-3">
-                {phoneNumbers.map((phone, index) => (
-                  <div key={index} className="flex gap-2">
-                    <Input
-                      type="text"
-                      value={phone}
-                      onChange={(e) => handlePhoneNumberChange(index, e.target.value)}
-                      placeholder="+14155551234"
-                      className="flex-1"
-                    />
-                    <Button
-                      type="button"
-                      variant="outline"
-                      size="icon"
-                      onClick={() => handleRemovePhoneNumber(index)}
-                      disabled={phoneNumbers.length === 1}
-                    >
-                      <svg className="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
-                      </svg>
-                    </Button>
-                  </div>
-                ))}
-              </div>
-
-              <p className="text-muted-foreground mt-2 text-[0.8rem]">
-                Phone numbers must be in E.164 format (e.g., +14155551234). Include country code with + prefix.
-              </p>
-            </div>
-
             {showSipConfig && (
               <div className="rounded-lg border border-gray-200 p-4">
                 <h3 className="mb-4 font-medium text-gray-900">SIP Configuration</h3>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/EditTelephonyConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/EditTelephonyConfigDialog.tsx
index 0feb1c41..c83fbbcd 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/EditTelephonyConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/EditTelephonyConfigDialog.tsx
@@ -18,14 +18,12 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
 import { Textarea } from '@app/components/ui/textarea';
 import {
   getConnectionTypeOptions,
   getTelephonyProviderConfig,
   getTelephonyProviderOptions,
-  isValidE164PhoneNumber,
   requiresSipConfig,
 } from '@app/config/telephony-providers';
 import { extractErrorMessage } from '@app/lib/utils';
@@ -70,7 +68,6 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
 }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
 
-  const [phoneNumbers, setPhoneNumbers] = useState<string[]>(['']);
   const [loading, setLoading] = useState(false);
 
   const form = useForm<UpdateTelephonyConfigInput>({
@@ -105,7 +102,6 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
         sip_port: config.sip_config?.port,
         sip_transport: config.sip_config?.transport,
       });
-      setPhoneNumbers(config.phone_numbers.length > 0 ? config.phone_numbers : ['']);
     }
   }, [isOpen, config, form]);
 
@@ -118,49 +114,7 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
     }
   }, [watchedConnectionType, form]);
 
-  const handleAddPhoneNumber = () => {
-    setPhoneNumbers([...phoneNumbers, '']);
-  };
-
-  const handleRemovePhoneNumber = (index: number) => {
-    if (phoneNumbers.length === 1) {
-      notifyError('At least one phone number is required');
-      return;
-    }
-    setPhoneNumbers(phoneNumbers.filter((_, i) => i !== index));
-  };
-
-  const handlePhoneNumberChange = (index: number, value: string) => {
-    const newPhoneNumbers = [...phoneNumbers];
-    newPhoneNumbers[index] = value;
-    setPhoneNumbers(newPhoneNumbers);
-  };
-
-  const validatePhoneNumbers = (): boolean => {
-    const filledPhoneNumbers = phoneNumbers.filter((p) => p.trim());
-
-    if (filledPhoneNumbers.length === 0) {
-      notifyError('At least one phone number is required');
-      return false;
-    }
-
-    for (const phone of filledPhoneNumbers) {
-      if (!isValidE164PhoneNumber(phone.trim())) {
-        notifyError(
-          `Invalid phone number format: ${phone}. Phone numbers must be in E.164 format (e.g., +14155551234)`
-        );
-        return false;
-      }
-    }
-
-    return true;
-  };
-
   const onSubmit = async (data: UpdateTelephonyConfigInput) => {
-    if (!validatePhoneNumbers()) {
-      return;
-    }
-
     // Validate SIP config if required
     if (requiresSipConfig(data.provider as TelephonyProvider, data.connection_type)) {
       if (!data.sip_domain?.trim()) {
@@ -169,8 +123,6 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
       }
     }
 
-    const filledPhoneNumbers = phoneNumbers.filter((p) => p.trim()).map((p) => p.trim());
-
     setLoading(true);
     try {
       const updateData: UpdateTelephonyConfigRequest = {
@@ -178,7 +130,6 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
         description: data.description?.trim() || null,
         provider: data.provider as TelephonyProvider,
         connection_type: data.connection_type,
-        phone_numbers: filledPhoneNumbers,
       };
 
       // Only include credentials if they were changed
@@ -356,46 +307,6 @@ const EditTelephonyConfigDialog: React.FC<EditTelephonyConfigDialogProps> = ({
               />
             </div>
 
-            <div className="rounded-lg border border-gray-200 p-4">
-              <div className="mb-4 flex items-center justify-between">
-                <Label>
-                  Phone Numbers <span className="text-red-500">*</span>
-                </Label>
-                <Button type="button" variant="outline" size="sm" onClick={handleAddPhoneNumber}>
-                  + Add Number
-                </Button>
-              </div>
-
-              <div className="space-y-3">
-                {phoneNumbers.map((phone, index) => (
-                  <div key={index} className="flex gap-2">
-                    <Input
-                      type="text"
-                      value={phone}
-                      onChange={(e) => handlePhoneNumberChange(index, e.target.value)}
-                      placeholder="+14155551234"
-                      className="flex-1"
-                    />
-                    <Button
-                      type="button"
-                      variant="outline"
-                      size="icon"
-                      onClick={() => handleRemovePhoneNumber(index)}
-                      disabled={phoneNumbers.length === 1}
-                    >
-                      <svg className="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
-                      </svg>
-                    </Button>
-                  </div>
-                ))}
-              </div>
-
-              <p className="text-muted-foreground mt-2 text-[0.8rem]">
-                Phone numbers must be in E.164 format (e.g., +14155551234). Include country code with + prefix.
-              </p>
-            </div>
-
             {showSipConfig && (
               <div className="rounded-lg border border-gray-200 p-4">
                 <h3 className="mb-4 font-medium text-gray-900">SIP Configuration</h3>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/index.tsx
index 71bc2dc2..f4874680 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/telephony-configs/index.tsx
@@ -81,8 +81,7 @@ const TelephonyConfigsPage: React.FC = () => {
       config.display_name.toLowerCase().includes(query) ||
       (config.description && config.description.toLowerCase().includes(query)) ||
       config.provider.toLowerCase().includes(query) ||
-      config.connection_type.toLowerCase().includes(query) ||
-      config.phone_numbers.some((phone) => phone.toLowerCase().includes(query))
+      config.connection_type.toLowerCase().includes(query)
     );
   });
 
@@ -131,7 +130,6 @@ const TelephonyConfigsPage: React.FC = () => {
                   <TableHead>Display Name</TableHead>
                   <TableHead>Provider</TableHead>
                   <TableHead>Connection Type</TableHead>
-                  <TableHead>Phone Numbers</TableHead>
                   <TableHead>Description</TableHead>
                   <TableHead>Created</TableHead>
                   <TableHead className="text-right">Actions</TableHead>
@@ -143,9 +141,6 @@ const TelephonyConfigsPage: React.FC = () => {
                     <TableCell className="font-medium">{config.display_name}</TableCell>
                     <TableCell>{config.provider}</TableCell>
                     <TableCell>{config.connection_type}</TableCell>
-                    <TableCell>
-                      {config.phone_numbers.length} number{config.phone_numbers.length !== 1 ? 's' : ''}
-                    </TableCell>
                     <TableCell className="max-w-md truncate">{config.description || '-'}</TableCell>
                     <TableCell>{new Date(config.created_at).toLocaleDateString()}</TableCell>
                     <TableCell className="text-right" onClick={(e) => e.stopPropagation()}>
diff --git a/wavefront/client/src/types/telephony-config.ts b/wavefront/client/src/types/telephony-config.ts
index f3acea32..a33cbc55 100644
--- a/wavefront/client/src/types/telephony-config.ts
+++ b/wavefront/client/src/types/telephony-config.ts
@@ -35,7 +35,6 @@ export interface TelephonyConfig {
   provider: TelephonyProvider;
   connection_type: ConnectionType;
   credentials: TelephonyCredentials;
-  phone_numbers: string[];
   webhook_config?: WebhookConfig | null;
   sip_config?: SipConfig | null;
   is_deleted: boolean;
@@ -50,7 +49,6 @@ export interface CreateTelephonyConfigRequest {
   provider: TelephonyProvider;
   connection_type: ConnectionType;
   credentials: TelephonyCredentials;
-  phone_numbers: string[];
   webhook_config?: WebhookConfig | null;
   sip_config?: SipConfig | null;
 }
@@ -62,7 +60,6 @@ export interface UpdateTelephonyConfigRequest {
   provider?: TelephonyProvider;
   connection_type?: ConnectionType;
   credentials?: TelephonyCredentials;
-  phone_numbers?: string[];
   webhook_config?: WebhookConfig | null;
   sip_config?: SipConfig | null;
 }
diff --git a/wavefront/client/src/types/voice-agent.ts b/wavefront/client/src/types/voice-agent.ts
index bca1a3bc..7a703ed1 100644
--- a/wavefront/client/src/types/voice-agent.ts
+++ b/wavefront/client/src/types/voice-agent.ts
@@ -15,6 +15,10 @@ export interface VoiceAgent {
   welcome_message: string;
   conversation_config: Record<string, unknown> | null;
   status: 'active' | 'inactive';
+  inbound_numbers: string[];
+  outbound_numbers: string[];
+  supported_languages: string[];
+  default_language: string;
   is_deleted: boolean;
   created_at: string;
   updated_at: string;
@@ -34,6 +38,10 @@ export interface CreateVoiceAgentRequest {
   welcome_message: string;
   conversation_config?: Record<string, unknown> | null;
   status?: 'active' | 'inactive';
+  inbound_numbers?: string[];
+  outbound_numbers?: string[];
+  supported_languages?: string[];
+  default_language?: string;
 }
 
 /**
@@ -51,6 +59,10 @@ export interface UpdateVoiceAgentRequest {
   welcome_message?: string;
   conversation_config?: Record<string, unknown> | null;
   status?: 'active' | 'inactive';
+  inbound_numbers?: string[];
+  outbound_numbers?: string[];
+  supported_languages?: string[];
+  default_language?: string;
 }
 
 /**

From d2a86284c1026b472bf3f3f2af94c0479e068979 Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Fri, 9 Jan 2026 16:52:19 +0530
Subject: [PATCH 3/8] call_processing - inbound, language switch, enhancement

---
 .../constants/language_config.py              | 100 +++++++
 .../controllers/cache_controller.py           |  49 +++-
 .../controllers/webhook_controller.py         | 102 ++++++-
 .../services/floware_http_client.py           |  91 ++++++
 .../services/pipecat_service.py               | 272 ++++++++++++++++--
 .../services/voice_agent_cache_service.py     | 134 +++++++++
 6 files changed, 711 insertions(+), 37 deletions(-)
 create mode 100644 wavefront/server/apps/call_processing/call_processing/constants/language_config.py

diff --git a/wavefront/server/apps/call_processing/call_processing/constants/language_config.py b/wavefront/server/apps/call_processing/call_processing/constants/language_config.py
new file mode 100644
index 00000000..563d3200
--- /dev/null
+++ b/wavefront/server/apps/call_processing/call_processing/constants/language_config.py
@@ -0,0 +1,100 @@
+"""
+Language detection and configuration constants
+
+Contains keyword mappings and instructions for multi-language support
+"""
+
+from typing import Dict, List
+
+
+# Language keyword mappings for detection
+LANGUAGE_KEYWORDS: Dict[str, List[str]] = {
+    'en': ['english', 'inglés', 'inglese'],
+    'es': ['spanish', 'español', 'espanol', 'castellano'],
+    'hi': ['hindi', 'हिंदी', 'हिन्दी'],
+    'te': ['telugu', 'తెలుగు'],
+    'ta': ['tamil', 'தமிழ்'],
+    'kn': ['kannada', 'ಕನ್ನಡ'],
+    'ml': ['malayalam', 'മലയാളം'],
+    'mr': ['marathi', 'मराठी'],
+    'gu': ['gujarati', 'ગુજરાતી'],
+    'pa': ['punjabi', 'ਪੰਜਾಬੀ'],
+    'bn': ['bengali', 'বাংলা'],
+    'zh': ['chinese', 'mandarin', '中文', '普通话'],
+    'ja': ['japanese', '日本語'],
+    'ko': ['korean', '한국어'],
+    'fr': ['french', 'français', 'francais'],
+    'de': ['german', 'deutsch'],
+    'it': ['italian', 'italiano'],
+    'pt': ['portuguese', 'português', 'portugues'],
+    'ru': ['russian', 'русский'],
+    'ar': ['arabic', 'عربي', 'العربية'],
+    'tr': ['turkish', 'türkçe', 'turkce'],
+    'fil': ['filipino', 'pilipino', 'tagalog'],
+    'tl': ['tagalog', 'filipino'],
+    'fi': ['finnish', 'suomi'],
+    'cs': ['czech', 'čeština', 'cestina'],
+    'da': ['danish', 'dansk'],
+    'el': ['greek', 'ελληνικά', 'ellinika'],
+    'he': ['hebrew', 'עברית', 'ivrit'],
+    'hr': ['croatian', 'hrvatski'],
+    'hu': ['hungarian', 'magyar'],
+    'id': ['indonesian', 'bahasa indonesia'],
+    'ka': ['georgian', 'ქართული', 'kartuli'],
+    'ms': ['malay', 'bahasa melayu'],
+    'nl': ['dutch', 'nederlands'],
+    'no': ['norwegian', 'norsk'],
+    'pl': ['polish', 'polski'],
+    'ro': ['romanian', 'română', 'romana'],
+    'sk': ['slovak', 'slovenčina', 'slovencina'],
+    'sv': ['swedish', 'svenska'],
+    'th': ['thai', 'ภาษาไทย', 'phasa thai'],
+    'uk': ['ukrainian', 'українська', 'ukrainska'],
+    'vi': ['vietnamese', 'tiếng việt', 'tieng viet'],
+}
+
+# Language-specific LLM instructions
+LANGUAGE_INSTRUCTIONS: Dict[str, str] = {
+    'en': 'Respond in English.',
+    'es': 'Respond in Spanish (Responde en español).',
+    'hi': 'Respond in Hindi (हिंदी में जवाब दें).',
+    'te': 'Respond in Telugu (తెలుగులో సమాధానం ఇవ్వండి).',
+    'ta': 'Respond in Tamil (தமிழில் பதிலளிக்கவும்).',
+    'kn': 'Respond in Kannada (ಕನ್ನಡದಲ್ಲಿ ಉತ್ತರಿಸಿ).',
+    'ml': 'Respond in Malayalam (മലയാളത്തിൽ മറുപടി നൽകുക).',
+    'mr': 'Respond in Marathi (मराठीत उत्तर द्या).',
+    'gu': 'Respond in Gujarati (ગુજરાતીમાં જવાબ આપો).',
+    'pa': 'Respond in Punjabi (ਪੰਜਾਬੀ ਵਿੱਚ ਜਵਾਬ ਦਿਓ).',
+    'bn': 'Respond in Bengali (বাংলায় উত্তর দিন).',
+    'zh': 'Respond in Chinese (用中文回复).',
+    'ja': 'Respond in Japanese (日本語で応答してください).',
+    'ko': 'Respond in Korean (한국어로 답변하세요).',
+    'fr': 'Respond in French (Répondez en français).',
+    'de': 'Respond in German (Auf Deutsch antworten).',
+    'it': 'Respond in Italian (Rispondi in italiano).',
+    'pt': 'Respond in Portuguese (Responda em português).',
+    'ru': 'Respond in Russian (Отвечайте на русском).',
+    'ar': 'Respond in Arabic (الرد بالعربية).',
+    'tr': 'Respond in Turkish (Türkçe cevap verin).',
+    'fil': 'Respond in Filipino (Tumugon sa Filipino).',
+    'tl': 'Respond in Tagalog (Tumugon sa Tagalog).',
+    'fi': 'Respond in Finnish (Vastaa suomeksi).',
+    'cs': 'Respond in Czech (Odpovězte česky).',
+    'da': 'Respond in Danish (Svar på dansk).',
+    'el': 'Respond in Greek (Απαντήστε στα ελληνικά).',
+    'he': 'Respond in Hebrew (ענה בעברית).',
+    'hr': 'Respond in Croatian (Odgovorite na hrvatskom).',
+    'hu': 'Respond in Hungarian (Válaszoljon magyarul).',
+    'id': 'Respond in Indonesian (Jawab dalam bahasa Indonesia).',
+    'ka': 'Respond in Georgian (უპასუხეთ ქართულად).',
+    'ms': 'Respond in Malay (Jawab dalam bahasa Melayu).',
+    'nl': 'Respond in Dutch (Antwoord in het Nederlands).',
+    'no': 'Respond in Norwegian (Svar på norsk).',
+    'pl': 'Respond in Polish (Odpowiedz po polsku).',
+    'ro': 'Respond in Romanian (Răspundeți în română).',
+    'sk': 'Respond in Slovak (Odpovedzte po slovensky).',
+    'sv': 'Respond in Swedish (Svara på svenska).',
+    'th': 'Respond in Thai (ตอบเป็นภาษาไทย).',
+    'uk': 'Respond in Ukrainian (Відповідайте українською).',
+    'vi': 'Respond in Vietnamese (Trả lời bằng tiếng Việt).',
+}
diff --git a/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py b/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
index eaae7c1a..28822b77 100644
--- a/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
+++ b/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
@@ -27,7 +27,7 @@ class InvalidateCacheRequest(BaseModel):
     """Request body for cache invalidation"""
 
     config_type: str
-    config_id: UUID
+    config_id: str  # Can be UUID string or phone number for inbound_number type
 
 
 def verify_passthrough_auth(x_passthrough: Optional[str] = Header(None)) -> None:
@@ -102,19 +102,50 @@ async def invalidate_cache(
         HTTPException: If config_type is invalid or API fetch fails
     """
     config_type = request.config_type
-    config_id = request.config_id
+    config_id_str = request.config_id
 
-    # Validate config type
-    if config_type not in VALID_CONFIG_TYPES:
+    # Validate config type (including inbound_number)
+    valid_types = list(VALID_CONFIG_TYPES) + ['inbound_number']
+    if config_type not in valid_types:
         logger.error(f'Invalid config type: {config_type}')
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f'Invalid config_type. Must be one of: {", ".join(VALID_CONFIG_TYPES)}',
+            detail=f'Invalid config_type. Must be one of: {", ".join(valid_types)}',
         )
 
-    logger.info(f'Invalidating cache for {config_type} {config_id}')
+    logger.info(f'Invalidating cache for {config_type} {config_id_str}')
+
+    # Step 1: Handle inbound_number separately (simple string-based cache key)
+    if config_type == 'inbound_number':
+        # For inbound numbers, just remove the cache key
+        cache_key = f'inbound_number:{config_id_str}'
+        removed = voice_agent_cache_service.cache_manager.remove(cache_key)
+
+        if removed:
+            logger.info(f'Removed inbound number cache for {config_id_str}')
+        else:
+            logger.warning(f'Inbound number {config_id_str} was not in cache')
+
+        return JSONResponse(
+            status_code=status.HTTP_200_OK,
+            content={
+                'message': f'Cache invalidated for inbound_number {config_id_str}',
+                'config_type': config_type,
+                'config_id': config_id_str,
+            },
+        )
+
+    # Step 2: Get the appropriate cache key for config types
+    # Convert config_id string to UUID for UUID-based configs
+    try:
+        config_id = UUID(config_id_str)
+    except ValueError:
+        logger.error(f'Invalid UUID format for config_id: {config_id_str}')
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f'config_id must be a valid UUID for config_type={config_type}',
+        )
 
-    # Step 1: Get the appropriate cache key
     cache_key_funcs = {
         'voice_agent': get_voice_agent_cache_key,
         'llm_inference_config': get_llm_config_cache_key,
@@ -133,14 +164,14 @@ async def invalidate_cache(
 
     cache_key = cache_key_func(config_id)
 
-    # Step 2: Remove from cache
+    # Step 3: Remove from cache
     removed = voice_agent_cache_service.cache_manager.remove(cache_key)
     if removed:
         logger.info(f'Removed {config_type} {config_id} from cache')
     else:
         logger.warning(f'{config_type} {config_id} was not in cache')
 
-    # Step 3: Fetch fresh config from floware API
+    # Step 4: Fetch fresh config from floware API
     try:
         if not voice_agent_cache_service.floware_http_client:
             raise HTTPException(
diff --git a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
index 8a34655f..fae95511 100644
--- a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
+++ b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
@@ -6,7 +6,7 @@
 
 import os
 from uuid import UUID
-from fastapi import APIRouter, WebSocket, Query, Depends
+from fastapi import APIRouter, WebSocket, Query, Depends, Form
 from fastapi.responses import Response
 from twilio.twiml.voice_response import VoiceResponse, Connect, Stream
 from call_processing.log.logger import logger
@@ -33,6 +33,100 @@
 webhook_router = APIRouter()
 
 
+@webhook_router.post('/inbound')
+@inject
+async def inbound_webhook(
+    From: str = Form(...),
+    To: str = Form(...),
+    CallSid: str = Form(...),
+    voice_agent_cache_service: VoiceAgentCacheService = Depends(
+        Provide[ApplicationContainer.voice_agent_cache_service]
+    ),
+):
+    """
+    Twilio inbound webhook endpoint
+
+    Called by Twilio when an inbound call is received.
+    Looks up the voice agent by inbound phone number and redirects to TwiML endpoint.
+
+    Form params (from Twilio):
+        From: Caller's phone number (E.164 format)
+        To: Called phone number (E.164 format, the inbound number)
+        CallSid: Twilio call identifier
+    """
+    logger.info(f'Inbound call received: From={From}, To={To}, CallSid={CallSid}')
+
+    # Look up agent by inbound number
+    agent = await voice_agent_cache_service.get_agent_by_inbound_number(To)
+
+    if not agent:
+        logger.error(f'No voice agent found for inbound number: {To}')
+        # Return TwiML with error message
+        response = VoiceResponse()
+        response.say('Sorry, this number is not configured for voice services.')
+        response.hangup()
+        return Response(content=str(response), media_type='application/xml')
+
+    agent_id = agent['id']
+    logger.info(f'Agent found for inbound number {To}: {agent_id} ({agent["name"]})')
+
+    # Generate welcome message audio URL
+    welcome_message_audio_url = ''
+    if agent.get('welcome_message'):
+        try:
+            # Note: This assumes voice_agent_cache_service has this method
+            # We'll implement it in the next step
+            welcome_message_audio_url = (
+                await voice_agent_cache_service.get_welcome_message_audio_url(agent_id)
+            )
+        except Exception as e:
+            logger.error(f'Failed to get welcome message URL: {e}')
+            # Continue without welcome message
+
+    # Build WebSocket URL
+    base_url = os.getenv('CALL_PROCESSING_BASE_URL', 'http://localhost:8003')
+
+    # Convert https:// to wss:// (or http:// to ws://)
+    if base_url.startswith('https://'):
+        websocket_url = base_url.replace('https://', 'wss://')
+    elif base_url.startswith('http://'):
+        websocket_url = base_url.replace('http://', 'ws://')
+    else:
+        websocket_url = f'wss://{base_url}'
+
+    websocket_url = f'{websocket_url}/webhooks/ws'
+
+    logger.info(f'WebSocket URL: {websocket_url}')
+
+    # Generate TwiML response
+    response = VoiceResponse()
+
+    # Play welcome message audio if URL is provided
+    if welcome_message_audio_url:
+        response.play(welcome_message_audio_url)
+    else:
+        logger.warning(
+            'No welcome message audio URL provided, skipping welcome message'
+        )
+
+    connect = Connect()
+    stream = Stream(url=websocket_url)
+
+    # Pass parameters to WebSocket stream
+    stream.parameter(name='voice_agent_id', value=agent_id)
+
+    connect.append(stream)
+    response.append(connect)
+
+    # Pause for 60 seconds before auto-hangup (adjust as needed)
+    response.pause(length=60)
+
+    twiml_xml = str(response)
+    logger.info(f'Returning TwiML: {twiml_xml}')
+
+    return Response(content=twiml_xml, media_type='application/xml')
+
+
 @webhook_router.post('/twiml')
 async def twiml_endpoint(
     voice_agent_id: str = Query(...),
@@ -41,7 +135,7 @@ async def twiml_endpoint(
     """
     Twilio TwiML endpoint
 
-    Called by Twilio when call connects.
+    Called by Twilio when call connects (directly or via inbound webhook redirect).
     Returns TwiML XML with WebSocket connection instructions.
 
     Query params:
@@ -80,7 +174,7 @@ async def twiml_endpoint(
     connect = Connect()
     stream = Stream(url=websocket_url)
 
-    # Pass voice_agent_id as stream parameter
+    # Pass parameters to WebSocket stream
     stream.parameter(name='voice_agent_id', value=voice_agent_id)
 
     connect.append(stream)
@@ -121,7 +215,7 @@ async def websocket_endpoint(
         logger.info(f'Auto-detected transport: {transport_type}')
         logger.info(f'Call data: {call_data}')
 
-        # Extract voice_agent_id from stream parameters
+        # Extract parameters from stream
         body_data = call_data.get('body', {})
         voice_agent_id = body_data.get('voice_agent_id')
 
diff --git a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
index cd8fe97f..361de52a 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
@@ -123,3 +123,94 @@ async def fetch_config(
             except httpx.RequestError as e:
                 logger.error(f'Request error fetching {config_type} {config_id}: {e}')
                 raise
+
+    async def get_agent_by_inbound_number(
+        self, phone_number: str
+    ) -> Optional[Dict[str, Any]]:
+        """
+        Get voice agent by inbound phone number.
+
+        Args:
+            phone_number: E.164 formatted phone number
+
+        Returns:
+            Voice agent dict if found, None otherwise
+
+        Raises:
+            httpx.HTTPStatusError: If API returns 4xx/5xx error (except 404)
+            httpx.RequestError: If request fails (network error, timeout, etc.)
+        """
+        url = (
+            f'{self.base_url}/floware/v1/voice-agents/by-inbound-number/{phone_number}'
+        )
+
+        async with httpx.AsyncClient(timeout=self.timeout) as client:
+            try:
+                response = await client.get(url, headers=self._get_headers())
+                response.raise_for_status()
+
+                # Extract agent from response
+                data = response.json()
+                if 'data' in data:
+                    return data['data']
+                return data
+
+            except httpx.HTTPStatusError as e:
+                if e.response.status_code == 404:
+                    logger.info(f'No agent found for inbound number: {phone_number}')
+                    return None
+                logger.error(
+                    f'HTTP error fetching agent by inbound number {phone_number}: '
+                    f'status={e.response.status_code}'
+                )
+                raise
+            except httpx.RequestError as e:
+                logger.error(
+                    f'Request error fetching agent by inbound number {phone_number}: {e}'
+                )
+                raise
+
+    async def get_welcome_message_audio_url(self, agent_id: str) -> str:
+        """
+        Get welcome message audio presigned URL for a voice agent.
+
+        Args:
+            agent_id: Voice agent UUID (string)
+
+        Returns:
+            Presigned URL for welcome message audio, or empty string if not available
+
+        Raises:
+            httpx.HTTPStatusError: If API returns 4xx/5xx error (except 404)
+            httpx.RequestError: If request fails (network error, timeout, etc.)
+        """
+        url = f'{self.base_url}/floware/v1/voice-agents/{agent_id}/welcome-audio-url'
+
+        async with httpx.AsyncClient(timeout=self.timeout) as client:
+            try:
+                response = await client.get(url, headers=self._get_headers())
+                response.raise_for_status()
+
+                # Extract URL from response
+                data = response.json()
+                if 'data' in data:
+                    # Handle response_formatter wrapped response
+                    if isinstance(data['data'], dict):
+                        return data['data'].get('url', '')
+                    return data['data'] if isinstance(data['data'], str) else ''
+                return data.get('url', '') if isinstance(data, dict) else ''
+
+            except httpx.HTTPStatusError as e:
+                if e.response.status_code == 404:
+                    logger.info(f'Welcome message URL not found for agent: {agent_id}')
+                    return ''
+                logger.error(
+                    f'HTTP error fetching welcome message URL for agent {agent_id}: '
+                    f'status={e.response.status_code}'
+                )
+                raise
+            except httpx.RequestError as e:
+                logger.error(
+                    f'Request error fetching welcome message URL for agent {agent_id}: {e}'
+                )
+                raise
diff --git a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
index 1eaabea1..0f3f1bd0 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
@@ -4,7 +4,8 @@
 Creates and runs the voice conversation pipeline using configured STT/LLM/TTS services
 """
 
-from typing import Dict, Any
+from typing import Dict, Any, List
+from copy import deepcopy
 from call_processing.log.logger import logger
 
 # Pipecat core imports
@@ -12,7 +13,12 @@
 from pipecat.audio.interruptions.min_words_interruption_strategy import (
     MinWordsInterruptionStrategy,
 )
-from pipecat.frames.frames import TTSSpeakFrame, EndTaskFrame
+from pipecat.frames.frames import (
+    TTSSpeakFrame,
+    EndTaskFrame,
+    ManuallySwitchServiceFrame,
+    LLMMessagesUpdateFrame,
+)
 from pipecat.pipeline.pipeline import Pipeline
 from pipecat.pipeline.runner import PipelineRunner
 from pipecat.pipeline.task import PipelineParams, PipelineTask
@@ -22,11 +28,23 @@
 )
 from pipecat.processors.frame_processor import FrameProcessor, FrameDirection
 from pipecat.processors.user_idle_processor import UserIdleProcessor
+from pipecat.processors.transcript_processor import (
+    TranscriptProcessor,
+    TranscriptionMessage,
+)
+from pipecat.pipeline.service_switcher import (
+    ServiceSwitcher,
+    ServiceSwitcherStrategyManual,
+)
 from pipecat.transports.base_transport import BaseTransport
 from pipecat.services.llm_service import FunctionCallParams
 from call_processing.services.stt_service import STTServiceFactory
 from call_processing.services.tts_service import TTSServiceFactory
 from call_processing.services.llm_service import LLMServiceFactory
+from call_processing.constants.language_config import (
+    LANGUAGE_KEYWORDS,
+    LANGUAGE_INSTRUCTIONS,
+)
 
 
 # Advanced handler with retry logic
@@ -50,12 +68,6 @@ async def handle_user_idle(processor: FrameProcessor, retry_count):
         return False  # Stop monitoring
 
 
-user_idle = UserIdleProcessor(
-    callback=handle_user_idle,  # Your callback function
-    timeout=4.0,  # Seconds of inactivity before triggering
-)
-
-
 async def evaluate_completion_criteria(params: FunctionCallParams):
     """
     Check if the last user message contains goodbye-related phrases.
@@ -136,17 +148,90 @@ async def run_conversation(
 
         Args:
             transport: Pipecat transport (e.g., WebSocket transport from Twilio)
-            agent_config: Voice agent configuration including system_prompt
+            agent_config: Voice agent configuration including system_prompt,
+                          supported_languages, and default_language
             llm_config: LLM provider configuration
             tts_config: TTS provider configuration
             stt_config: STT provider configuration
         """
+        # Extract language configuration from agent_config
+        supported_languages = agent_config.get('supported_languages', ['en'])
+        default_language = agent_config.get('default_language', 'en')
+        is_multi_language = len(supported_languages) > 1
+
         logger.info(f"Starting conversation for agent: {agent_config['name']}")
+        logger.info(
+            f'Language config - supported: {supported_languages}, '
+            f'default: {default_language}, multi-language: {is_multi_language}'
+        )
 
-        # Create services using factories
-        stt = STTServiceFactory.create_stt_service(stt_config)
+        # Create LLM service (language-agnostic)
         llm = LLMServiceFactory.create_llm_service(llm_config)
-        tts = TTSServiceFactory.create_tts_service(tts_config)
+
+        # Create STT/TTS services with multi-language support if needed
+        stt_services = {}
+        tts_services = {}
+
+        if is_multi_language:
+            logger.info(
+                f'Multi-language mode enabled for languages: {supported_languages}'
+            )
+
+            # Create STT/TTS services for each supported language
+            for lang_code in supported_languages:
+                # Deep clone configs to avoid mutating original configs
+                stt_config_lang = deepcopy(stt_config)
+                tts_config_lang = deepcopy(tts_config)
+
+                # Update language in parameters
+                if 'parameters' not in stt_config_lang:
+                    stt_config_lang['parameters'] = {}
+                stt_config_lang['parameters']['language'] = lang_code
+
+                if 'parameters' not in tts_config_lang:
+                    tts_config_lang['parameters'] = {}
+                tts_config_lang['parameters']['language'] = lang_code
+
+                # Create services
+                stt_services[lang_code] = STTServiceFactory.create_stt_service(
+                    stt_config_lang
+                )
+                tts_services[lang_code] = TTSServiceFactory.create_tts_service(
+                    tts_config_lang
+                )
+
+                logger.info(f'Created STT/TTS services for language: {lang_code}')
+
+            # Create service switchers with manual strategy
+            # Order services list with default language first (ServiceSwitcher uses first as initial)
+            stt_services_list = []
+            tts_services_list = []
+
+            # Add default language service first
+            if default_language in stt_services:
+                stt_services_list.append(stt_services[default_language])
+                tts_services_list.append(tts_services[default_language])
+
+            # Add remaining services
+            for lang_code in supported_languages:
+                if lang_code != default_language:
+                    stt_services_list.append(stt_services[lang_code])
+                    tts_services_list.append(tts_services[lang_code])
+
+            stt = ServiceSwitcher(
+                services=stt_services_list, strategy_type=ServiceSwitcherStrategyManual
+            )
+            tts = ServiceSwitcher(
+                services=tts_services_list, strategy_type=ServiceSwitcherStrategyManual
+            )
+
+            logger.info(f'Initialized with default language: {default_language}')
+        else:
+            logger.info('Single language mode - no language detection needed')
+
+            # Create single STT/TTS services
+            stt = STTServiceFactory.create_stt_service(stt_config)
+            tts = TTSServiceFactory.create_tts_service(tts_config)
 
         # Create initial messages with system prompt
         messages = [
@@ -166,20 +251,35 @@ async def run_conversation(
         context = LLMContext(messages, tools=tools)
         context_aggregator = LLMContextAggregatorPair(context)
 
-        # Create pipeline
-        pipeline = Pipeline(
-            [
-                transport.input(),  # Audio input from Twilio
-                stt,  # Speech-to-Text
-                user_idle,
-                context_aggregator.user(),  # Add user message to context
-                llm,  # LLM processing
-                tts,  # Text-to-Speech
-                transport.output(),  # Audio output to Twilio
-                context_aggregator.assistant(),  # Add assistant response to context
-            ]
+        # Create transcript processor for language detection
+        transcript = TranscriptProcessor()
+
+        # Track current language detection state (only for multi-language)
+        language_detected = {'detected': False, 'current_language': default_language}
+
+        # Create user idle processor (fresh instance for each conversation)
+        user_idle = UserIdleProcessor(
+            callback=handle_user_idle,
+            timeout=4.0,
         )
 
+        # Build pipeline components list
+        pipeline_components = [
+            transport.input(),  # Audio input from Twilio
+            stt,  # Speech-to-Text (ServiceSwitcher for multi-lang, direct for single)
+            transcript.user(),  # Transcript processor for user messages
+            user_idle,  # User idle detection
+            context_aggregator.user(),  # Add user message to context
+            llm,  # LLM processing
+            tts,  # Text-to-Speech (ServiceSwitcher for multi-lang, direct for single)
+            transport.output(),  # Audio output to Twilio
+            transcript.assistant(),  # Transcript processor for assistant messages
+            context_aggregator.assistant(),  # Add assistant response to context
+        ]
+
+        # Create pipeline
+        pipeline = Pipeline(pipeline_components)
+
         # Create pipeline task with Twilio-specific parameters
         task = PipelineTask(
             pipeline,
@@ -195,6 +295,130 @@ async def run_conversation(
             idle_timeout_secs=20,  # Safety net - allows UserIdleProcessor to complete 3 retries (4s each = 12s total)
         )
 
+        # Multi-language detection event handler
+        if is_multi_language:
+
+            @transcript.event_handler('on_transcript_update')
+            async def handle_language_detection(processor, frame):
+                """Detect language from first user message and switch services"""
+
+                # Only detect once
+                if language_detected['detected']:
+                    return
+
+                messages: List[TranscriptionMessage] = frame.messages
+
+                # Look for user messages
+                for message in messages:
+                    if message.role == 'user':
+                        message_content = message.content.lower().strip()
+
+                        # Skip empty messages
+                        if not message_content:
+                            continue
+
+                        logger.info(
+                            f"Analyzing message for language detection: '{message_content}'"
+                        )
+
+                        # Check for language keywords
+                        detected_lang = None
+                        for lang_code in supported_languages:
+                            keywords = LANGUAGE_KEYWORDS.get(lang_code, [])
+                            for keyword in keywords:
+                                if keyword.lower() in message_content:
+                                    detected_lang = lang_code
+                                    logger.info(
+                                        f'Language detected: {detected_lang} '
+                                        f"(matched keyword: '{keyword}')"
+                                    )
+                                    break
+                            if detected_lang:
+                                break
+
+                        # Use detected language or fallback to default
+                        target_language = detected_lang or default_language
+
+                        if not detected_lang:
+                            logger.info(
+                                f'No language detected, using default: {default_language}'
+                            )
+
+                        # Mark detection as complete
+                        language_detected['detected'] = True
+                        language_detected['current_language'] = target_language
+
+                        # Only switch services if target language is different from default
+                        if target_language != default_language:
+                            if (
+                                target_language in stt_services
+                                and target_language in tts_services
+                            ):
+                                target_stt = stt_services[target_language]
+                                target_tts = tts_services[target_language]
+
+                                try:
+                                    await task.queue_frames(
+                                        [
+                                            ManuallySwitchServiceFrame(
+                                                service=target_stt
+                                            ),
+                                            ManuallySwitchServiceFrame(
+                                                service=target_tts
+                                            ),
+                                        ]
+                                    )
+                                    logger.info(
+                                        f'Switched STT/TTS services to language: {target_language}'
+                                    )
+                                except Exception as e:
+                                    logger.error(
+                                        f'Error switching services: {e}', exc_info=True
+                                    )
+                        else:
+                            logger.info(
+                                f'Language {target_language} is default, no service switch needed'
+                            )
+
+                        # Update LLM system prompt with language instruction
+                        language_instruction = LANGUAGE_INSTRUCTIONS.get(
+                            target_language,
+                            LANGUAGE_INSTRUCTIONS.get('en', 'Respond in English.'),
+                        )
+
+                        # Get current system prompt and append language instruction
+                        current_messages = context.get_messages()
+                        if current_messages and len(current_messages) > 0:
+                            system_message = current_messages[0]
+                        else:
+                            system_message = {
+                                'role': 'system',
+                                'content': agent_config['system_prompt'],
+                            }
+
+                        updated_content = (
+                            f"{system_message['content']}\n\n{language_instruction}"
+                        )
+                        updated_system_message = {
+                            'role': 'system',
+                            'content': updated_content,
+                        }
+
+                        # Update context with new system message
+                        new_messages = [updated_system_message] + current_messages[1:]
+                        await task.queue_frame(
+                            LLMMessagesUpdateFrame(new_messages, run_llm=False)
+                        )
+
+                        logger.info(
+                            f'Updated LLM context with language instruction for {target_language}'
+                        )
+
+                        # Exit after first detection
+                        break
+
+            logger.info('Language detection event handler registered')
+
         # Register event handlers
         @transport.event_handler('on_client_connected')
         async def on_client_connected(transport, client):
diff --git a/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py b/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
index c3c84890..8d928b07 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
@@ -262,3 +262,137 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
             'stt_config': stt_config,
             'telephony_config': telephony_config,
         }
+
+    async def get_agent_by_inbound_number(
+        self, phone_number: str
+    ) -> Optional[Dict[str, Any]]:
+        """
+        Get voice agent by inbound phone number (with caching).
+
+        Strategy:
+        1. Try cache first using inbound_number:{phone_number} key
+        2. If cache miss, fetch from floware API
+        3. Cache the agent ID mapping with 24-hour TTL
+        4. Return full agent dict
+
+        Args:
+            phone_number: E.164 formatted phone number
+
+        Returns:
+            Voice agent dict or None if not found
+        """
+        cache_key = f'inbound_number:{phone_number}'
+
+        # Try cache first
+        cached_agent_id = self.cache_manager.get_str(cache_key)
+        if cached_agent_id:
+            logger.info(
+                f'Cache hit for inbound number: {phone_number} -> agent {cached_agent_id}'
+            )
+
+            # Fetch agent from cache or API
+            agent_key = get_voice_agent_cache_key(UUID(cached_agent_id))
+            agent = self.cache_manager.get_json(agent_key)
+
+            if agent:
+                return agent
+            else:
+                # Agent not in cache, fetch from API
+                if self.floware_http_client:
+                    try:
+                        agent = await self.floware_http_client.fetch_voice_agent(
+                            UUID(cached_agent_id)
+                        )
+                        if agent:
+                            # Cache the agent
+                            self.cache_manager.set_json(
+                                agent_key, agent, expiry=self.cache_ttl
+                            )
+                            return agent
+                    except Exception as e:
+                        logger.error(
+                            f'Failed to fetch agent {cached_agent_id} from API: {e}'
+                        )
+
+        # Cache miss - fetch from floware API
+        logger.info(f'Cache miss - fetching agent by inbound number: {phone_number}')
+
+        if not self.floware_http_client:
+            logger.error('No HTTP client configured for inbound number lookup')
+            return None
+
+        try:
+            agent = await self.floware_http_client.get_agent_by_inbound_number(
+                phone_number
+            )
+
+            if agent:
+                agent_id = agent.get('id')
+                # Cache the inbound number -> agent ID mapping
+                self.cache_manager.add(cache_key, str(agent_id), expiry=self.cache_ttl)
+
+                # Cache the agent itself
+                agent_key = get_voice_agent_cache_key(UUID(agent_id))
+                self.cache_manager.set_json(agent_key, agent, expiry=self.cache_ttl)
+
+                logger.info(f'Cached inbound number {phone_number} -> agent {agent_id}')
+                return agent
+            else:
+                logger.warning(f'No agent found for inbound number: {phone_number}')
+                return None
+
+        except Exception as e:
+            logger.error(
+                f'Failed to fetch agent by inbound number {phone_number}: {e}',
+                exc_info=True,
+            )
+            return None
+
+    async def get_welcome_message_audio_url(self, agent_id: str) -> str:
+        """
+        Get welcome message audio URL for an agent (with caching).
+
+        Strategy:
+        1. Try cache first using voice_agent_welcome_url:{agent_id} key
+        2. If cache miss, fetch from floware API
+        3. Cache the URL with ~2 hour TTL (same as floware)
+
+        Args:
+            agent_id: Voice agent UUID (string)
+
+        Returns:
+            Presigned URL for welcome message audio or empty string if not available
+        """
+        cache_key = f'voice_agent_welcome_url:{agent_id}'
+
+        # Try cache first
+        cached_url = self.cache_manager.get_str(cache_key)
+        if cached_url:
+            logger.info(f'Cache hit for welcome message URL: {agent_id}')
+            return cached_url
+
+        # Cache miss - fetch from floware API
+        logger.info(f'Cache miss - fetching welcome message URL for agent: {agent_id}')
+
+        if not self.floware_http_client:
+            logger.error('No HTTP client configured for welcome message URL fetch')
+            return ''
+
+        try:
+            url = await self.floware_http_client.get_welcome_message_audio_url(agent_id)
+
+            if url:
+                # Cache URL with ~2 hour TTL (7100 seconds - matches floware)
+                self.cache_manager.add(cache_key, url, expiry=7100)
+                logger.info(f'Cached welcome message URL for agent {agent_id}')
+                return url
+            else:
+                logger.warning(f'No welcome message URL for agent: {agent_id}')
+                return ''
+
+        except Exception as e:
+            logger.error(
+                f'Failed to fetch welcome message URL for agent {agent_id}: {e}',
+                exc_info=True,
+            )
+            return ''

From 20a79668f18c855253a81a8938fcef2ffd53facf Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Mon, 12 Jan 2026 15:32:50 +0530
Subject: [PATCH 4/8] floware - moved lang, params from stt, tts to voice_agent

---
 ...49da528_add_inbound_voice_agent_support.py | 173 +++++++++++++-----
 .../db_repo_module/models/stt_config.py       |  11 +-
 .../db_repo_module/models/tts_config.py       |  12 +-
 .../db_repo_module/models/voice_agent.py      |   7 +
 .../controllers/stt_config_controller.py      |  32 +---
 .../controllers/tts_config_controller.py      |  35 +---
 .../controllers/voice_agent_controller.py     |   9 +
 .../voice_agents_module/models/stt_schemas.py |  14 +-
 .../voice_agents_module/models/tts_schemas.py |  16 +-
 .../models/voice_agent_schemas.py             |  13 ++
 .../services/stt_config_service.py            |   6 -
 .../services/tts_config_service.py            |  11 +-
 .../services/voice_agent_service.py           | 112 +++++++++++-
 13 files changed, 273 insertions(+), 178 deletions(-)

diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
index 20a189ec..62b3ed1b 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
@@ -1,4 +1,4 @@
-"""add_inbound_voice_agent_support
+"""add_inbound_voice_agent_support_and_refactor_tts_stt
 
 Revision ID: 6010e49da528
 Revises: f7572bcd9510
@@ -6,12 +6,12 @@
 
 """
 
+import json
 from typing import Sequence, Union
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
+from sqlalchemy import text
 
 # revision identifiers, used by Alembic.
 revision: str = '6010e49da528'
@@ -22,57 +22,131 @@
 
 def upgrade() -> None:
     # Add new columns to voice_agents table (initially nullable)
-    op.add_column(
-        'voice_agents',
-        sa.Column(
-            'inbound_numbers', postgresql.JSONB(astext_type=sa.Text()), nullable=True
-        ),
-    )
-    op.add_column(
-        'voice_agents',
-        sa.Column(
-            'outbound_numbers', postgresql.JSONB(astext_type=sa.Text()), nullable=True
-        ),
-    )
-    op.add_column(
-        'voice_agents',
-        sa.Column(
-            'supported_languages',
-            postgresql.JSONB(astext_type=sa.Text()),
-            nullable=True,
-        ),
-    )
-    op.add_column(
-        'voice_agents',
-        sa.Column('default_language', sa.String(length=10), nullable=True),
-    )
+    # Use raw SQL with IF NOT EXISTS for idempotency
+    op.execute("""
+        ALTER TABLE voice_agents
+        ADD COLUMN IF NOT EXISTS inbound_numbers JSONB,
+        ADD COLUMN IF NOT EXISTS outbound_numbers JSONB,
+        ADD COLUMN IF NOT EXISTS supported_languages JSONB,
+        ADD COLUMN IF NOT EXISTS default_language VARCHAR(10),
+        ADD COLUMN IF NOT EXISTS tts_voice_id VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS tts_parameters JSONB,
+        ADD COLUMN IF NOT EXISTS stt_parameters JSONB
+    """)
 
     # Set defaults for existing agents
     op.execute("""
         UPDATE voice_agents
         SET
-            inbound_numbers = '[]'::jsonb,
-            outbound_numbers = '[]'::jsonb,
-            supported_languages = '["en"]'::jsonb,
-            default_language = 'en'
+            inbound_numbers = COALESCE(inbound_numbers, '[]'::jsonb),
+            outbound_numbers = COALESCE(outbound_numbers, '[]'::jsonb),
+            supported_languages = COALESCE(supported_languages, '["en"]'::jsonb),
+            default_language = COALESCE(default_language, 'en')
         WHERE inbound_numbers IS NULL
+           OR outbound_numbers IS NULL
+           OR supported_languages IS NULL
+           OR default_language IS NULL
     """)
 
-    # Make columns non-nullable after setting defaults
-    op.alter_column('voice_agents', 'inbound_numbers', nullable=False)
-    op.alter_column('voice_agents', 'outbound_numbers', nullable=False)
-    op.alter_column('voice_agents', 'supported_languages', nullable=False)
-    op.alter_column('voice_agents', 'default_language', nullable=False)
-
-    # Create GIN index for fast inbound number lookups (JSONB containment queries)
+    # Migrate TTS/STT data from configs to voice_agents
+    connection = op.get_bind()
+
+    # Fetch all non-deleted voice agents with their TTS/STT configs (using LEFT JOINs)
+    agents = connection.execute(
+        text("""
+        SELECT
+            va.id as agent_id,
+            tc.voice_id as tts_voice_id,
+            tc.parameters as tts_params,
+            sc.parameters as stt_params
+        FROM voice_agents va
+        LEFT JOIN tts_configs tc ON va.tts_config_id = tc.id
+        LEFT JOIN stt_configs sc ON va.stt_config_id = sc.id
+        WHERE va.is_deleted = false
+    """)
+    ).fetchall()
+
+    # Migrate data for each agent
+    for agent in agents:
+        # Parse JSON parameters (may be None)
+        tts_params_dict = json.loads(agent.tts_params) if agent.tts_params else {}
+        stt_params_dict = json.loads(agent.stt_params) if agent.stt_params else {}
+
+        # Use default voice_id if not available
+        tts_voice_id = agent.tts_voice_id if agent.tts_voice_id else 'default'
+
+        # Update agent with TTS/STT data
+        connection.execute(
+            text("""
+            UPDATE voice_agents
+            SET
+                tts_voice_id = :voice_id,
+                tts_parameters = :tts_params,
+                stt_parameters = :stt_params
+            WHERE id = :agent_id
+        """),
+            {
+                'voice_id': tts_voice_id,
+                'tts_params': json.dumps(tts_params_dict),
+                'stt_params': json.dumps(stt_params_dict),
+                'agent_id': str(agent.agent_id),
+            },
+        )
+
+    # Safety check: Set default tts_voice_id for any remaining NULL values
+    # This handles cases where agents don't have associated configs or were missed
     op.execute("""
-        CREATE INDEX idx_voice_agents_inbound_numbers_gin
-        ON voice_agents USING gin (inbound_numbers jsonb_path_ops)
+        UPDATE voice_agents
+        SET tts_voice_id = 'default'
+        WHERE tts_voice_id IS NULL
     """)
 
+    # Make columns non-nullable after setting defaults (idempotent)
+    connection = op.get_bind()
+
+    # Only alter if currently nullable
+    for col in [
+        'inbound_numbers',
+        'outbound_numbers',
+        'supported_languages',
+        'default_language',
+        'tts_voice_id',
+    ]:
+        result = connection.execute(
+            text(f"""
+            SELECT is_nullable FROM information_schema.columns
+            WHERE table_name = 'voice_agents' AND column_name = '{col}'
+        """)
+        )
+        row = result.fetchone()
+        if row and row[0] == 'YES':
+            connection.execute(
+                text(f'ALTER TABLE voice_agents ALTER COLUMN {col} SET NOT NULL')
+            )
+
     # Remove phone_numbers column from telephony_configs table
     # Phone numbers are now managed at the voice_agent level
-    op.drop_column('telephony_configs', 'phone_numbers')
+    # Use conditional drop to make it idempotent
+    op.execute("""
+        ALTER TABLE telephony_configs
+        DROP COLUMN IF EXISTS phone_numbers
+    """)
+
+    # Remove provider-specific columns from tts_configs
+    # These are now stored in voice_agents
+    op.execute("""
+        ALTER TABLE tts_configs
+        DROP COLUMN IF EXISTS voice_id,
+        DROP COLUMN IF EXISTS language,
+        DROP COLUMN IF EXISTS parameters
+    """)
+
+    # Remove provider-specific columns from stt_configs
+    op.execute("""
+        ALTER TABLE stt_configs
+        DROP COLUMN IF EXISTS language,
+        DROP COLUMN IF EXISTS parameters
+    """)
 
 
 def downgrade() -> None:
@@ -81,11 +155,24 @@ def downgrade() -> None:
         'telephony_configs', sa.Column('phone_numbers', sa.Text(), nullable=True)
     )
 
-    # Drop GIN index
-    op.drop_index('idx_voice_agents_inbound_numbers_gin', table_name='voice_agents')
+    # Restore TTS/STT config columns
+    op.add_column(
+        'tts_configs', sa.Column('voice_id', sa.String(length=255), nullable=True)
+    )
+    op.add_column(
+        'tts_configs', sa.Column('language', sa.String(length=64), nullable=True)
+    )
+    op.add_column('tts_configs', sa.Column('parameters', sa.Text(), nullable=True))
+    op.add_column(
+        'stt_configs', sa.Column('language', sa.String(length=64), nullable=True)
+    )
+    op.add_column('stt_configs', sa.Column('parameters', sa.Text(), nullable=True))
 
     # Drop columns from voice_agents
     op.drop_column('voice_agents', 'default_language')
     op.drop_column('voice_agents', 'supported_languages')
     op.drop_column('voice_agents', 'outbound_numbers')
     op.drop_column('voice_agents', 'inbound_numbers')
+    op.drop_column('voice_agents', 'stt_parameters')
+    op.drop_column('voice_agents', 'tts_parameters')
+    op.drop_column('voice_agents', 'tts_voice_id')
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/stt_config.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/stt_config.py
index 96569899..823daf16 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/models/stt_config.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/stt_config.py
@@ -1,9 +1,8 @@
-import json
 import uuid
 from datetime import datetime
 from typing import Optional
 
-from sqlalchemy import String, Text, func
+from sqlalchemy import String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from ..database.base import Base
@@ -21,8 +20,6 @@ class SttConfig(Base):
     )
     provider: Mapped[str] = mapped_column(String(length=64), nullable=False)
     api_key: Mapped[str] = mapped_column(String(length=512), nullable=False)
-    language: Mapped[Optional[str]] = mapped_column(String(length=64), nullable=True)
-    parameters: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     is_deleted: Mapped[bool] = mapped_column(default=False, nullable=False)
     created_at: Mapped[datetime] = mapped_column(default=func.now())
     updated_at: Mapped[datetime] = mapped_column(
@@ -45,12 +42,6 @@ def to_dict(self, exclude_api_key: bool = True):
                 result[column.name] = str(value)
             elif isinstance(value, datetime):
                 result[column.name] = value.isoformat()
-            elif column.name == 'parameters' and value:
-                # Parse JSON field
-                try:
-                    result[column.name] = json.loads(value)
-                except (json.JSONDecodeError, TypeError):
-                    result[column.name] = value
             else:
                 result[column.name] = value
         return result
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/tts_config.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/tts_config.py
index ff5f4f88..0c855d2c 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/models/tts_config.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/tts_config.py
@@ -1,9 +1,8 @@
-import json
 import uuid
 from datetime import datetime
 from typing import Optional
 
-from sqlalchemy import String, Text, func
+from sqlalchemy import String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from ..database.base import Base
@@ -20,10 +19,7 @@ class TtsConfig(Base):
         String(length=500), nullable=True
     )
     provider: Mapped[str] = mapped_column(String(length=64), nullable=False)
-    voice_id: Mapped[str] = mapped_column(String(length=255), nullable=False)
     api_key: Mapped[str] = mapped_column(String(length=512), nullable=False)
-    language: Mapped[Optional[str]] = mapped_column(String(length=64), nullable=True)
-    parameters: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     is_deleted: Mapped[bool] = mapped_column(default=False, nullable=False)
     created_at: Mapped[datetime] = mapped_column(default=func.now())
     updated_at: Mapped[datetime] = mapped_column(
@@ -46,12 +42,6 @@ def to_dict(self, exclude_api_key: bool = True):
                 result[column.name] = str(value)
             elif isinstance(value, datetime):
                 result[column.name] = value.isoformat()
-            elif column.name == 'parameters' and value:
-                # Parse JSON field
-                try:
-                    result[column.name] = json.loads(value)
-                except (json.JSONDecodeError, TypeError):
-                    result[column.name] = value
             else:
                 result[column.name] = value
         return result
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
index 495acaef..c4774616 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent.py
@@ -35,6 +35,11 @@ class VoiceAgent(Base):
     welcome_message: Mapped[str] = mapped_column(Text, nullable=False)
     status: Mapped[str] = mapped_column(String(length=64), nullable=False)
 
+    # TTS/STT configuration
+    tts_voice_id: Mapped[str] = mapped_column(String(length=255), nullable=False)
+    tts_parameters: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    stt_parameters: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+
     # Multi-language and phone number support
     inbound_numbers: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
     outbound_numbers: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
@@ -68,6 +73,8 @@ def to_dict(self):
                 'inbound_numbers',
                 'outbound_numbers',
                 'supported_languages',
+                'tts_parameters',
+                'stt_parameters',
             ]:
                 # Parse JSON/JSONB fields
                 if value:
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/stt_config_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/stt_config_controller.py
index 484f32f8..d0c94078 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/stt_config_controller.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/stt_config_controller.py
@@ -1,4 +1,3 @@
-import json
 from uuid import UUID
 
 from dependency_injector.wiring import Provide, inject
@@ -10,7 +9,6 @@
 from voice_agents_module.models.stt_schemas import (
     CreateSttConfigPayload,
     UpdateSttConfigPayload,
-    SttProvider,
     UNSET,
 )
 from voice_agents_module.services.stt_config_service import SttConfigService
@@ -34,10 +32,10 @@ async def create_stt_config(
     """
     Create a new STT configuration
 
-    Creates a Speech-to-Text provider configuration.
+    Creates a Speech-to-Text provider configuration with credentials only.
 
     Args:
-        payload: Configuration details including provider, api_key, etc.
+        payload: Configuration details including provider and api_key
 
     Returns:
         JSONResponse: Created configuration (api_key excluded)
@@ -47,8 +45,6 @@ async def create_stt_config(
         description=payload.description,
         provider=payload.provider.value,
         api_key=payload.api_key,
-        language=payload.language,
-        parameters=payload.parameters,
     )
 
     return JSONResponse(
@@ -153,32 +149,8 @@ async def update_stt_config(
         update_data['display_name'] = payload.display_name
     if payload.description is not UNSET:
         update_data['description'] = payload.description
-    if payload.provider is not UNSET:
-        if hasattr(payload.provider, 'value'):
-            # It's an enum object
-            update_data['provider'] = payload.provider.value
-        elif isinstance(payload.provider, str) and payload.provider in [
-            e.value for e in SttProvider
-        ]:
-            # It's a valid enum value string
-            update_data['provider'] = payload.provider
-        else:
-            # Invalid value
-            valid_values = [e.value for e in SttProvider]
-            return JSONResponse(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                content=response_formatter.buildErrorResponse(
-                    f'Invalid provider value. Must be one of: {valid_values}'
-                ),
-            )
     if payload.api_key is not UNSET:
         update_data['api_key'] = payload.api_key
-    if payload.language is not UNSET:
-        update_data['language'] = payload.language
-    if payload.parameters is not UNSET:
-        update_data['parameters'] = (
-            json.dumps(payload.parameters) if payload.parameters else None
-        )
 
     if not update_data:
         return JSONResponse(
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tts_config_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tts_config_controller.py
index b4801dfb..63a49266 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tts_config_controller.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tts_config_controller.py
@@ -1,4 +1,3 @@
-import json
 from uuid import UUID
 
 from dependency_injector.wiring import Provide, inject
@@ -10,7 +9,6 @@
 from voice_agents_module.models.tts_schemas import (
     CreateTtsConfigPayload,
     UpdateTtsConfigPayload,
-    TtsProvider,
     UNSET,
 )
 from voice_agents_module.services.tts_config_service import TtsConfigService
@@ -34,10 +32,10 @@ async def create_tts_config(
     """
     Create a new TTS configuration
 
-    Creates a Text-to-Speech provider configuration with voice settings.
+    Creates a Text-to-Speech provider configuration with credentials only.
 
     Args:
-        payload: Configuration details including provider, voice_id, api_key, etc.
+        payload: Configuration details including provider and api_key
 
     Returns:
         JSONResponse: Created configuration (api_key excluded)
@@ -46,10 +44,7 @@ async def create_tts_config(
         display_name=payload.display_name,
         description=payload.description,
         provider=payload.provider.value,
-        voice_id=payload.voice_id,
         api_key=payload.api_key,
-        language=payload.language,
-        parameters=payload.parameters,
     )
 
     return JSONResponse(
@@ -154,34 +149,8 @@ async def update_tts_config(
         update_data['display_name'] = payload.display_name
     if payload.description is not UNSET:
         update_data['description'] = payload.description
-    if payload.provider is not UNSET:
-        if hasattr(payload.provider, 'value'):
-            # It's an enum object
-            update_data['provider'] = payload.provider.value
-        elif isinstance(payload.provider, str) and payload.provider in [
-            e.value for e in TtsProvider
-        ]:
-            # It's a valid enum value string
-            update_data['provider'] = payload.provider
-        else:
-            # Invalid value
-            valid_values = [e.value for e in TtsProvider]
-            return JSONResponse(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                content=response_formatter.buildErrorResponse(
-                    f'Invalid provider value. Must be one of: {valid_values}'
-                ),
-            )
-    if payload.voice_id is not UNSET:
-        update_data['voice_id'] = payload.voice_id
     if payload.api_key is not UNSET:
         update_data['api_key'] = payload.api_key
-    if payload.language is not UNSET:
-        update_data['language'] = payload.language
-    if payload.parameters is not UNSET:
-        update_data['parameters'] = (
-            json.dumps(payload.parameters) if payload.parameters else None
-        )
 
     if not update_data:
         return JSONResponse(
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
index 98305652..7ec584b3 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/voice_agent_controller.py
@@ -55,6 +55,9 @@ async def create_voice_agent(
         telephony_config_id=payload.telephony_config_id,
         system_prompt=payload.system_prompt,
         welcome_message=payload.welcome_message,
+        tts_voice_id=payload.tts_voice_id,
+        tts_parameters=payload.tts_parameters,
+        stt_parameters=payload.stt_parameters,
         conversation_config=payload.conversation_config,
         status=payload.status.value,
         inbound_numbers=payload.inbound_numbers,
@@ -178,6 +181,12 @@ async def update_voice_agent(
         update_data['system_prompt'] = payload.system_prompt
     if payload.welcome_message is not UNSET:
         update_data['welcome_message'] = payload.welcome_message
+    if payload.tts_voice_id is not UNSET:
+        update_data['tts_voice_id'] = payload.tts_voice_id
+    if payload.tts_parameters is not UNSET:
+        update_data['tts_parameters'] = payload.tts_parameters
+    if payload.stt_parameters is not UNSET:
+        update_data['stt_parameters'] = payload.stt_parameters
     if payload.conversation_config is not UNSET:
         update_data['conversation_config'] = (
             json.dumps(payload.conversation_config)
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/stt_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/stt_schemas.py
index c74a3da4..219011e2 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/stt_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/stt_schemas.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Optional, Union, Any, Dict
+from typing import Optional, Union, Any
 from enum import Enum
 from datetime import datetime
 import uuid
@@ -30,22 +30,12 @@ class CreateSttConfigPayload(BaseModel):
     )
     provider: SttProvider = Field(..., description='STT provider')
     api_key: str = Field(..., description='API key for the STT provider')
-    language: Optional[str] = Field(
-        None,
-        description='ISO 639-1 language code (optional, most providers auto-detect)',
-    )
-    parameters: Optional[Dict[str, Any]] = Field(
-        None, description='Provider-specific parameters as JSON object (optional)'
-    )
 
 
 class UpdateSttConfigPayload(BaseModel):
     display_name: Union[str, Any] = Field(default=UNSET)
     description: Union[str, None, Any] = Field(default=UNSET)
-    provider: Union[SttProvider, Any] = Field(default=UNSET)
     api_key: Union[str, Any] = Field(default=UNSET)
-    language: Union[str, None, Any] = Field(default=UNSET)
-    parameters: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
 
 
 class SttConfigResponse(BaseModel):
@@ -53,8 +43,6 @@ class SttConfigResponse(BaseModel):
     display_name: str
     description: Optional[str]
     provider: str
-    language: Optional[str]
-    parameters: Optional[Dict[str, Any]]
     is_deleted: bool
     created_at: datetime
     updated_at: datetime
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tts_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tts_schemas.py
index 090c2ccf..f0e702da 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tts_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tts_schemas.py
@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Optional, Union, Any, Dict
+from typing import Optional, Union, Any
 from enum import Enum
 from datetime import datetime
 import uuid
@@ -30,24 +30,13 @@ class CreateTtsConfigPayload(BaseModel):
         description='Optional description of the TTS configuration',
     )
     provider: TtsProvider = Field(..., description='TTS provider')
-    voice_id: str = Field(..., description='Provider-specific voice identifier')
     api_key: str = Field(..., description='API key for the TTS provider')
-    language: Optional[str] = Field(
-        None, description='ISO 639-1 language code (optional, for multi-lingual voices)'
-    )
-    parameters: Optional[Dict[str, Any]] = Field(
-        None, description='Provider-specific parameters as JSON object (optional)'
-    )
 
 
 class UpdateTtsConfigPayload(BaseModel):
     display_name: Union[str, Any] = Field(default=UNSET)
     description: Union[str, None, Any] = Field(default=UNSET)
-    provider: Union[TtsProvider, Any] = Field(default=UNSET)
-    voice_id: Union[str, Any] = Field(default=UNSET)
     api_key: Union[str, Any] = Field(default=UNSET)
-    language: Union[str, None, Any] = Field(default=UNSET)
-    parameters: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
 
 
 class TtsConfigResponse(BaseModel):
@@ -55,9 +44,6 @@ class TtsConfigResponse(BaseModel):
     display_name: str
     description: Optional[str]
     provider: str
-    voice_id: str
-    language: Optional[str]
-    parameters: Optional[Dict[str, Any]]
     is_deleted: bool
     created_at: datetime
     updated_at: datetime
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
index 27ae09d6..000bc720 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/voice_agent_schemas.py
@@ -30,6 +30,13 @@ class CreateVoiceAgentPayload(BaseModel):
         ...,
         description='Welcome message to play at call start (will be converted to audio)',
     )
+    tts_voice_id: str = Field(..., description='TTS voice identifier')
+    tts_parameters: Optional[Dict[str, Any]] = Field(
+        None, description='Provider-specific TTS parameters (model, stability, etc.)'
+    )
+    stt_parameters: Optional[Dict[str, Any]] = Field(
+        None, description='Provider-specific STT parameters (model, endpointing, etc.)'
+    )
     status: VoiceAgentStatus = Field(
         default=VoiceAgentStatus.INACTIVE,
         description='Agent status (active or inactive)',
@@ -62,6 +69,9 @@ class UpdateVoiceAgentPayload(BaseModel):
     system_prompt: Union[str, Any] = Field(default=UNSET)
     conversation_config: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
     welcome_message: Union[str, Any] = Field(default=UNSET)
+    tts_voice_id: Union[str, Any] = Field(default=UNSET)
+    tts_parameters: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
+    stt_parameters: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
     status: Union[VoiceAgentStatus, Any] = Field(default=UNSET)
     inbound_numbers: Union[List[str], Any] = Field(default=UNSET)
     outbound_numbers: Union[List[str], Any] = Field(default=UNSET)
@@ -80,6 +90,9 @@ class VoiceAgentResponse(BaseModel):
     system_prompt: str
     conversation_config: Optional[Dict[str, Any]]
     welcome_message: str
+    tts_voice_id: str
+    tts_parameters: Optional[Dict[str, Any]]
+    stt_parameters: Optional[Dict[str, Any]]
     status: str
     inbound_numbers: List[str]
     outbound_numbers: List[str]
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/stt_config_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/stt_config_service.py
index c9c452b0..b55c441a 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/stt_config_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/stt_config_service.py
@@ -40,8 +40,6 @@ async def create_config(
         description: Optional[str] = None,
         provider: str = None,
         api_key: str = None,
-        language: Optional[str] = None,
-        parameters: Optional[dict] = None,
     ) -> dict:
         """
         Create a new STT configuration
@@ -51,8 +49,6 @@ async def create_config(
             description: Optional description
             provider: STT provider
             api_key: API key for the STT provider
-            language: ISO 639-1 language code (optional)
-            parameters: Provider-specific parameters (optional)
 
         Returns:
             Created STT config as dict
@@ -66,8 +62,6 @@ async def create_config(
             description=description,
             provider=provider,
             api_key=api_key,
-            language=language,
-            parameters=json.dumps(parameters) if parameters else None,
         )
 
         # Convert to dict
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tts_config_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tts_config_service.py
index 2678bf82..fa655cdb 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tts_config_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tts_config_service.py
@@ -39,10 +39,7 @@ async def create_config(
         display_name: str,
         description: Optional[str] = None,
         provider: str = None,
-        voice_id: str = None,
         api_key: str = None,
-        language: Optional[str] = None,
-        parameters: Optional[dict] = None,
     ) -> dict:
         """
         Create a new TTS configuration
@@ -51,26 +48,20 @@ async def create_config(
             display_name: Display name for the configuration
             description: Optional description
             provider: TTS provider
-            voice_id: Provider-specific voice identifier
             api_key: API key for the TTS provider
-            language: ISO 639-1 language code (optional)
-            parameters: Provider-specific parameters (optional)
 
         Returns:
             Created TTS config as dict
         """
         logger.info(
-            f'Creating TTS config - display_name: {display_name}, provider: {provider}, voice_id: {voice_id}'
+            f'Creating TTS config - display_name: {display_name}, provider: {provider}'
         )
 
         config = await self.tts_config_repository.create(
             display_name=display_name,
             description=description,
             provider=provider,
-            voice_id=voice_id,
             api_key=api_key,
-            language=language,
-            parameters=json.dumps(parameters) if parameters else None,
         )
 
         # Convert to dict
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
index 26ab4a80..79c826a3 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/voice_agent_service.py
@@ -120,6 +120,37 @@ async def _validate_foreign_keys(
 
         return True, None
 
+    def _validate_tts_stt_parameters(
+        self,
+        tts_voice_id: str,
+        tts_parameters: Optional[dict] = None,
+        stt_parameters: Optional[dict] = None,
+    ) -> Tuple[bool, Optional[str]]:
+        """
+        Validate TTS/STT parameters.
+
+        Args:
+            tts_voice_id: TTS voice identifier
+            tts_parameters: Provider-specific TTS parameters
+            stt_parameters: Provider-specific STT parameters
+
+        Returns:
+            Tuple of (is_valid, error_message). error_message is None if valid.
+        """
+        # Validate TTS voice_id is not empty
+        if not tts_voice_id or not tts_voice_id.strip():
+            return False, 'TTS voice_id is required and cannot be empty'
+
+        # Validate TTS parameters is a dict if provided
+        if tts_parameters is not None and not isinstance(tts_parameters, dict):
+            return False, 'TTS parameters must be a dictionary'
+
+        # Validate STT parameters is a dict if provided
+        if stt_parameters is not None and not isinstance(stt_parameters, dict):
+            return False, 'STT parameters must be a dictionary'
+
+        return True, None
+
     async def _validate_language_and_phone_config(
         self,
         inbound_numbers: List[str],
@@ -197,6 +228,8 @@ async def _generate_and_upload_welcome_audio(
         self,
         welcome_message: str,
         tts_config_id: UUID,
+        tts_voice_id: str,
+        tts_parameters: Optional[dict],
         agent_id: UUID,
         supported_languages: List[str],
         default_language: str,
@@ -208,6 +241,8 @@ async def _generate_and_upload_welcome_audio(
         Args:
             welcome_message: Text of the welcome message
             tts_config_id: TTS config ID to use for generation
+            tts_voice_id: Voice ID for TTS
+            tts_parameters: Provider-specific TTS parameters
             agent_id: Voice agent ID (used for generating storage key)
             supported_languages: List of supported language codes
             default_language: Default language code for audio generation
@@ -217,7 +252,7 @@ async def _generate_and_upload_welcome_audio(
         """
         logger.info(f'Generating welcome message audio for agent {agent_id}')
 
-        # Fetch TTS config
+        # Fetch TTS config (credentials only)
         tts_config = await self.tts_config_service.get_config(tts_config_id)
         if not tts_config:
             raise ValueError(f'TTS config {tts_config_id} not found')
@@ -235,16 +270,21 @@ async def _generate_and_upload_welcome_audio(
 
         logger.info(f'Welcome audio text: {audio_text}')
 
-        # Update TTS config to use default language
-        tts_config_with_lang = {**tts_config}
-        if 'parameters' not in tts_config_with_lang:
-            tts_config_with_lang['parameters'] = {}
-        tts_config_with_lang['parameters']['language'] = default_language
+        # Merge config credentials with agent's voice and parameters
+        tts_config_with_params = {
+            'provider': tts_config['provider'],
+            'api_key': tts_config['api_key'],
+            'voice_id': tts_voice_id,
+            'parameters': tts_parameters or {},
+        }
+
+        # Add language to parameters for TTS generation
+        tts_config_with_params['parameters']['language'] = default_language
 
         # Generate audio using TTS service
         try:
             audio_bytes = await self.tts_generator_service.generate_audio(
-                audio_text, tts_config_with_lang
+                audio_text, tts_config_with_params
             )
             logger.info(f'Generated audio: {len(audio_bytes)} bytes')
         except Exception as e:
@@ -278,6 +318,7 @@ async def create_agent(
         telephony_config_id: UUID,
         system_prompt: str,
         welcome_message: str,
+        tts_voice_id: str,
         description: Optional[str] = None,
         conversation_config: Optional[dict] = None,
         status: str = 'inactive',
@@ -285,6 +326,8 @@ async def create_agent(
         outbound_numbers: Optional[List[str]] = None,
         supported_languages: Optional[List[str]] = None,
         default_language: str = 'en',
+        tts_parameters: Optional[dict] = None,
+        stt_parameters: Optional[dict] = None,
     ) -> dict:
         """
         Create a new voice agent with inbound/outbound numbers and language support
@@ -297,6 +340,7 @@ async def create_agent(
             telephony_config_id: Telephony config ID
             system_prompt: System prompt for the agent
             welcome_message: Welcome message text (will be converted to audio)
+            tts_voice_id: TTS voice identifier
             description: Description of the agent (optional)
             conversation_config: Conversation configuration (optional)
             status: Agent status (default: inactive)
@@ -304,6 +348,8 @@ async def create_agent(
             outbound_numbers: Phone numbers for making outbound calls (E.164 format)
             supported_languages: List of supported language codes (e.g., ["en", "es", "hi"])
             default_language: Default language code (must be in supported_languages)
+            tts_parameters: Provider-specific TTS parameters (optional)
+            stt_parameters: Provider-specific STT parameters (optional)
 
         Returns:
             Created voice agent as dict
@@ -327,6 +373,14 @@ async def create_agent(
             logger.error(f'FK validation failed: {error_message}')
             raise ValueError(error_message)
 
+        # Validate TTS/STT parameters
+        is_valid, error_message = self._validate_tts_stt_parameters(
+            tts_voice_id, tts_parameters, stt_parameters
+        )
+        if not is_valid:
+            logger.error(f'TTS/STT validation failed: {error_message}')
+            raise ValueError(error_message)
+
         # Validate language and phone configuration
         is_valid, error_message = await self._validate_language_and_phone_config(
             inbound_numbers,
@@ -348,6 +402,8 @@ async def create_agent(
         await self._generate_and_upload_welcome_audio(
             welcome_message,
             tts_config_id,
+            tts_voice_id,
+            tts_parameters,
             agent_id,
             supported_languages,
             default_language,
@@ -368,6 +424,9 @@ async def create_agent(
             else None,
             welcome_message=welcome_message,
             status=status,
+            tts_voice_id=tts_voice_id,
+            tts_parameters=tts_parameters,
+            stt_parameters=stt_parameters,
             inbound_numbers=inbound_numbers,
             outbound_numbers=outbound_numbers,
             supported_languages=supported_languages,
@@ -527,6 +586,24 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
                 logger.error(f'Language/phone validation failed: {error_message}')
                 raise ValueError(error_message)
 
+        # Validate TTS/STT parameters if being updated
+        tts_stt_fields = ['tts_voice_id', 'tts_parameters', 'stt_parameters']
+        if any(key in update_data for key in tts_stt_fields):
+            tts_voice_id = update_data.get('tts_voice_id', existing_agent.tts_voice_id)
+            tts_parameters = update_data.get(
+                'tts_parameters', existing_dict.get('tts_parameters')
+            )
+            stt_parameters = update_data.get(
+                'stt_parameters', existing_dict.get('stt_parameters')
+            )
+
+            is_valid, error_message = self._validate_tts_stt_parameters(
+                tts_voice_id, tts_parameters, stt_parameters
+            )
+            if not is_valid:
+                logger.error(f'TTS/STT validation failed: {error_message}')
+                raise ValueError(error_message)
+
         # Check if welcome_message or language config changed (requires audio regeneration)
         audio_regeneration_needed = False
         if (
@@ -542,6 +619,19 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
             'default_language'
         ] != existing_dict.get('default_language'):
             audio_regeneration_needed = True
+        if (
+            'tts_voice_id' in update_data
+            and update_data['tts_voice_id'] != existing_agent.tts_voice_id
+        ):
+            audio_regeneration_needed = True
+        if 'tts_parameters' in update_data and update_data[
+            'tts_parameters'
+        ] != existing_dict.get('tts_parameters'):
+            audio_regeneration_needed = True
+        if 'tts_config_id' in update_data and update_data[
+            'tts_config_id'
+        ] != existing_dict.get('tts_config_id'):
+            audio_regeneration_needed = True
 
         # If any FK fields are being updated, validate them
         if any(
@@ -587,6 +677,12 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
                 tts_config_id = update_data.get(
                     'tts_config_id', existing_agent.tts_config_id
                 )
+                tts_voice_id = update_data.get(
+                    'tts_voice_id', existing_agent.tts_voice_id
+                )
+                tts_parameters = update_data.get(
+                    'tts_parameters', existing_dict.get('tts_parameters')
+                )
                 supported_languages = update_data.get(
                     'supported_languages',
                     existing_dict.get('supported_languages', ['en']),
@@ -598,6 +694,8 @@ async def update_agent(self, agent_id: UUID, **update_data) -> Optional[dict]:
                 await self._generate_and_upload_welcome_audio(
                     welcome_message,
                     tts_config_id,
+                    tts_voice_id,
+                    tts_parameters,
                     agent_id,
                     supported_languages,
                     default_language,

From a815b5ea619b207d6c094b00485cad435e31b42c Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Mon, 12 Jan 2026 18:11:13 +0530
Subject: [PATCH 5/8] call_processing changes for tts, stt schema change

---
 .../services/pipecat_service.py               | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
index 0f3f1bd0..ad97e0af 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
@@ -149,16 +149,21 @@ async def run_conversation(
         Args:
             transport: Pipecat transport (e.g., WebSocket transport from Twilio)
             agent_config: Voice agent configuration including system_prompt,
-                          supported_languages, and default_language
+                          supported_languages, default_language, tts_voice_id, tts_parameters, stt_parameters
             llm_config: LLM provider configuration
-            tts_config: TTS provider configuration
-            stt_config: STT provider configuration
+            tts_config: TTS provider configuration (credentials only)
+            stt_config: STT provider configuration (credentials only)
         """
         # Extract language configuration from agent_config
         supported_languages = agent_config.get('supported_languages', ['en'])
         default_language = agent_config.get('default_language', 'en')
         is_multi_language = len(supported_languages) > 1
 
+        # Extract TTS/STT parameters from agent
+        tts_voice_id = agent_config.get('tts_voice_id')
+        tts_parameters = agent_config.get('tts_parameters', {})
+        stt_parameters = agent_config.get('stt_parameters', {})
+
         logger.info(f"Starting conversation for agent: {agent_config['name']}")
         logger.info(
             f'Language config - supported: {supported_languages}, '
@@ -168,6 +173,21 @@ async def run_conversation(
         # Create LLM service (language-agnostic)
         llm = LLMServiceFactory.create_llm_service(llm_config)
 
+        # Merge TTS config credentials with agent's voice and parameters
+        tts_config_with_params = {
+            'provider': tts_config['provider'],
+            'api_key': tts_config['api_key'],
+            'voice_id': tts_voice_id,
+            'parameters': tts_parameters or {},
+        }
+
+        # Merge STT config credentials with agent's parameters
+        stt_config_with_params = {
+            'provider': stt_config['provider'],
+            'api_key': stt_config['api_key'],
+            'parameters': stt_parameters or {},
+        }
+
         # Create STT/TTS services with multi-language support if needed
         stt_services = {}
         tts_services = {}
@@ -180,8 +200,8 @@ async def run_conversation(
             # Create STT/TTS services for each supported language
             for lang_code in supported_languages:
                 # Deep clone configs to avoid mutating original configs
-                stt_config_lang = deepcopy(stt_config)
-                tts_config_lang = deepcopy(tts_config)
+                stt_config_lang = deepcopy(stt_config_with_params)
+                tts_config_lang = deepcopy(tts_config_with_params)
 
                 # Update language in parameters
                 if 'parameters' not in stt_config_lang:
@@ -229,9 +249,9 @@ async def run_conversation(
         else:
             logger.info('Single language mode - no language detection needed')
 
-            # Create single STT/TTS services
-            stt = STTServiceFactory.create_stt_service(stt_config)
-            tts = TTSServiceFactory.create_tts_service(tts_config)
+            # Create single STT/TTS services using merged configs
+            stt = STTServiceFactory.create_stt_service(stt_config_with_params)
+            tts = TTSServiceFactory.create_tts_service(tts_config_with_params)
 
         # Create initial messages with system prompt
         messages = [
@@ -289,7 +309,7 @@ async def run_conversation(
                 enable_metrics=True,
                 # enable_usage_metrics=True,
                 allow_interruptions=True,
-                interruption_strategies=[MinWordsInterruptionStrategy(min_words=2)],
+                interruption_strategies=[MinWordsInterruptionStrategy(min_words=3)],
                 # report_only_initial_ttfb=True
             ),
             idle_timeout_secs=20,  # Safety net - allows UserIdleProcessor to complete 3 retries (4s each = 12s total)

From 27e281bfa5a80c72f3b0ec3672a8c2abfc22716b Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Mon, 12 Jan 2026 18:28:47 +0530
Subject: [PATCH 6/8] fe - lang, tts, stt params in voice_agent

---
 .../voice-agents/CreateVoiceAgentDialog.tsx   | 327 ++++++++++++++
 .../voice-agents/EditVoiceAgentDialog.tsx     | 407 +++++++++++++++++-
 .../stt-configs/CreateSttConfigDialog.tsx     | 236 +---------
 .../stt-configs/EditSttConfigDialog.tsx       | 234 +---------
 .../voice-agents/stt-configs/index.tsx        |   5 +-
 .../tts-configs/CreateTtsConfigDialog.tsx     | 314 +-------------
 .../tts-configs/EditTtsConfigDialog.tsx       | 255 +----------
 .../voice-agents/tts-configs/index.tsx        |   8 +-
 wavefront/client/src/types/stt-config.ts      |   7 -
 wavefront/client/src/types/tts-config.ts      |  10 -
 wavefront/client/src/types/voice-agent.ts     |   9 +
 11 files changed, 776 insertions(+), 1036 deletions(-)

diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
index c3d7f7fc..7929eb74 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
@@ -20,6 +20,8 @@ import {
 import { Input } from '@app/components/ui/input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
 import { Checkbox } from '@app/components/ui/checkbox';
+import { Label } from '@app/components/ui/label';
+import { Slider } from '@app/components/ui/slider';
 import {
   useGetLLMConfigs,
   useGetSttConfigs,
@@ -30,6 +32,13 @@ import { extractErrorMessage } from '@app/lib/utils';
 import { useDashboardStore, useNotifyStore } from '@app/store';
 import { CreateVoiceAgentRequest } from '@app/types/voice-agent';
 import { SUPPORTED_LANGUAGES, getLanguageDisplayName } from '@app/constants/languages';
+import { getProviderConfig, initializeParameters } from '@app/config/voice-providers';
+import {
+  getBooleanParameterWithDefault,
+  getNumberOrStringParameter,
+  getNumberParameterWithDefault,
+  getStringParameter,
+} from '@app/utils/parameter-helpers';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { langs } from '@uiw/codemirror-extensions-langs';
 import CodeMirror from '@uiw/react-codemirror';
@@ -47,6 +56,7 @@ const createVoiceAgentSchema = z.object({
   tts_config_id: z.string().min(1, 'TTS configuration is required'),
   stt_config_id: z.string().min(1, 'STT configuration is required'),
   telephony_config_id: z.string().min(1, 'Telephony configuration is required'),
+  tts_voice_id: z.string().min(1, 'TTS Voice ID is required'),
   system_prompt: z.string().min(1, 'System prompt is required'),
   welcome_message: z.string().min(1, 'Welcome message is required'),
   conversation_config: z.string().optional(),
@@ -71,6 +81,8 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
   const { notifySuccess, notifyError } = useNotifyStore();
   const { selectedApp } = useDashboardStore();
   const [creating, setCreating] = useState(false);
+  const [ttsParameters, setTtsParameters] = useState<Record<string, unknown>>({});
+  const [sttParameters, setSttParameters] = useState<Record<string, unknown>>({});
 
   // Fetch configs for dropdowns
   const { data: llmConfigs = [] } = useGetLLMConfigs(appId);
@@ -87,6 +99,7 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
       tts_config_id: '',
       stt_config_id: '',
       telephony_config_id: '',
+      tts_voice_id: '',
       system_prompt: '',
       welcome_message: '',
       conversation_config: '{}',
@@ -98,6 +111,27 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
     },
   });
 
+  // Watch config selections to determine providers
+  const watchedTtsConfigId = form.watch('tts_config_id');
+  const watchedSttConfigId = form.watch('stt_config_id');
+
+  // Get selected providers
+  const selectedTtsProvider = ttsConfigs.find((c) => c.id === watchedTtsConfigId)?.provider;
+  const selectedSttProvider = sttConfigs.find((c) => c.id === watchedSttConfigId)?.provider;
+
+  // Initialize parameters when provider changes
+  useEffect(() => {
+    if (isOpen && selectedTtsProvider) {
+      setTtsParameters(initializeParameters('tts', selectedTtsProvider));
+    }
+  }, [selectedTtsProvider, isOpen]);
+
+  useEffect(() => {
+    if (isOpen && selectedSttProvider) {
+      setSttParameters(initializeParameters('stt', selectedSttProvider));
+    }
+  }, [selectedSttProvider, isOpen]);
+
   // Reset form when dialog closes
   useEffect(() => {
     if (!isOpen) {
@@ -108,6 +142,7 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
         tts_config_id: '',
         stt_config_id: '',
         telephony_config_id: '',
+        tts_voice_id: '',
         system_prompt: '',
         welcome_message: '',
         conversation_config: '{}',
@@ -117,6 +152,8 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
         supported_languages: ['en'],
         default_language: 'en',
       });
+      setTtsParameters({});
+      setSttParameters({});
     }
   }, [isOpen, form]);
 
@@ -132,6 +169,22 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
       }
     }
 
+    // Build TTS parameters (filter out empty values)
+    const builtTtsParameters: Record<string, unknown> = {};
+    Object.entries(ttsParameters).forEach(([key, value]) => {
+      if (value !== '' && value !== undefined && value !== null) {
+        builtTtsParameters[key] = value;
+      }
+    });
+
+    // Build STT parameters (filter out empty values)
+    const builtSttParameters: Record<string, unknown> = {};
+    Object.entries(sttParameters).forEach(([key, value]) => {
+      if (value !== '' && value !== undefined && value !== null) {
+        builtSttParameters[key] = value;
+      }
+    });
+
     // Parse phone numbers (comma-separated)
     const parsePhoneNumbers = (input: string): string[] => {
       if (!input.trim()) return [];
@@ -173,6 +226,9 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
         tts_config_id: data.tts_config_id.trim(),
         stt_config_id: data.stt_config_id.trim(),
         telephony_config_id: data.telephony_config_id.trim(),
+        tts_voice_id: data.tts_voice_id.trim(),
+        tts_parameters: Object.keys(builtTtsParameters).length > 0 ? builtTtsParameters : null,
+        stt_parameters: Object.keys(builtSttParameters).length > 0 ? builtSttParameters : null,
         system_prompt: data.system_prompt.trim(),
         welcome_message: data.welcome_message.trim(),
         conversation_config: conversationConfig,
@@ -208,6 +264,231 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
     }
   };
 
+  // Helper functions for parameter management
+  const setTtsParameter = (key: string, value: unknown) => {
+    setTtsParameters((prev) => ({ ...prev, [key]: value }));
+  };
+
+  const setSttParameter = (key: string, value: unknown) => {
+    setSttParameters((prev) => ({ ...prev, [key]: value }));
+  };
+
+  // Render TTS parameter field
+  const renderTtsParameterField = (key: string) => {
+    if (!selectedTtsProvider) return null;
+    const config = getProviderConfig('tts', selectedTtsProvider);
+    if (!config) return null;
+
+    const paramConfig = config.parameters[key];
+    if (!paramConfig) return null;
+
+    switch (paramConfig.type) {
+      case 'boolean':
+        return (
+          <div key={key} className="col-span-2">
+            <div className="flex items-center space-x-2">
+              <Checkbox
+                id={`tts-${key}`}
+                checked={getBooleanParameterWithDefault(ttsParameters, key, paramConfig.default)}
+                onCheckedChange={(checked) => setTtsParameter(key, checked)}
+              />
+              <Label htmlFor={`tts-${key}`} className="cursor-pointer">
+                {paramConfig.description || key}
+              </Label>
+            </div>
+          </div>
+        );
+
+      case 'number':
+        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
+          const sliderValue = getNumberParameterWithDefault(ttsParameters, key, paramConfig.default, paramConfig.min);
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label>
+                {paramConfig.description || key}: {sliderValue.toFixed(2)}
+              </Label>
+              <Slider
+                min={paramConfig.min}
+                max={paramConfig.max}
+                step={paramConfig.step || 1}
+                value={[sliderValue]}
+                onValueChange={(values: number[]) => setTtsParameter(key, values[0])}
+              />
+              <p className="text-muted-foreground text-[0.8rem]">
+                {paramConfig.min} - {paramConfig.max}
+              </p>
+            </div>
+          );
+        }
+
+        return (
+          <div key={key} className="space-y-2">
+            <Label>{paramConfig.description || key}</Label>
+            <Input
+              type="number"
+              value={getNumberOrStringParameter(ttsParameters, key)}
+              onChange={(e) => setTtsParameter(key, e.target.value ? parseFloat(e.target.value) : undefined)}
+              placeholder={paramConfig.placeholder}
+              step={paramConfig.step}
+            />
+            {paramConfig.placeholder && (
+              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
+            )}
+          </div>
+        );
+
+      case 'string':
+      default:
+        if (key === 'language') return null;
+
+        if (paramConfig.options && paramConfig.options.length > 0) {
+          const selectValue =
+            getStringParameter(ttsParameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
+          return (
+            <div key={key} className="space-y-2">
+              <Label>{paramConfig.description || key}</Label>
+              <Select value={selectValue} onValueChange={(val) => setTtsParameter(key, val)}>
+                <SelectTrigger>
+                  <SelectValue placeholder="Select..." />
+                </SelectTrigger>
+                <SelectContent>
+                  {paramConfig.options.map((option) => (
+                    <SelectItem key={String(option)} value={String(option)}>
+                      {String(option)}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          );
+        }
+
+        return (
+          <div key={key} className="space-y-2">
+            <Label>{paramConfig.description || key}</Label>
+            <Input
+              type="text"
+              value={getStringParameter(ttsParameters, key)}
+              onChange={(e) => setTtsParameter(key, e.target.value)}
+              placeholder={paramConfig.placeholder}
+            />
+            {paramConfig.placeholder && (
+              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
+            )}
+          </div>
+        );
+    }
+  };
+
+  // Render STT parameter field
+  const renderSttParameterField = (key: string) => {
+    if (!selectedSttProvider) return null;
+    const config = getProviderConfig('stt', selectedSttProvider);
+    if (!config) return null;
+
+    const paramConfig = config.parameters[key];
+    if (!paramConfig) return null;
+
+    switch (paramConfig.type) {
+      case 'boolean':
+        return (
+          <div key={key} className="col-span-2">
+            <div className="flex items-center space-x-2">
+              <Checkbox
+                id={`stt-${key}`}
+                checked={getBooleanParameterWithDefault(sttParameters, key, paramConfig.default)}
+                onCheckedChange={(checked) => setSttParameter(key, checked)}
+              />
+              <Label htmlFor={`stt-${key}`} className="cursor-pointer">
+                {paramConfig.description || key}
+              </Label>
+            </div>
+          </div>
+        );
+
+      case 'number':
+        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
+          const sliderValue = getNumberParameterWithDefault(sttParameters, key, paramConfig.default, paramConfig.min);
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label>
+                {paramConfig.description || key}: {sliderValue}
+              </Label>
+              <Slider
+                min={paramConfig.min}
+                max={paramConfig.max}
+                step={paramConfig.step || 1}
+                value={[sliderValue]}
+                onValueChange={(values: number[]) => setSttParameter(key, values[0])}
+              />
+              <p className="text-muted-foreground text-[0.8rem]">
+                {paramConfig.min} - {paramConfig.max}
+              </p>
+            </div>
+          );
+        }
+
+        return (
+          <div key={key} className="space-y-2">
+            <Label>{paramConfig.description || key}</Label>
+            <Input
+              type="number"
+              value={getNumberOrStringParameter(sttParameters, key)}
+              onChange={(e) => setSttParameter(key, e.target.value ? parseInt(e.target.value) : undefined)}
+              placeholder={paramConfig.placeholder}
+            />
+            {paramConfig.placeholder && (
+              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
+            )}
+          </div>
+        );
+
+      case 'string':
+      default:
+        if (key === 'language') return null;
+
+        if (paramConfig.options && paramConfig.options.length > 0) {
+          const selectValue =
+            getStringParameter(sttParameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
+          return (
+            <div key={key} className="space-y-2">
+              <Label>{paramConfig.description || key}</Label>
+              <Select value={selectValue} onValueChange={(val) => setSttParameter(key, val)}>
+                <SelectTrigger>
+                  <SelectValue placeholder="Select..." />
+                </SelectTrigger>
+                <SelectContent>
+                  {paramConfig.options.map((option) => (
+                    <SelectItem key={String(option)} value={String(option)}>
+                      {String(option)}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          );
+        }
+
+        return (
+          <div key={key} className="space-y-2">
+            <Label>{paramConfig.description || key}</Label>
+            <Input
+              type="text"
+              value={getStringParameter(sttParameters, key)}
+              onChange={(e) => setSttParameter(key, e.target.value)}
+              placeholder={paramConfig.placeholder}
+            />
+            {paramConfig.placeholder && (
+              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
+            )}
+          </div>
+        );
+    }
+  };
+
+  const ttsProviderConfig = selectedTtsProvider ? getProviderConfig('tts', selectedTtsProvider) : null;
+  const sttProviderConfig = selectedSttProvider ? getProviderConfig('stt', selectedSttProvider) : null;
+
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] overflow-y-auto lg:max-w-5xl">
@@ -418,6 +699,52 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
                     )}
                   />
                 </div>
+
+                <div className="space-y-4">
+                  <h4 className="text-sm font-medium">TTS Voice Settings</h4>
+                  <FormField
+                    control={form.control}
+                    name="tts_voice_id"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          TTS Voice ID<span className="text-red-500">*</span>
+                        </FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., alloy, echo, fable (OpenAI) or voice ID (ElevenLabs)" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Provider-specific voice identifier (e.g., for Deepgram: aura-2-helena-en)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  {ttsProviderConfig &&
+                    Object.keys(ttsProviderConfig.parameters).filter((key) => key !== 'language').length > 0 && (
+                      <div className="col-span-2 space-y-4">
+                        <h4 className="text-sm font-medium">TTS Parameters</h4>
+                        <div className="grid grid-cols-2 gap-6">
+                          {Object.keys(ttsProviderConfig.parameters)
+                            .filter((key) => key !== 'language')
+                            .map((key) => renderTtsParameterField(key))}
+                        </div>
+                      </div>
+                    )}
+
+                  {sttProviderConfig &&
+                    Object.keys(sttProviderConfig.parameters).filter((key) => key !== 'language').length > 0 && (
+                      <div className="col-span-2 space-y-4">
+                        <h4 className="text-sm font-medium">STT Parameters</h4>
+                        <div className="grid grid-cols-2 gap-6">
+                          {Object.keys(sttProviderConfig.parameters)
+                            .filter((key) => key !== 'language')
+                            .map((key) => renderSttParameterField(key))}
+                        </div>
+                      </div>
+                    )}
+                </div>
               </div>
 
               {/* Phone Numbers */}
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
index 56c1846d..21f358f4 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
@@ -18,6 +18,8 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
+import { Label } from '@app/components/ui/label';
+import { Slider } from '@app/components/ui/slider';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
 import { Checkbox } from '@app/components/ui/checkbox';
 import {
@@ -30,6 +32,8 @@ import { extractErrorMessage } from '@app/lib/utils';
 import { useDashboardStore, useNotifyStore } from '@app/store';
 import { UpdateVoiceAgentRequest, VoiceAgent } from '@app/types/voice-agent';
 import { SUPPORTED_LANGUAGES, getLanguageDisplayName } from '@app/constants/languages';
+import { getProviderConfig } from '@app/config/voice-providers';
+import { getBooleanParameterWithDefault, getNumberParameterWithDefault } from '@app/utils/parameter-helpers';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { langs } from '@uiw/codemirror-extensions-langs';
 import CodeMirror from '@uiw/react-codemirror';
@@ -46,6 +50,7 @@ const updateVoiceAgentSchema = z.object({
   tts_config_id: z.string().min(1, 'TTS configuration is required'),
   stt_config_id: z.string().min(1, 'STT configuration is required'),
   telephony_config_id: z.string().min(1, 'Telephony configuration is required'),
+  tts_voice_id: z.string().min(1, 'TTS Voice ID is required'),
   system_prompt: z.string().min(1, 'System prompt is required'),
   welcome_message: z.string().min(1, 'Welcome message is required'),
   conversation_config: z.string().optional(),
@@ -83,6 +88,10 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
   const { data: sttConfigs = [] } = useGetSttConfigs(appId);
   const { data: telephonyConfigs = [] } = useGetTelephonyConfigs(appId);
 
+  // State for TTS/STT parameters (managed separately from form)
+  const [ttsParameters, setTtsParameters] = useState<Record<string, unknown>>({});
+  const [sttParameters, setSttParameters] = useState<Record<string, unknown>>({});
+
   const form = useForm<UpdateVoiceAgentInput>({
     resolver: zodResolver(updateVoiceAgentSchema),
     defaultValues: {
@@ -92,6 +101,7 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
       tts_config_id: agent.tts_config_id,
       stt_config_id: agent.stt_config_id,
       telephony_config_id: agent.telephony_config_id,
+      tts_voice_id: agent.tts_voice_id,
       system_prompt: agent.system_prompt,
       welcome_message: agent.welcome_message,
       conversation_config: agent.conversation_config ? JSON.stringify(agent.conversation_config, null, 2) : '{}',
@@ -103,6 +113,16 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
     },
   });
 
+  // Watch for config changes to determine providers
+  const watchedTtsConfigId = form.watch('tts_config_id');
+  const watchedSttConfigId = form.watch('stt_config_id');
+
+  const selectedTtsProvider = ttsConfigs.find((c) => c.id === watchedTtsConfigId)?.provider;
+  const selectedSttProvider = sttConfigs.find((c) => c.id === watchedSttConfigId)?.provider;
+
+  const ttsProviderConfig = selectedTtsProvider ? getProviderConfig('tts', selectedTtsProvider) : null;
+  const sttProviderConfig = selectedSttProvider ? getProviderConfig('stt', selectedSttProvider) : null;
+
   // Reset form when dialog opens with agent data
   useEffect(() => {
     if (isOpen && agent) {
@@ -113,6 +133,7 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
         tts_config_id: agent.tts_config_id,
         stt_config_id: agent.stt_config_id,
         telephony_config_id: agent.telephony_config_id,
+        tts_voice_id: agent.tts_voice_id,
         system_prompt: agent.system_prompt,
         welcome_message: agent.welcome_message,
         conversation_config: agent.conversation_config ? JSON.stringify(agent.conversation_config, null, 2) : '{}',
@@ -125,6 +146,29 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
     }
   }, [isOpen, agent, form]);
 
+  // Initialize TTS parameters when dialog opens - use only existing values, not merged with defaults
+  useEffect(() => {
+    if (isOpen) {
+      setTtsParameters(agent.tts_parameters || {});
+    }
+  }, [isOpen, agent.tts_parameters]);
+
+  // Initialize STT parameters when dialog opens - use only existing values, not merged with defaults
+  useEffect(() => {
+    if (isOpen) {
+      setSttParameters(agent.stt_parameters || {});
+    }
+  }, [isOpen, agent.stt_parameters]);
+
+  // Helper functions to update parameters
+  const setTtsParameter = (key: string, value: unknown) => {
+    setTtsParameters((prev) => ({ ...prev, [key]: value }));
+  };
+
+  const setSttParameter = (key: string, value: unknown) => {
+    setSttParameters((prev) => ({ ...prev, [key]: value }));
+  };
+
   const onSubmit = async (data: UpdateVoiceAgentInput) => {
     // Validate JSON if provided
     let conversationConfig = null;
@@ -137,6 +181,22 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
       }
     }
 
+    // Build TTS parameters (filter out empty values)
+    const builtTtsParameters: Record<string, unknown> = {};
+    Object.entries(ttsParameters).forEach(([key, value]) => {
+      if (value !== '' && value !== undefined && value !== null) {
+        builtTtsParameters[key] = value;
+      }
+    });
+
+    // Build STT parameters (filter out empty values)
+    const builtSttParameters: Record<string, unknown> = {};
+    Object.entries(sttParameters).forEach(([key, value]) => {
+      if (value !== '' && value !== undefined && value !== null) {
+        builtSttParameters[key] = value;
+      }
+    });
+
     // Parse phone numbers (comma-separated)
     const parsePhoneNumbers = (input: string): string[] => {
       if (!input.trim()) return [];
@@ -171,22 +231,91 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
 
     setUpdating(true);
     try {
-      const requestData: UpdateVoiceAgentRequest = {
-        name: data.name.trim(),
-        description: data.description?.trim() || null,
-        llm_config_id: data.llm_config_id.trim(),
-        tts_config_id: data.tts_config_id.trim(),
-        stt_config_id: data.stt_config_id.trim(),
-        telephony_config_id: data.telephony_config_id.trim(),
-        system_prompt: data.system_prompt.trim(),
-        welcome_message: data.welcome_message.trim(),
-        conversation_config: conversationConfig,
-        status: data.status,
-        inbound_numbers: inboundNumbers,
-        outbound_numbers: outboundNumbers,
-        supported_languages: data.supported_languages,
-        default_language: data.default_language,
-      };
+      // Build partial update - only include changed fields
+      const requestData: Partial<UpdateVoiceAgentRequest> = {};
+
+      if (data.name.trim() !== agent.name) {
+        requestData.name = data.name.trim();
+      }
+
+      const newDescription = data.description?.trim() || null;
+      if (newDescription !== (agent.description || null)) {
+        requestData.description = newDescription;
+      }
+
+      if (data.llm_config_id !== agent.llm_config_id) {
+        requestData.llm_config_id = data.llm_config_id;
+      }
+
+      if (data.tts_config_id !== agent.tts_config_id) {
+        requestData.tts_config_id = data.tts_config_id;
+      }
+
+      if (data.stt_config_id !== agent.stt_config_id) {
+        requestData.stt_config_id = data.stt_config_id;
+      }
+
+      if (data.telephony_config_id !== agent.telephony_config_id) {
+        requestData.telephony_config_id = data.telephony_config_id;
+      }
+
+      if (data.tts_voice_id.trim() !== agent.tts_voice_id) {
+        requestData.tts_voice_id = data.tts_voice_id.trim();
+      }
+
+      // Check if TTS parameters changed
+      const newTtsParams = Object.keys(builtTtsParameters).length > 0 ? builtTtsParameters : null;
+      if (JSON.stringify(newTtsParams) !== JSON.stringify(agent.tts_parameters || null)) {
+        requestData.tts_parameters = newTtsParams;
+      }
+
+      // Check if STT parameters changed
+      const newSttParams = Object.keys(builtSttParameters).length > 0 ? builtSttParameters : null;
+      if (JSON.stringify(newSttParams) !== JSON.stringify(agent.stt_parameters || null)) {
+        requestData.stt_parameters = newSttParams;
+      }
+
+      if (data.system_prompt.trim() !== agent.system_prompt) {
+        requestData.system_prompt = data.system_prompt.trim();
+      }
+
+      if (data.welcome_message.trim() !== agent.welcome_message) {
+        requestData.welcome_message = data.welcome_message.trim();
+      }
+
+      // Check if conversation config changed
+      if (JSON.stringify(conversationConfig) !== JSON.stringify(agent.conversation_config || null)) {
+        requestData.conversation_config = conversationConfig;
+      }
+
+      if (data.status !== agent.status) {
+        requestData.status = data.status;
+      }
+
+      // Check if phone numbers changed
+      if (JSON.stringify(inboundNumbers) !== JSON.stringify(agent.inbound_numbers || [])) {
+        requestData.inbound_numbers = inboundNumbers;
+      }
+
+      if (JSON.stringify(outboundNumbers) !== JSON.stringify(agent.outbound_numbers || [])) {
+        requestData.outbound_numbers = outboundNumbers;
+      }
+
+      // Check if languages changed
+      if (JSON.stringify(data.supported_languages) !== JSON.stringify(agent.supported_languages || ['en'])) {
+        requestData.supported_languages = data.supported_languages;
+      }
+
+      if (data.default_language !== agent.default_language) {
+        requestData.default_language = data.default_language;
+      }
+
+      // Only send request if there are changes
+      if (Object.keys(requestData).length === 0) {
+        notifySuccess('No changes to update');
+        onOpenChange(false);
+        return;
+      }
 
       await floConsoleService.voiceAgentService.updateVoiceAgent(agent.id, requestData);
 
@@ -206,6 +335,206 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
     }
   };
 
+  // Render TTS parameter field based on type
+  const renderTtsParameterField = (key: string) => {
+    if (!selectedTtsProvider) return null;
+    const config = getProviderConfig('tts', selectedTtsProvider);
+    if (!config) return null;
+
+    const paramConfig = config.parameters[key];
+    if (!paramConfig) return null;
+
+    switch (paramConfig.type) {
+      case 'boolean':
+        return (
+          <div key={key} className="col-span-2">
+            <div className="flex items-center space-x-2">
+              <Checkbox
+                id={`tts-${key}`}
+                checked={getBooleanParameterWithDefault(ttsParameters, key, paramConfig.default)}
+                onCheckedChange={(checked) => setTtsParameter(key, checked)}
+              />
+              <Label htmlFor={`tts-${key}`} className="cursor-pointer">
+                {paramConfig.description || key}
+              </Label>
+            </div>
+          </div>
+        );
+
+      case 'number':
+        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
+          const sliderValue = getNumberParameterWithDefault(ttsParameters, key, paramConfig.default, paramConfig.min);
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label>
+                {paramConfig.description || key}: {sliderValue.toFixed(2)}
+              </Label>
+              <Slider
+                min={paramConfig.min}
+                max={paramConfig.max}
+                step={paramConfig.step || 1}
+                value={[sliderValue]}
+                onValueChange={(values: number[]) => setTtsParameter(key, values[0])}
+              />
+              <p className="text-muted-foreground text-[0.8rem]">
+                {paramConfig.min} - {paramConfig.max}
+              </p>
+            </div>
+          );
+        }
+        // Number without range - use input
+        return (
+          <div key={key} className="col-span-2 space-y-2">
+            <Label htmlFor={`tts-${key}`}>{paramConfig.description || key}</Label>
+            <Input
+              id={`tts-${key}`}
+              type="number"
+              value={(ttsParameters[key] ?? paramConfig.default ?? 0) as number}
+              onChange={(e) => setTtsParameter(key, parseFloat(e.target.value) || 0)}
+            />
+          </div>
+        );
+
+      case 'string':
+        if (paramConfig.options && paramConfig.options.length > 0) {
+          // Dropdown for predefined options
+          const currentValue = String(ttsParameters[key] ?? paramConfig.default ?? '');
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label htmlFor={`tts-${key}`}>{paramConfig.description || key}</Label>
+              <Select value={currentValue} onValueChange={(value) => setTtsParameter(key, value)}>
+                <SelectTrigger id={`tts-${key}`}>
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {paramConfig.options.map((opt) => (
+                    <SelectItem key={String(opt)} value={String(opt)}>
+                      {opt}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          );
+        }
+        // Text input for free-form strings
+        return (
+          <div key={key} className="col-span-2 space-y-2">
+            <Label htmlFor={`tts-${key}`}>{paramConfig.description || key}</Label>
+            <Input
+              id={`tts-${key}`}
+              type="text"
+              value={String(ttsParameters[key] ?? paramConfig.default ?? '')}
+              onChange={(e) => setTtsParameter(key, e.target.value)}
+            />
+          </div>
+        );
+
+      default:
+        return null;
+    }
+  };
+
+  // Render STT parameter field based on type
+  const renderSttParameterField = (key: string) => {
+    if (!selectedSttProvider) return null;
+    const config = getProviderConfig('stt', selectedSttProvider);
+    if (!config) return null;
+
+    const paramConfig = config.parameters[key];
+    if (!paramConfig) return null;
+
+    switch (paramConfig.type) {
+      case 'boolean':
+        return (
+          <div key={key} className="col-span-2">
+            <div className="flex items-center space-x-2">
+              <Checkbox
+                id={`stt-${key}`}
+                checked={getBooleanParameterWithDefault(sttParameters, key, paramConfig.default)}
+                onCheckedChange={(checked) => setSttParameter(key, checked)}
+              />
+              <Label htmlFor={`stt-${key}`} className="cursor-pointer">
+                {paramConfig.description || key}
+              </Label>
+            </div>
+          </div>
+        );
+
+      case 'number':
+        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
+          const sliderValue = getNumberParameterWithDefault(sttParameters, key, paramConfig.default, paramConfig.min);
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label>
+                {paramConfig.description || key}: {sliderValue.toFixed(2)}
+              </Label>
+              <Slider
+                min={paramConfig.min}
+                max={paramConfig.max}
+                step={paramConfig.step || 1}
+                value={[sliderValue]}
+                onValueChange={(values: number[]) => setSttParameter(key, values[0])}
+              />
+              <p className="text-muted-foreground text-[0.8rem]">
+                {paramConfig.min} - {paramConfig.max}
+              </p>
+            </div>
+          );
+        }
+        // Number without range - use input
+        return (
+          <div key={key} className="col-span-2 space-y-2">
+            <Label htmlFor={`stt-${key}`}>{paramConfig.description || key}</Label>
+            <Input
+              id={`stt-${key}`}
+              type="number"
+              value={(sttParameters[key] ?? paramConfig.default ?? 0) as number}
+              onChange={(e) => setSttParameter(key, parseFloat(e.target.value) || 0)}
+            />
+          </div>
+        );
+
+      case 'string':
+        if (paramConfig.options && paramConfig.options.length > 0) {
+          // Dropdown for predefined options
+          const currentValue = String(sttParameters[key] ?? paramConfig.default ?? '');
+          return (
+            <div key={key} className="col-span-2 space-y-2">
+              <Label htmlFor={`stt-${key}`}>{paramConfig.description || key}</Label>
+              <Select value={currentValue} onValueChange={(value) => setSttParameter(key, value)}>
+                <SelectTrigger id={`stt-${key}`}>
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {paramConfig.options.map((opt) => (
+                    <SelectItem key={String(opt)} value={String(opt)}>
+                      {opt}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          );
+        }
+        // Text input for free-form strings
+        return (
+          <div key={key} className="col-span-2 space-y-2">
+            <Label htmlFor={`stt-${key}`}>{paramConfig.description || key}</Label>
+            <Input
+              id={`stt-${key}`}
+              type="text"
+              value={String(sttParameters[key] ?? paramConfig.default ?? '')}
+              onChange={(e) => setSttParameter(key, e.target.value)}
+            />
+          </div>
+        );
+
+      default:
+        return null;
+    }
+  };
+
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] overflow-y-auto lg:max-w-5xl">
@@ -416,6 +745,52 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
                     )}
                   />
                 </div>
+
+                <div className="space-y-4">
+                  <h4 className="text-sm font-medium">TTS Voice Settings</h4>
+                  <FormField
+                    control={form.control}
+                    name="tts_voice_id"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          TTS Voice ID<span className="text-red-500">*</span>
+                        </FormLabel>
+                        <FormControl>
+                          <Input placeholder="e.g., alloy, echo, fable (OpenAI) or voice ID (ElevenLabs)" {...field} />
+                        </FormControl>
+                        <FormDescription>
+                          Provider-specific voice identifier (e.g., for Deepgram: aura-2-helena-en)
+                        </FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  {ttsProviderConfig &&
+                    Object.keys(ttsProviderConfig.parameters).filter((key) => key !== 'language').length > 0 && (
+                      <div className="col-span-2 space-y-4">
+                        <h4 className="text-sm font-medium">TTS Parameters</h4>
+                        <div className="grid grid-cols-2 gap-6">
+                          {Object.keys(ttsProviderConfig.parameters)
+                            .filter((key) => key !== 'language')
+                            .map((key) => renderTtsParameterField(key))}
+                        </div>
+                      </div>
+                    )}
+
+                  {sttProviderConfig &&
+                    Object.keys(sttProviderConfig.parameters).filter((key) => key !== 'language').length > 0 && (
+                      <div className="col-span-2 space-y-4">
+                        <h4 className="text-sm font-medium">STT Parameters</h4>
+                        <div className="grid grid-cols-2 gap-6">
+                          {Object.keys(sttProviderConfig.parameters)
+                            .filter((key) => key !== 'language')
+                            .map((key) => renderSttParameterField(key))}
+                        </div>
+                      </div>
+                    )}
+                </div>
               </div>
 
               {/* Phone Numbers */}
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/CreateSttConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/CreateSttConfigDialog.tsx
index 10f67c80..5d233c91 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/CreateSttConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/CreateSttConfigDialog.tsx
@@ -1,7 +1,6 @@
 import floConsoleService from '@app/api';
 import { Alert, AlertDescription } from '@app/components/ui/alert';
 import { Button } from '@app/components/ui/button';
-import { Checkbox } from '@app/components/ui/checkbox';
 import {
   Dialog,
   DialogContent,
@@ -20,19 +19,11 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { Slider } from '@app/components/ui/slider';
 import { Textarea } from '@app/components/ui/textarea';
-import { VOICE_PROVIDERS_CONFIG, getProviderConfig, initializeParameters } from '@app/config/voice-providers';
+import { VOICE_PROVIDERS_CONFIG, getProviderConfig } from '@app/config/voice-providers';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
-import {
-  getBooleanParameterWithDefault,
-  getNumberOrStringParameter,
-  getNumberParameterWithDefault,
-  getStringParameter,
-} from '@app/utils/parameter-helpers';
 import { zodResolver } from '@hookform/resolvers/zod';
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
@@ -43,7 +34,6 @@ const createSttConfigSchema = z.object({
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
   provider: z.enum(['deepgram'] as [string, ...string[]]),
   api_key: z.string().min(1, 'API key is required'),
-  language: z.string().optional(),
 });
 
 type CreateSttConfigInput = z.infer<typeof createSttConfigSchema>;
@@ -56,8 +46,6 @@ interface CreateSttConfigDialogProps {
 
 const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, onOpenChange, onSuccess }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
-
-  const [parameters, setParameters] = useState<Record<string, unknown>>({});
   const [loading, setLoading] = useState(false);
 
   const form = useForm<CreateSttConfigInput>({
@@ -67,19 +55,9 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
       description: '',
       provider: 'deepgram',
       api_key: '',
-      language: '',
     },
   });
 
-  const watchedProvider = form.watch('provider');
-
-  // Reset parameters when provider changes
-  useEffect(() => {
-    if (isOpen && watchedProvider) {
-      setParameters(initializeParameters('stt', watchedProvider));
-    }
-  }, [watchedProvider, isOpen]);
-
   // Reset form when dialog closes
   useEffect(() => {
     if (!isOpen) {
@@ -88,34 +66,10 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
         description: '',
         provider: 'deepgram',
         api_key: '',
-        language: '',
       });
-      setParameters({});
     }
   }, [isOpen, form]);
 
-  const setParameter = (key: string, value: unknown) => {
-    setParameters((prev) => ({ ...prev, [key]: value }));
-  };
-
-  const buildParameters = () => {
-    const config = getProviderConfig('stt', watchedProvider);
-    if (!config) return null;
-
-    const params: Record<string, unknown> = {};
-
-    Object.entries(parameters).forEach(([key, value]) => {
-      const paramConfig = config.parameters[key];
-      if (!paramConfig) return;
-
-      if (value !== '' && value !== undefined) {
-        params[key] = value;
-      }
-    });
-
-    return Object.keys(params).length > 0 ? params : null;
-  };
-
   const onSubmit = async (data: CreateSttConfigInput) => {
     setLoading(true);
     try {
@@ -124,8 +78,6 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
         description: data.description?.trim() || null,
         provider: data.provider as 'deepgram',
         api_key: data.api_key.trim(),
-        language: data.language?.trim() || null,
-        parameters: buildParameters(),
       });
       notifySuccess('STT configuration created successfully');
       onSuccess?.();
@@ -138,142 +90,6 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
     }
   };
 
-  const renderParameterField = (key: string) => {
-    const config = getProviderConfig('stt', watchedProvider);
-    if (!config) return null;
-
-    const paramConfig = config.parameters[key];
-    if (!paramConfig) return null;
-
-    switch (paramConfig.type) {
-      case 'boolean':
-        return (
-          <div key={key} className="col-span-2">
-            <div className="flex items-center space-x-2">
-              <Checkbox
-                id={key}
-                checked={getBooleanParameterWithDefault(parameters, key, paramConfig.default)}
-                onCheckedChange={(checked) => setParameter(key, checked)}
-              />
-              <Label htmlFor={key} className="cursor-pointer">
-                {paramConfig.description || key}
-              </Label>
-            </div>
-          </div>
-        );
-
-      case 'number':
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const numValue = getNumberParameterWithDefault(parameters, key, paramConfig.default);
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select
-                value={
-                  numValue !== undefined && numValue !== null
-                    ? String(numValue)
-                    : paramConfig.default !== undefined
-                      ? String(paramConfig.default)
-                      : ''
-                }
-                onValueChange={(val) => setParameter(key, val ? parseInt(val) : undefined)}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={option} value={String(option)}>
-                      {option}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
-          const sliderValue = getNumberParameterWithDefault(parameters, key, paramConfig.default, paramConfig.min);
-          return (
-            <div key={key} className="col-span-2 space-y-2">
-              <Label>
-                {paramConfig.description || key}: {sliderValue}
-              </Label>
-              <Slider
-                min={paramConfig.min}
-                max={paramConfig.max}
-                step={paramConfig.step || 1}
-                value={[sliderValue]}
-                onValueChange={(values: number[]) => setParameter(key, values[0])}
-              />
-              {paramConfig.description && (
-                <p className="text-muted-foreground text-[0.8rem]">{paramConfig.description}</p>
-              )}
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="number"
-              value={getNumberOrStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value ? parseInt(e.target.value) : undefined)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-
-      case 'string':
-      default:
-        if (key === 'language') return null;
-
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const selectValue =
-            getStringParameter(parameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select value={selectValue} onValueChange={(val) => setParameter(key, val)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={String(option)} value={String(option)}>
-                      {String(option)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="text"
-              value={getStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-    }
-  };
-
-  const providerConfig = getProviderConfig('stt', watchedProvider);
-
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] max-w-3xl overflow-y-auto">
@@ -294,7 +110,7 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
                       Display Name <span className="text-red-500">*</span>
                     </FormLabel>
                     <FormControl>
-                      <Input placeholder="e.g., Deepgram English Transcription" maxLength={100} {...field} />
+                      <Input placeholder="e.g., Deepgram Production" maxLength={100} {...field} />
                     </FormControl>
                     <FormDescription>{field.value?.length || 0}/100 characters</FormDescription>
                     <FormMessage />
@@ -337,7 +153,7 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
               control={form.control}
               name="description"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>Description (Optional)</FormLabel>
                   <FormControl>
                     <Textarea
@@ -357,60 +173,30 @@ const CreateSttConfigDialog: React.FC<CreateSttConfigDialogProps> = ({ isOpen, o
               control={form.control}
               name="api_key"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>
                     API Key <span className="text-red-500">*</span>
                   </FormLabel>
                   <FormControl>
                     <Input type="password" placeholder="Enter your API key" {...field} />
                   </FormControl>
-                  <Alert variant="info" className="mt-2">
-                    <AlertDescription>
-                      <strong>Security Note:</strong> API keys are stored securely and never returned in API responses.
-                    </AlertDescription>
-                  </Alert>
                   <FormMessage />
                 </FormItem>
               )}
             />
 
-            {providerConfig?.parameters.language && (
-              <FormField
-                control={form.control}
-                name="language"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Language (Optional)</FormLabel>
-                    <FormControl>
-                      <Input placeholder="en-US, es-ES, fr-FR" {...field} />
-                    </FormControl>
-                    <FormDescription>
-                      Language code (e.g., en-US, es-ES). Most providers support automatic detection.
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            )}
-
-            {providerConfig &&
-              Object.keys(providerConfig.parameters).filter((key) => key !== 'language').length > 0 && (
-                <div className="rounded-lg border border-gray-200 p-4">
-                  <h3 className="mb-4 font-medium text-gray-900">Provider Parameters</h3>
-                  <div className="grid grid-cols-2 gap-6">
-                    {Object.keys(providerConfig.parameters)
-                      .filter((key) => key !== 'language')
-                      .map((key) => renderParameterField(key))}
-                  </div>
-                </div>
-              )}
+            <Alert variant="info">
+              <AlertDescription>
+                <strong>Security Note:</strong> API keys are stored securely and never returned in API responses.
+              </AlertDescription>
+            </Alert>
 
             <DialogFooter>
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
                 Cancel
               </Button>
-              <Button type="submit" loading={loading}>
-                Create Configuration
+              <Button type="submit" disabled={loading}>
+                {loading ? 'Creating...' : 'Create Configuration'}
               </Button>
             </DialogFooter>
           </form>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/EditSttConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/EditSttConfigDialog.tsx
index cef2fad3..bd91c6c1 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/EditSttConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/EditSttConfigDialog.tsx
@@ -1,7 +1,6 @@
 import floConsoleService from '@app/api';
 import { Alert, AlertDescription } from '@app/components/ui/alert';
 import { Button } from '@app/components/ui/button';
-import { Checkbox } from '@app/components/ui/checkbox';
 import {
   Dialog,
   DialogContent,
@@ -20,19 +19,11 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { Slider } from '@app/components/ui/slider';
 import { Textarea } from '@app/components/ui/textarea';
-import { VOICE_PROVIDERS_CONFIG, getProviderConfig, mergeParameters } from '@app/config/voice-providers';
+import { VOICE_PROVIDERS_CONFIG, getProviderConfig } from '@app/config/voice-providers';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
-import {
-  getBooleanParameterWithDefault,
-  getNumberOrStringParameter,
-  getNumberParameterWithDefault,
-  getStringParameter,
-} from '@app/utils/parameter-helpers';
 import { SttConfig, UpdateSttConfigRequest } from '@app/types/stt-config';
 import { zodResolver } from '@hookform/resolvers/zod';
 import React, { useEffect, useState } from 'react';
@@ -44,7 +35,6 @@ const updateSttConfigSchema = z.object({
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
   provider: z.enum(['deepgram'] as [string, ...string[]]),
   api_key: z.string().optional(),
-  language: z.string().optional(),
 });
 
 type UpdateSttConfigInput = z.infer<typeof updateSttConfigSchema>;
@@ -58,8 +48,6 @@ interface EditSttConfigDialogProps {
 
 const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpenChange, config, onSuccess }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
-
-  const [parameters, setParameters] = useState<Record<string, unknown>>({});
   const [loading, setLoading] = useState(false);
 
   const form = useForm<UpdateSttConfigInput>({
@@ -69,13 +57,10 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
       description: config.description || '',
       provider: config.provider,
       api_key: '',
-      language: config.language || '',
     },
   });
 
-  const watchedProvider = form.watch('provider');
-
-  // Initialize parameters when dialog opens or config changes
+  // Reset form when dialog opens or config changes
   useEffect(() => {
     if (isOpen && config) {
       form.reset({
@@ -83,51 +68,16 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
         description: config.description || '',
         provider: config.provider,
         api_key: '',
-        language: config.language || '',
       });
-      // Merge saved parameters with defaults from config
-      setParameters(mergeParameters('stt', config.provider, config.parameters));
     }
   }, [isOpen, config, form]);
 
-  // Reset parameters when provider changes
-  useEffect(() => {
-    if (isOpen && watchedProvider && watchedProvider !== config.provider) {
-      setParameters(mergeParameters('stt', watchedProvider, null));
-    }
-  }, [watchedProvider, isOpen, config.provider]);
-
-  const setParameter = (key: string, value: unknown) => {
-    setParameters((prev) => ({ ...prev, [key]: value }));
-  };
-
-  const buildParameters = () => {
-    const providerConfig = getProviderConfig('stt', watchedProvider);
-    if (!providerConfig) return null;
-
-    const params: Record<string, unknown> = {};
-
-    Object.entries(parameters).forEach(([key, value]) => {
-      const paramConfig = providerConfig.parameters[key];
-      if (!paramConfig) return;
-
-      if (value !== '' && value !== undefined) {
-        params[key] = value;
-      }
-    });
-
-    return Object.keys(params).length > 0 ? params : null;
-  };
-
   const onSubmit = async (data: UpdateSttConfigInput) => {
     setLoading(true);
     try {
       const updateData: UpdateSttConfigRequest = {
         display_name: data.display_name.trim(),
         description: data.description?.trim() || null,
-        provider: data.provider as 'deepgram',
-        language: data.language?.trim() || null,
-        parameters: buildParameters(),
       };
 
       if (data.api_key?.trim()) {
@@ -146,142 +96,6 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
     }
   };
 
-  const renderParameterField = (key: string) => {
-    const providerConfig = getProviderConfig('stt', watchedProvider);
-    if (!providerConfig) return null;
-
-    const paramConfig = providerConfig.parameters[key];
-    if (!paramConfig) return null;
-
-    switch (paramConfig.type) {
-      case 'boolean':
-        return (
-          <div key={key} className="col-span-2">
-            <div className="flex items-center space-x-2">
-              <Checkbox
-                id={key}
-                checked={getBooleanParameterWithDefault(parameters, key, paramConfig.default)}
-                onCheckedChange={(checked) => setParameter(key, checked)}
-              />
-              <Label htmlFor={key} className="cursor-pointer">
-                {paramConfig.description || key}
-              </Label>
-            </div>
-          </div>
-        );
-
-      case 'number':
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const numValue = getNumberParameterWithDefault(parameters, key, paramConfig.default);
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select
-                value={
-                  numValue !== undefined && numValue !== null
-                    ? String(numValue)
-                    : paramConfig.default !== undefined
-                      ? String(paramConfig.default)
-                      : ''
-                }
-                onValueChange={(val) => setParameter(key, val ? parseInt(val) : undefined)}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={option} value={String(option)}>
-                      {option}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
-          const sliderValue = getNumberParameterWithDefault(parameters, key, paramConfig.default, paramConfig.min);
-          return (
-            <div key={key} className="col-span-2 space-y-2">
-              <Label>
-                {paramConfig.description || key}: {sliderValue}
-              </Label>
-              <Slider
-                min={paramConfig.min}
-                max={paramConfig.max}
-                step={paramConfig.step || 1}
-                value={[sliderValue]}
-                onValueChange={(values: number[]) => setParameter(key, values[0])}
-              />
-              {paramConfig.description && (
-                <p className="text-muted-foreground text-[0.8rem]">{paramConfig.description}</p>
-              )}
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="number"
-              value={getNumberOrStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value ? parseInt(e.target.value) : undefined)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-
-      case 'string':
-      default:
-        if (key === 'language') return null;
-
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const selectValue =
-            getStringParameter(parameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select value={selectValue} onValueChange={(val) => setParameter(key, val)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={String(option)} value={String(option)}>
-                      {String(option)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="text"
-              value={getStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-    }
-  };
-
-  const providerConfig = getProviderConfig('stt', watchedProvider);
-
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] max-w-3xl overflow-y-auto">
@@ -302,7 +116,7 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
                       Display Name <span className="text-red-500">*</span>
                     </FormLabel>
                     <FormControl>
-                      <Input placeholder="e.g., Deepgram English Transcription" maxLength={100} {...field} />
+                      <Input placeholder="e.g., Deepgram Production" maxLength={100} {...field} />
                     </FormControl>
                     <FormDescription>{field.value?.length || 0}/100 characters</FormDescription>
                     <FormMessage />
@@ -318,7 +132,7 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
                     <FormLabel>
                       Provider <span className="text-red-500">*</span>
                     </FormLabel>
-                    <Select onValueChange={field.onChange} value={field.value}>
+                    <Select onValueChange={field.onChange} value={field.value} disabled>
                       <FormControl>
                         <SelectTrigger>
                           <SelectValue placeholder="Select provider" />
@@ -335,6 +149,7 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
                         })}
                       </SelectContent>
                     </Select>
+                    <FormDescription>Provider cannot be changed after creation</FormDescription>
                     <FormMessage />
                   </FormItem>
                 )}
@@ -345,7 +160,7 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
               control={form.control}
               name="description"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>Description (Optional)</FormLabel>
                   <FormControl>
                     <Textarea
@@ -365,7 +180,7 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
               control={form.control}
               name="api_key"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>API Key (Optional - leave empty to keep existing)</FormLabel>
                   <FormControl>
                     <Input type="password" placeholder="Enter new API key to update" {...field} />
@@ -381,43 +196,12 @@ const EditSttConfigDialog: React.FC<EditSttConfigDialogProps> = ({ isOpen, onOpe
               )}
             />
 
-            {providerConfig?.parameters.language && (
-              <FormField
-                control={form.control}
-                name="language"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Language (Optional)</FormLabel>
-                    <FormControl>
-                      <Input placeholder="en-US, es-ES, fr-FR" {...field} />
-                    </FormControl>
-                    <FormDescription>
-                      Language code (e.g., en-US, es-ES). Most providers support automatic detection.
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            )}
-
-            {providerConfig &&
-              Object.keys(providerConfig.parameters).filter((key) => key !== 'language').length > 0 && (
-                <div className="rounded-lg border border-gray-200 p-4">
-                  <h3 className="mb-4 font-medium text-gray-900">Provider Parameters</h3>
-                  <div className="grid grid-cols-2 gap-6">
-                    {Object.keys(providerConfig.parameters)
-                      .filter((key) => key !== 'language')
-                      .map((key) => renderParameterField(key))}
-                  </div>
-                </div>
-              )}
-
             <DialogFooter>
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
                 Cancel
               </Button>
-              <Button type="submit" loading={loading}>
-                Update Configuration
+              <Button type="submit" disabled={loading}>
+                {loading ? 'Updating...' : 'Update Configuration'}
               </Button>
             </DialogFooter>
           </form>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/index.tsx
index d9a7fd0b..ce783776 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/stt-configs/index.tsx
@@ -80,8 +80,7 @@ const SttConfigsPage: React.FC = () => {
     return (
       config.display_name.toLowerCase().includes(query) ||
       (config.description && config.description.toLowerCase().includes(query)) ||
-      config.provider.toLowerCase().includes(query) ||
-      (config.language && config.language.toLowerCase().includes(query))
+      config.provider.toLowerCase().includes(query)
     );
   });
 
@@ -130,7 +129,6 @@ const SttConfigsPage: React.FC = () => {
                   <TableHead>Display Name</TableHead>
                   <TableHead>Provider</TableHead>
                   <TableHead>Description</TableHead>
-                  <TableHead>Language</TableHead>
                   <TableHead>Created</TableHead>
                   <TableHead className="text-right">Actions</TableHead>
                 </TableRow>
@@ -141,7 +139,6 @@ const SttConfigsPage: React.FC = () => {
                     <TableCell className="font-medium">{config.display_name}</TableCell>
                     <TableCell>{config.provider}</TableCell>
                     <TableCell className="max-w-md truncate">{config.description || '-'}</TableCell>
-                    <TableCell>{config.language || '-'}</TableCell>
                     <TableCell>{new Date(config.created_at).toLocaleDateString()}</TableCell>
                     <TableCell className="text-right" onClick={(e) => e.stopPropagation()}>
                       <div className="flex items-center justify-end gap-2">
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/CreateTtsConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/CreateTtsConfigDialog.tsx
index c8431ce6..d2389860 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/CreateTtsConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/CreateTtsConfigDialog.tsx
@@ -1,7 +1,6 @@
 import floConsoleService from '@app/api';
 import { Alert, AlertDescription } from '@app/components/ui/alert';
 import { Button } from '@app/components/ui/button';
-import { Checkbox } from '@app/components/ui/checkbox';
 import {
   Dialog,
   DialogContent,
@@ -20,19 +19,11 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { Slider } from '@app/components/ui/slider';
 import { Textarea } from '@app/components/ui/textarea';
-import { VOICE_PROVIDERS_CONFIG, getProviderConfig, initializeParameters } from '@app/config/voice-providers';
+import { VOICE_PROVIDERS_CONFIG, getProviderConfig } from '@app/config/voice-providers';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
-import {
-  getBooleanParameterWithDefault,
-  getNumberOrStringParameter,
-  getNumberParameterWithDefault,
-  getStringParameter,
-} from '@app/utils/parameter-helpers';
 import { zodResolver } from '@hookform/resolvers/zod';
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
@@ -42,9 +33,7 @@ const createTtsConfigSchema = z.object({
   display_name: z.string().min(1, 'Display name is required').max(100, 'Display name must be 100 characters or less'),
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
   provider: z.enum(['elevenlabs', 'deepgram', 'cartesia'] as [string, ...string[]]),
-  voice_id: z.string().min(1, 'Voice ID is required'),
   api_key: z.string().min(1, 'API key is required'),
-  language: z.string().optional(),
 });
 
 type CreateTtsConfigInput = z.infer<typeof createTtsConfigSchema>;
@@ -57,8 +46,6 @@ interface CreateTtsConfigDialogProps {
 
 const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, onOpenChange, onSuccess }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
-
-  const [parameters, setParameters] = useState<Record<string, unknown>>({});
   const [loading, setLoading] = useState(false);
 
   const form = useForm<CreateTtsConfigInput>({
@@ -67,21 +54,10 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
       display_name: '',
       description: '',
       provider: 'elevenlabs',
-      voice_id: '',
       api_key: '',
-      language: '',
     },
   });
 
-  const watchedProvider = form.watch('provider');
-
-  // Reset parameters when provider changes
-  useEffect(() => {
-    if (isOpen && watchedProvider) {
-      setParameters(initializeParameters('tts', watchedProvider));
-    }
-  }, [watchedProvider, isOpen]);
-
   // Reset form when dialog closes
   useEffect(() => {
     if (!isOpen) {
@@ -89,48 +65,11 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
         display_name: '',
         description: '',
         provider: 'elevenlabs',
-        voice_id: '',
         api_key: '',
-        language: '',
       });
-      setParameters({});
     }
   }, [isOpen, form]);
 
-  const setParameter = (key: string, value: unknown) => {
-    setParameters((prev) => ({ ...prev, [key]: value }));
-  };
-
-  const buildParameters = () => {
-    const config = getProviderConfig('tts', watchedProvider);
-    if (!config) return null;
-
-    const params: Record<string, unknown> = {};
-
-    Object.entries(parameters).forEach(([key, value]) => {
-      const paramConfig = config.parameters[key];
-      if (!paramConfig) return;
-
-      if (value === paramConfig.default && (value === '' || value === undefined)) {
-        return;
-      }
-
-      if (paramConfig.type === 'array' && typeof value === 'string') {
-        const arr = value
-          .split(',')
-          .map((v) => v.trim())
-          .filter(Boolean);
-        if (arr.length > 0) {
-          params[key] = arr;
-        }
-      } else if (value !== '' && value !== undefined) {
-        params[key] = value;
-      }
-    });
-
-    return Object.keys(params).length > 0 ? params : null;
-  };
-
   const onSubmit = async (data: CreateTtsConfigInput) => {
     setLoading(true);
     try {
@@ -138,10 +77,7 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
         display_name: data.display_name.trim(),
         description: data.description?.trim() || null,
         provider: data.provider as 'elevenlabs' | 'deepgram' | 'cartesia',
-        voice_id: data.voice_id.trim(),
         api_key: data.api_key.trim(),
-        language: data.language?.trim() || null,
-        parameters: buildParameters(),
       });
       notifySuccess('TTS configuration created successfully');
       onSuccess?.();
@@ -154,165 +90,6 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
     }
   };
 
-  const renderParameterField = (key: string) => {
-    const config = getProviderConfig('tts', watchedProvider);
-    if (!config) return null;
-
-    const paramConfig = config.parameters[key];
-    if (!paramConfig) return null;
-
-    switch (paramConfig.type) {
-      case 'boolean':
-        return (
-          <div key={key} className="col-span-2">
-            <div className="flex items-center space-x-2">
-              <Checkbox
-                id={key}
-                checked={getBooleanParameterWithDefault(parameters, key, paramConfig.default)}
-                onCheckedChange={(checked) => setParameter(key, checked)}
-              />
-              <Label htmlFor={key} className="cursor-pointer">
-                {paramConfig.description || key}
-              </Label>
-            </div>
-          </div>
-        );
-
-      case 'number':
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const numValue = getNumberParameterWithDefault(parameters, key, paramConfig.default);
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select
-                value={numValue?.toString() ?? paramConfig.default?.toString() ?? ''}
-                onValueChange={(val) => setParameter(key, val ? parseFloat(val) : undefined)}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={option} value={option.toString()}>
-                      {option}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              {paramConfig.description && (
-                <p className="text-muted-foreground text-[0.8rem]">{paramConfig.description}</p>
-              )}
-            </div>
-          );
-        }
-
-        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
-          const sliderValue = getNumberParameterWithDefault(parameters, key, paramConfig.default, paramConfig.min);
-          return (
-            <div key={key} className="col-span-2 space-y-2">
-              <Label>
-                {paramConfig.description || key}: {sliderValue.toFixed(2)}
-              </Label>
-              <Slider
-                min={paramConfig.min}
-                max={paramConfig.max}
-                step={paramConfig.step || 1}
-                value={[sliderValue]}
-                onValueChange={(values: number[]) => setParameter(key, values[0])}
-              />
-              <p className="text-muted-foreground text-[0.8rem]">
-                {paramConfig.min} - {paramConfig.max}
-              </p>
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>
-              {paramConfig.description || key} {key === 'sample_rate' || key === 'speed' ? '(Optional)' : ''}
-            </Label>
-            <Input
-              type="number"
-              value={getNumberOrStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value ? parseFloat(e.target.value) : undefined)}
-              placeholder={paramConfig.placeholder}
-              step={paramConfig.step}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-
-      case 'array': {
-        const arrayValue = Array.isArray(parameters[key])
-          ? (parameters[key] as string[]).join(', ')
-          : getStringParameter(parameters, key);
-        return (
-          <div key={key} className="col-span-2 space-y-2">
-            <Label>{paramConfig.description || key} (Optional)</Label>
-            <Input
-              type="text"
-              value={arrayValue}
-              onChange={(e) => setParameter(key, e.target.value)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">{paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-      }
-
-      case 'string':
-      default:
-        if (key === 'language') return null;
-
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const selectValue =
-            getStringParameter(parameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select value={selectValue} onValueChange={(val) => setParameter(key, val)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={String(option)} value={String(option)}>
-                      {String(option)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              {paramConfig.description && (
-                <p className="text-muted-foreground text-[0.8rem]">{paramConfig.description}</p>
-              )}
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="text"
-              value={getStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-    }
-  };
-
-  const providerConfig = getProviderConfig('tts', watchedProvider);
-
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] max-w-3xl overflow-y-auto">
@@ -333,7 +110,7 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
                       Display Name <span className="text-red-500">*</span>
                     </FormLabel>
                     <FormControl>
-                      <Input placeholder="e.g., ElevenLabs English Voice" maxLength={100} {...field} />
+                      <Input placeholder="e.g., ElevenLabs Production" maxLength={100} {...field} />
                     </FormControl>
                     <FormDescription>{field.value?.length || 0}/100 characters</FormDescription>
                     <FormMessage />
@@ -376,7 +153,7 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
               control={form.control}
               name="description"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>Description (Optional)</FormLabel>
                   <FormControl>
                     <Textarea
@@ -392,47 +169,21 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
               )}
             />
 
-            <div className="grid grid-cols-2 gap-6">
-              <FormField
-                control={form.control}
-                name="voice_id"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      Voice ID <span className="text-red-500">*</span>
-                    </FormLabel>
-                    <FormControl>
-                      <Input
-                        placeholder={watchedProvider === 'deepgram' ? 'aura-2-helena-en' : 'voice_id'}
-                        {...field}
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      {watchedProvider === 'deepgram'
-                        ? 'For Deepgram, voice_id IS the model (e.g., aura-2-helena-en)'
-                        : 'Provider-specific voice identifier'}
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name="api_key"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      API Key <span className="text-red-500">*</span>
-                    </FormLabel>
-                    <FormControl>
-                      <Input type="password" placeholder="Enter your API key" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
+            <FormField
+              control={form.control}
+              name="api_key"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    API Key <span className="text-red-500">*</span>
+                  </FormLabel>
+                  <FormControl>
+                    <Input type="password" placeholder="Enter your API key" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
 
             <Alert variant="info">
               <AlertDescription>
@@ -440,35 +191,6 @@ const CreateTtsConfigDialog: React.FC<CreateTtsConfigDialogProps> = ({ isOpen, o
               </AlertDescription>
             </Alert>
 
-            {providerConfig?.parameters.language && (
-              <FormField
-                control={form.control}
-                name="language"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Language (Optional)</FormLabel>
-                    <FormControl>
-                      <Input placeholder="en, es, fr" {...field} />
-                    </FormControl>
-                    <FormDescription>ISO 639-1 language code (e.g., en, es, fr)</FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            )}
-
-            {providerConfig &&
-              Object.keys(providerConfig.parameters).filter((key) => key !== 'language').length > 0 && (
-                <div className="rounded-lg border border-gray-200 p-4">
-                  <h3 className="mb-4 font-medium text-gray-900">Provider Parameters</h3>
-                  <div className="grid grid-cols-2 gap-6">
-                    {Object.keys(providerConfig.parameters)
-                      .filter((key) => key !== 'language')
-                      .map((key) => renderParameterField(key))}
-                  </div>
-                </div>
-              )}
-
             <DialogFooter>
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
                 Cancel
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/EditTtsConfigDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/EditTtsConfigDialog.tsx
index 02bbb9ce..0a27fff3 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/EditTtsConfigDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/EditTtsConfigDialog.tsx
@@ -1,7 +1,6 @@
 import floConsoleService from '@app/api';
 import { Alert, AlertDescription } from '@app/components/ui/alert';
 import { Button } from '@app/components/ui/button';
-import { Checkbox } from '@app/components/ui/checkbox';
 import {
   Dialog,
   DialogContent,
@@ -20,19 +19,11 @@ import {
   FormMessage,
 } from '@app/components/ui/form';
 import { Input } from '@app/components/ui/input';
-import { Label } from '@app/components/ui/label';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
-import { Slider } from '@app/components/ui/slider';
 import { Textarea } from '@app/components/ui/textarea';
-import { VOICE_PROVIDERS_CONFIG, getProviderConfig, mergeParameters } from '@app/config/voice-providers';
+import { VOICE_PROVIDERS_CONFIG, getProviderConfig } from '@app/config/voice-providers';
 import { extractErrorMessage } from '@app/lib/utils';
 import { useNotifyStore } from '@app/store';
-import {
-  getBooleanParameterWithDefault,
-  getNumberOrStringParameter,
-  getNumberParameterWithDefault,
-  getStringParameter,
-} from '@app/utils/parameter-helpers';
 import { TtsConfig, UpdateTtsConfigRequest } from '@app/types/tts-config';
 import { zodResolver } from '@hookform/resolvers/zod';
 import React, { useEffect, useState } from 'react';
@@ -43,9 +34,7 @@ const updateTtsConfigSchema = z.object({
   display_name: z.string().min(1, 'Display name is required').max(100, 'Display name must be 100 characters or less'),
   description: z.string().max(500, 'Description must be 500 characters or less').optional(),
   provider: z.enum(['elevenlabs', 'deepgram', 'cartesia'] as [string, ...string[]]),
-  voice_id: z.string().min(1, 'Voice ID is required'),
   api_key: z.string().optional(),
-  language: z.string().optional(),
 });
 
 type UpdateTtsConfigInput = z.infer<typeof updateTtsConfigSchema>;
@@ -59,8 +48,6 @@ interface EditTtsConfigDialogProps {
 
 const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpenChange, config, onSuccess }) => {
   const { notifySuccess, notifyError } = useNotifyStore();
-
-  const [parameters, setParameters] = useState<Record<string, unknown>>({});
   const [loading, setLoading] = useState(false);
 
   const form = useForm<UpdateTtsConfigInput>({
@@ -69,69 +56,28 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
       display_name: config.display_name,
       description: config.description || '',
       provider: config.provider,
-      voice_id: config.voice_id,
       api_key: '',
-      language: config.language || '',
     },
   });
 
-  const watchedProvider = form.watch('provider');
-
-  // Initialize parameters when dialog opens or config changes
+  // Reset form when dialog opens or config changes
   useEffect(() => {
     if (isOpen && config) {
       form.reset({
         display_name: config.display_name,
         description: config.description || '',
         provider: config.provider,
-        voice_id: config.voice_id,
         api_key: '',
-        language: config.language || '',
       });
-      // Merge saved parameters with defaults from config
-      setParameters(mergeParameters('tts', config.provider, config.parameters));
     }
   }, [isOpen, config, form]);
 
-  // Reset parameters when provider changes
-  useEffect(() => {
-    if (isOpen && watchedProvider && watchedProvider !== config.provider) {
-      setParameters(mergeParameters('tts', watchedProvider, null));
-    }
-  }, [watchedProvider, isOpen, config.provider]);
-
-  const setParameter = (key: string, value: unknown) => {
-    setParameters((prev) => ({ ...prev, [key]: value }));
-  };
-
-  const buildParameters = () => {
-    const providerConfig = getProviderConfig('tts', watchedProvider);
-    if (!providerConfig) return null;
-
-    const params: Record<string, unknown> = {};
-
-    Object.entries(parameters).forEach(([key, value]) => {
-      const paramConfig = providerConfig.parameters[key];
-      if (!paramConfig) return;
-
-      if (value !== '' && value !== undefined) {
-        params[key] = value;
-      }
-    });
-
-    return Object.keys(params).length > 0 ? params : null;
-  };
-
   const onSubmit = async (data: UpdateTtsConfigInput) => {
     setLoading(true);
     try {
       const updateData: UpdateTtsConfigRequest = {
         display_name: data.display_name.trim(),
         description: data.description?.trim() || null,
-        provider: data.provider as 'elevenlabs' | 'deepgram' | 'cartesia',
-        voice_id: data.voice_id.trim(),
-        language: data.language?.trim() || null,
-        parameters: buildParameters(),
       };
 
       if (data.api_key?.trim()) {
@@ -150,142 +96,6 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
     }
   };
 
-  const renderParameterField = (key: string) => {
-    const providerConfig = getProviderConfig('tts', watchedProvider);
-    if (!providerConfig) return null;
-
-    const paramConfig = providerConfig.parameters[key];
-    if (!paramConfig) return null;
-
-    switch (paramConfig.type) {
-      case 'boolean':
-        return (
-          <div key={key} className="col-span-2">
-            <div className="flex items-center space-x-2">
-              <Checkbox
-                id={key}
-                checked={getBooleanParameterWithDefault(parameters, key, paramConfig.default)}
-                onCheckedChange={(checked) => setParameter(key, checked)}
-              />
-              <Label htmlFor={key} className="cursor-pointer">
-                {paramConfig.description || key}
-              </Label>
-            </div>
-          </div>
-        );
-
-      case 'number':
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const numValue = getNumberParameterWithDefault(parameters, key, paramConfig.default);
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select
-                value={
-                  numValue !== undefined && numValue !== null
-                    ? String(numValue)
-                    : paramConfig.default !== undefined
-                      ? String(paramConfig.default)
-                      : ''
-                }
-                onValueChange={(val) => setParameter(key, val ? parseInt(val) : undefined)}
-              >
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={option} value={String(option)}>
-                      {option}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        if (paramConfig.min !== undefined && paramConfig.max !== undefined) {
-          const sliderValue = getNumberParameterWithDefault(parameters, key, paramConfig.default, paramConfig.min);
-          return (
-            <div key={key} className="col-span-2 space-y-2">
-              <Label>
-                {paramConfig.description || key}: {sliderValue}
-              </Label>
-              <Slider
-                min={paramConfig.min}
-                max={paramConfig.max}
-                step={paramConfig.step || 1}
-                value={[sliderValue]}
-                onValueChange={(values: number[]) => setParameter(key, values[0])}
-              />
-              {paramConfig.description && (
-                <p className="text-muted-foreground text-[0.8rem]">{paramConfig.description}</p>
-              )}
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="number"
-              value={getNumberOrStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value ? parseInt(e.target.value) : undefined)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">e.g., {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-
-      case 'string':
-      default:
-        if (key === 'language') return null;
-
-        if (paramConfig.options && paramConfig.options.length > 0) {
-          const selectValue =
-            getStringParameter(parameters, key) || (paramConfig.default ? String(paramConfig.default) : '') || '';
-          return (
-            <div key={key} className="space-y-2">
-              <Label>{paramConfig.description || key}</Label>
-              <Select value={selectValue} onValueChange={(val) => setParameter(key, val)}>
-                <SelectTrigger>
-                  <SelectValue placeholder="Select..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {paramConfig.options.map((option) => (
-                    <SelectItem key={String(option)} value={String(option)}>
-                      {String(option)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          );
-        }
-
-        return (
-          <div key={key} className="space-y-2">
-            <Label>{paramConfig.description || key}</Label>
-            <Input
-              type="text"
-              value={getStringParameter(parameters, key)}
-              onChange={(e) => setParameter(key, e.target.value)}
-              placeholder={paramConfig.placeholder}
-            />
-            {paramConfig.placeholder && (
-              <p className="text-muted-foreground text-[0.8rem]">Default: {paramConfig.placeholder}</p>
-            )}
-          </div>
-        );
-    }
-  };
-
-  const providerConfig = getProviderConfig('tts', watchedProvider);
-
   return (
     <Dialog open={isOpen} onOpenChange={onOpenChange}>
       <DialogContent className="max-h-[90vh] max-w-3xl overflow-y-auto">
@@ -306,7 +116,7 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
                       Display Name <span className="text-red-500">*</span>
                     </FormLabel>
                     <FormControl>
-                      <Input placeholder="e.g., OpenAI TTS English" maxLength={100} {...field} />
+                      <Input placeholder="e.g., ElevenLabs Production" maxLength={100} {...field} />
                     </FormControl>
                     <FormDescription>{field.value?.length || 0}/100 characters</FormDescription>
                     <FormMessage />
@@ -322,7 +132,7 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
                     <FormLabel>
                       Provider <span className="text-red-500">*</span>
                     </FormLabel>
-                    <Select onValueChange={field.onChange} value={field.value}>
+                    <Select onValueChange={field.onChange} value={field.value} disabled>
                       <FormControl>
                         <SelectTrigger>
                           <SelectValue placeholder="Select provider" />
@@ -339,6 +149,7 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
                         })}
                       </SelectContent>
                     </Select>
+                    <FormDescription>Provider cannot be changed after creation</FormDescription>
                     <FormMessage />
                   </FormItem>
                 )}
@@ -349,7 +160,7 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
               control={form.control}
               name="description"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>Description (Optional)</FormLabel>
                   <FormControl>
                     <Textarea
@@ -365,28 +176,11 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
               )}
             />
 
-            <FormField
-              control={form.control}
-              name="voice_id"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    Voice ID <span className="text-red-500">*</span>
-                  </FormLabel>
-                  <FormControl>
-                    <Input placeholder="e.g., alloy, echo, fable" {...field} />
-                  </FormControl>
-                  <FormDescription>Voice identifier for the selected provider</FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
             <FormField
               control={form.control}
               name="api_key"
               render={({ field }) => (
-                <FormItem className="col-span-2">
+                <FormItem>
                   <FormLabel>API Key (Optional - leave empty to keep existing)</FormLabel>
                   <FormControl>
                     <Input type="password" placeholder="Enter new API key to update" {...field} />
@@ -402,43 +196,12 @@ const EditTtsConfigDialog: React.FC<EditTtsConfigDialogProps> = ({ isOpen, onOpe
               )}
             />
 
-            {providerConfig?.parameters.language && (
-              <FormField
-                control={form.control}
-                name="language"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Language (Optional)</FormLabel>
-                    <FormControl>
-                      <Input placeholder="en-US, es-ES, fr-FR" {...field} />
-                    </FormControl>
-                    <FormDescription>
-                      Language code (e.g., en-US, es-ES). Most providers support automatic detection.
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            )}
-
-            {providerConfig &&
-              Object.keys(providerConfig.parameters).filter((key) => key !== 'language').length > 0 && (
-                <div className="rounded-lg border border-gray-200 p-4">
-                  <h3 className="mb-4 font-medium text-gray-900">Provider Parameters</h3>
-                  <div className="grid grid-cols-2 gap-6">
-                    {Object.keys(providerConfig.parameters)
-                      .filter((key) => key !== 'language')
-                      .map((key) => renderParameterField(key))}
-                  </div>
-                </div>
-              )}
-
             <DialogFooter>
               <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
                 Cancel
               </Button>
-              <Button type="submit" loading={loading}>
-                Update Configuration
+              <Button type="submit" disabled={loading}>
+                {loading ? 'Updating...' : 'Update Configuration'}
               </Button>
             </DialogFooter>
           </form>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/index.tsx
index e1bb1565..5347d100 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tts-configs/index.tsx
@@ -80,9 +80,7 @@ const TtsConfigsPage: React.FC = () => {
     return (
       config.display_name.toLowerCase().includes(query) ||
       (config.description && config.description.toLowerCase().includes(query)) ||
-      config.provider.toLowerCase().includes(query) ||
-      config.voice_id.toLowerCase().includes(query) ||
-      (config.language && config.language.toLowerCase().includes(query))
+      config.provider.toLowerCase().includes(query)
     );
   });
 
@@ -130,9 +128,7 @@ const TtsConfigsPage: React.FC = () => {
                 <TableRow>
                   <TableHead>Display Name</TableHead>
                   <TableHead>Provider</TableHead>
-                  <TableHead>Voice ID</TableHead>
                   <TableHead>Description</TableHead>
-                  <TableHead>Language</TableHead>
                   <TableHead>Created</TableHead>
                   <TableHead className="text-right">Actions</TableHead>
                 </TableRow>
@@ -142,9 +138,7 @@ const TtsConfigsPage: React.FC = () => {
                   <TableRow key={config.id}>
                     <TableCell className="font-medium">{config.display_name}</TableCell>
                     <TableCell>{config.provider}</TableCell>
-                    <TableCell>{config.voice_id}</TableCell>
                     <TableCell className="max-w-md truncate">{config.description || '-'}</TableCell>
-                    <TableCell>{config.language || '-'}</TableCell>
                     <TableCell>{new Date(config.created_at).toLocaleDateString()}</TableCell>
                     <TableCell className="text-right" onClick={(e) => e.stopPropagation()}>
                       <div className="flex items-center justify-end gap-2">
diff --git a/wavefront/client/src/types/stt-config.ts b/wavefront/client/src/types/stt-config.ts
index a4029a15..101c0330 100644
--- a/wavefront/client/src/types/stt-config.ts
+++ b/wavefront/client/src/types/stt-config.ts
@@ -7,8 +7,6 @@ export interface SttConfig {
   display_name: string;
   description: string | null;
   provider: SttProvider;
-  language: string | null;
-  parameters: Record<string, unknown> | null;
   is_deleted: boolean;
   created_at: string;
   updated_at: string;
@@ -19,17 +17,12 @@ export interface CreateSttConfigRequest {
   description?: string | null;
   provider: SttProvider;
   api_key: string;
-  language?: string | null;
-  parameters?: Record<string, unknown> | null;
 }
 
 export interface UpdateSttConfigRequest {
   display_name?: string;
   description?: string | null;
-  provider?: SttProvider;
   api_key?: string;
-  language?: string | null;
-  parameters?: Record<string, unknown> | null;
 }
 
 export interface SttConfigData {
diff --git a/wavefront/client/src/types/tts-config.ts b/wavefront/client/src/types/tts-config.ts
index 0ece8947..24e93155 100644
--- a/wavefront/client/src/types/tts-config.ts
+++ b/wavefront/client/src/types/tts-config.ts
@@ -7,9 +7,6 @@ export interface TtsConfig {
   display_name: string;
   description: string | null;
   provider: TtsProvider;
-  voice_id: string;
-  language: string | null;
-  parameters: Record<string, unknown> | null;
   is_deleted: boolean;
   created_at: string;
   updated_at: string;
@@ -19,20 +16,13 @@ export interface CreateTtsConfigRequest {
   display_name: string;
   description?: string | null;
   provider: TtsProvider;
-  voice_id: string;
   api_key: string;
-  language?: string | null;
-  parameters?: Record<string, unknown> | null;
 }
 
 export interface UpdateTtsConfigRequest {
   display_name?: string;
   description?: string | null;
-  provider?: TtsProvider;
-  voice_id?: string;
   api_key?: string;
-  language?: string | null;
-  parameters?: Record<string, unknown> | null;
 }
 
 export interface TtsConfigData {
diff --git a/wavefront/client/src/types/voice-agent.ts b/wavefront/client/src/types/voice-agent.ts
index 7a703ed1..8d0d8260 100644
--- a/wavefront/client/src/types/voice-agent.ts
+++ b/wavefront/client/src/types/voice-agent.ts
@@ -13,6 +13,9 @@ export interface VoiceAgent {
   telephony_config_id: string;
   system_prompt: string;
   welcome_message: string;
+  tts_voice_id: string;
+  tts_parameters: Record<string, unknown> | null;
+  stt_parameters: Record<string, unknown> | null;
   conversation_config: Record<string, unknown> | null;
   status: 'active' | 'inactive';
   inbound_numbers: string[];
@@ -36,6 +39,9 @@ export interface CreateVoiceAgentRequest {
   telephony_config_id: string;
   system_prompt: string;
   welcome_message: string;
+  tts_voice_id: string;
+  tts_parameters?: Record<string, unknown> | null;
+  stt_parameters?: Record<string, unknown> | null;
   conversation_config?: Record<string, unknown> | null;
   status?: 'active' | 'inactive';
   inbound_numbers?: string[];
@@ -57,6 +63,9 @@ export interface UpdateVoiceAgentRequest {
   telephony_config_id?: string;
   system_prompt?: string;
   welcome_message?: string;
+  tts_voice_id?: string;
+  tts_parameters?: Record<string, unknown> | null;
+  stt_parameters?: Record<string, unknown> | null;
   conversation_config?: Record<string, unknown> | null;
   status?: 'active' | 'inactive';
   inbound_numbers?: string[];

From ff9610d399f84d19f0c0e86a4aac2f64c65923dd Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Sat, 17 Jan 2026 13:31:40 +0530
Subject: [PATCH 7/8] added tool support

---
 wavefront/client/src/api/tool-service.ts      | 104 +++-
 wavefront/client/src/components/ui/badge.tsx  |  29 +
 .../client/src/hooks/data/fetch-hooks.ts      |  39 +-
 .../client/src/hooks/data/query-functions.ts  |  32 +-
 wavefront/client/src/hooks/data/query-keys.ts |  10 +-
 .../voice-agents/EditVoiceAgentDialog.tsx     |   7 +
 .../voice-agents/VoiceAgentToolsManager.tsx   | 186 ++++++
 .../apps/[appId]/voice-agents/layout.tsx      |   4 +
 .../voice-agents/tools/CreateToolDialog.tsx   | 453 +++++++++++++++
 .../voice-agents/tools/EditToolDialog.tsx     | 455 +++++++++++++++
 .../apps/[appId]/voice-agents/tools/index.tsx | 217 +++++++
 wavefront/client/src/router/routes.tsx        |   5 +
 wavefront/client/src/types/tool.ts            | 188 ++++++
 .../call_processing/cache/cache_utils.py      |   5 +
 .../constants/api_endpoints.py                |   1 +
 .../controllers/cache_controller.py           |  40 ++
 .../controllers/webhook_controller.py         |   1 +
 .../services/floware_http_client.py           |  46 ++
 .../services/pipecat_service.py               |  49 +-
 .../services/tool_wrapper_service.py          | 355 ++++++++++++
 .../services/voice_agent_cache_service.py     |  40 +-
 .../server/apps/floware/floware/server.py     |   2 +
 ...4d5e6f7_create_voice_agent_tools_tables.py | 148 +++++
 .../db_repo_module/models/voice_agent_tool.py |  81 +++
 .../models/voice_agent_tool_association.py    |  58 ++
 .../controllers/tool_controller.py            | 314 ++++++++++
 .../models/tool_schemas.py                    | 294 ++++++++++
 .../services/tool_service.py                  | 538 ++++++++++++++++++
 .../voice_agents_container.py                 |  22 +
 29 files changed, 3700 insertions(+), 23 deletions(-)
 create mode 100644 wavefront/client/src/components/ui/badge.tsx
 create mode 100644 wavefront/client/src/pages/apps/[appId]/voice-agents/VoiceAgentToolsManager.tsx
 create mode 100644 wavefront/client/src/pages/apps/[appId]/voice-agents/tools/CreateToolDialog.tsx
 create mode 100644 wavefront/client/src/pages/apps/[appId]/voice-agents/tools/EditToolDialog.tsx
 create mode 100644 wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
 create mode 100644 wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
 create mode 100644 wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
 create mode 100644 wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool.py
 create mode 100644 wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool_association.py
 create mode 100644 wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tool_controller.py
 create mode 100644 wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
 create mode 100644 wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py

diff --git a/wavefront/client/src/api/tool-service.ts b/wavefront/client/src/api/tool-service.ts
index 5ed8b3ea..e432b980 100644
--- a/wavefront/client/src/api/tool-service.ts
+++ b/wavefront/client/src/api/tool-service.ts
@@ -1,22 +1,112 @@
 import { IApiResponse } from '@app/lib/axios';
-import { ToolDetailsData, ToolDetailsResponse, ToolNamesData, ToolNamesResponse } from '@app/types/tool';
+import {
+  VoiceAgentTool,
+  CreateToolRequest,
+  UpdateToolRequest,
+  AttachToolToAgentRequest,
+  UpdateAgentToolRequest,
+  ListToolsParams,
+  ToolResponse,
+  ToolDetailResponse,
+  ToolListResponse,
+  AgentToolsResponse,
+  ToolListData,
+  AgentToolsData,
+  ToolData,
+} from '@app/types/tool';
 import { AxiosInstance } from 'axios';
 
 export class ToolService {
   constructor(private http: AxiosInstance) {}
 
-  async getToolNames(): Promise<ToolNamesResponse> {
-    const response: IApiResponse<ToolNamesData> = await this.http.get(`/v1/:appId/floware/v1/tools/names`);
+  /**
+   * Create a new tool
+   */
+  async createTool(data: CreateToolRequest): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.post(`/v1/:appId/floware/v1/tools`, data);
     return response;
   }
 
-  async getToolNamesAndDetails(): Promise<ToolNamesResponse> {
-    const response: IApiResponse<ToolNamesData> = await this.http.get(`/v1/:appId/floware/v1/tools/tool-details`);
+  /**
+   * Get a single tool by ID
+   */
+  async getTool(toolId: string): Promise<ToolDetailResponse> {
+    const response: IApiResponse<VoiceAgentTool> = await this.http.get(`/v1/:appId/floware/v1/tools/${toolId}`);
     return response;
   }
 
-  async getToolDetails(toolName: string): Promise<ToolDetailsResponse> {
-    const response: IApiResponse<ToolDetailsData> = await this.http.get(`/v1/:appId/floware/v1/tools/${toolName}`);
+  /**
+   * List all tools with optional filters
+   */
+  async listTools(params?: ListToolsParams): Promise<ToolListResponse> {
+    const response: IApiResponse<ToolListData> = await this.http.get(`/v1/:appId/floware/v1/tools`, { params });
+    return response;
+  }
+
+  /**
+   * Get tool names and details
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  async getToolNamesAndDetails(): Promise<any> {
+    const response = await this.http.get(`/v1/:appId/floware/v1/tools/names`);
+    return response;
+  }
+
+  /**
+   * Update an existing tool
+   */
+  async updateTool(toolId: string, data: UpdateToolRequest): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.patch(`/v1/:appId/floware/v1/tools/${toolId}`, data);
+    return response;
+  }
+
+  /**
+   * Delete a tool (soft delete)
+   */
+  async deleteTool(toolId: string): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.delete(`/v1/:appId/floware/v1/tools/${toolId}`);
+    return response;
+  }
+
+  /**
+   * Attach a tool to a voice agent
+   */
+  async attachToolToAgent(agentId: string, data: AttachToolToAgentRequest): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.post(
+      `/v1/:appId/floware/v1/voice-agents/${agentId}/tools`,
+      data
+    );
+    return response;
+  }
+
+  /**
+   * Get all tools attached to a voice agent
+   */
+  async getAgentTools(agentId: string): Promise<AgentToolsResponse> {
+    const response: IApiResponse<AgentToolsData> = await this.http.get(
+      `/v1/:appId/floware/v1/voice-agents/${agentId}/tools`
+    );
+    return response;
+  }
+
+  /**
+   * Update a tool association for a voice agent
+   */
+  async updateAgentTool(agentId: string, toolId: string, data: UpdateAgentToolRequest): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.patch(
+      `/v1/:appId/floware/v1/voice-agents/${agentId}/tools/${toolId}`,
+      data
+    );
+    return response;
+  }
+
+  /**
+   * Detach a tool from a voice agent
+   */
+  async detachToolFromAgent(agentId: string, toolId: string): Promise<ToolResponse> {
+    const response: IApiResponse<ToolData> = await this.http.delete(
+      `/v1/:appId/floware/v1/voice-agents/${agentId}/tools/${toolId}`
+    );
     return response;
   }
 }
diff --git a/wavefront/client/src/components/ui/badge.tsx b/wavefront/client/src/components/ui/badge.tsx
new file mode 100644
index 00000000..27be7fda
--- /dev/null
+++ b/wavefront/client/src/components/ui/badge.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { cva, type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@app/lib/utils';
+
+const badgeVariants = cva(
+  'inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
+  {
+    variants: {
+      variant: {
+        default: 'border-transparent bg-primary text-primary-foreground hover:bg-primary/80',
+        secondary: 'border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80',
+        destructive: 'border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80',
+        outline: 'text-foreground',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  }
+);
+
+export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
+
+function Badge({ className, variant, ...props }: BadgeProps) {
+  return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
+}
+
+export { Badge, badgeVariants };
diff --git a/wavefront/client/src/hooks/data/fetch-hooks.ts b/wavefront/client/src/hooks/data/fetch-hooks.ts
index 41da45a3..c49feb3d 100644
--- a/wavefront/client/src/hooks/data/fetch-hooks.ts
+++ b/wavefront/client/src/hooks/data/fetch-hooks.ts
@@ -12,7 +12,7 @@ import { MessageProcessor, MessageProcessorListItem } from '@app/types/message-p
 import { Pipeline, PipelineFile, PipelineStatus } from '@app/types/pipeline';
 import { SttConfig } from '@app/types/stt-config';
 import { TelephonyConfig } from '@app/types/telephony-config';
-import { ToolDetails } from '@app/types/tool';
+import { ToolDetails, VoiceAgentTool, VoiceAgentToolWithAssociation } from '@app/types/tool';
 import { TtsConfig } from '@app/types/tts-config';
 import { VoiceAgent } from '@app/types/voice-agent';
 import { WorkflowListItem, WorkflowPipelineListItem, WorkflowRunListData } from '@app/types/workflow';
@@ -54,12 +54,15 @@ import {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
+  getUsersQueryFn,
   getVoiceAgentQueryFn,
+  getVoiceAgentToolQueryFn,
+  getVoiceAgentToolsQueryFn,
+  getAgentToolsQueryFn,
   getVoiceAgentsQueryFn,
   getWorkflowPipelinesQueryFn,
   getWorkflowRunsQueryFn,
   getWorkflowsQueryFn,
-  getUsersQueryFn,
   readYamlQueryFn,
 } from './query-functions';
 import {
@@ -97,12 +100,15 @@ import {
   getToolsKey,
   getTtsConfigKey,
   getTtsConfigsKey,
+  getUsersKey,
   getVoiceAgentKey,
+  getVoiceAgentToolKey,
+  getVoiceAgentToolsKey,
+  getAgentToolsKey,
   getVoiceAgentsKey,
   getWorkflowPipelinesKey,
   getWorkflowRunsKey,
   getWorkflowsKey,
-  getUsersKey,
   readYamlKey,
 } from './query-keys';
 
@@ -414,3 +420,30 @@ export const useGetAppById = (appId: string, enabled: boolean = true): UseQueryR
 export const useGetUsers = (): UseQueryResult<IUser[], Error> => {
   return useQueryInit(getUsersKey(), getUsersQueryFn, true);
 };
+
+// Voice Agent Tools Hooks
+export const useGetVoiceAgentTools = (appId: string | undefined): UseQueryResult<VoiceAgentTool[], Error> => {
+  return useQueryInit(getVoiceAgentToolsKey(appId || ''), getVoiceAgentToolsQueryFn, !!appId);
+};
+
+export const useGetVoiceAgentTool = (
+  appId: string | undefined,
+  toolId: string | undefined
+): UseQueryResult<VoiceAgentTool | null, Error> => {
+  return useQueryInit(
+    getVoiceAgentToolKey(appId || '', toolId || ''),
+    () => getVoiceAgentToolQueryFn(toolId!),
+    !!appId && !!toolId
+  );
+};
+
+export const useGetAgentTools = (
+  appId: string | undefined,
+  agentId: string | undefined
+): UseQueryResult<VoiceAgentToolWithAssociation[], Error> => {
+  return useQueryInit(
+    getAgentToolsKey(appId || '', agentId || ''),
+    () => getAgentToolsQueryFn(agentId!),
+    !!appId && !!agentId
+  );
+};
diff --git a/wavefront/client/src/hooks/data/query-functions.ts b/wavefront/client/src/hooks/data/query-functions.ts
index a7a12619..4b463c6f 100644
--- a/wavefront/client/src/hooks/data/query-functions.ts
+++ b/wavefront/client/src/hooks/data/query-functions.ts
@@ -11,7 +11,7 @@ import { MessageProcessor, MessageProcessorListItem } from '@app/types/message-p
 import { Pipeline, PipelineFile, PipelineStatus } from '@app/types/pipeline';
 import { SttConfig } from '@app/types/stt-config';
 import { TelephonyConfig } from '@app/types/telephony-config';
-import { ToolDetails } from '@app/types/tool';
+import { ToolDetails, VoiceAgentTool, VoiceAgentToolWithAssociation } from '@app/types/tool';
 import { TtsConfig } from '@app/types/tts-config';
 import { IUser } from '@app/types/user';
 import { VoiceAgent } from '@app/types/voice-agent';
@@ -371,6 +371,31 @@ const getAppByIdFn = async (appId: string) => {
   return data?.app;
 };
 
+// Voice Agent Tools Query Functions
+const getVoiceAgentToolsQueryFn = async (): Promise<VoiceAgentTool[]> => {
+  const response = await floConsoleService.toolService.listTools();
+  if (response.data?.meta?.status === 'success' && response.data.data?.tools) {
+    return response.data.data.tools;
+  }
+  return [];
+};
+
+const getVoiceAgentToolQueryFn = async (toolId: string): Promise<VoiceAgentTool | null> => {
+  const response = await floConsoleService.toolService.getTool(toolId);
+  if (response.data?.meta?.status === 'success' && response.data.data) {
+    return response.data.data;
+  }
+  return null;
+};
+
+const getAgentToolsQueryFn = async (agentId: string): Promise<VoiceAgentToolWithAssociation[]> => {
+  const response = await floConsoleService.toolService.getAgentTools(agentId);
+  if (response.data?.meta?.status === 'success' && response.data.data?.tools) {
+    return response.data.data.tools;
+  }
+  return [];
+};
+
 const getUsersQueryFn = async (): Promise<IUser[]> => {
   const response = await floConsoleService.userService.listUsers();
   if (response.data?.data?.users && Array.isArray(response.data.data.users)) {
@@ -382,6 +407,7 @@ const getUsersQueryFn = async (): Promise<IUser[]> => {
 export {
   getAgentQueryFn,
   getAgentsQueryFn,
+  getAgentToolsQueryFn,
   getAllAppsQueryFn,
   getAllDatasourcesQueryFn,
   getAllYamlsQueryFn,
@@ -414,11 +440,13 @@ export {
   getToolsQueryFn,
   getTtsConfigQueryFn,
   getTtsConfigsQueryFn,
+  getUsersQueryFn,
   getVoiceAgentQueryFn,
+  getVoiceAgentToolQueryFn,
+  getVoiceAgentToolsQueryFn,
   getVoiceAgentsQueryFn,
   getWorkflowPipelinesQueryFn,
   getWorkflowRunsQueryFn,
   getWorkflowsQueryFn,
-  getUsersQueryFn,
   readYamlQueryFn,
 };
diff --git a/wavefront/client/src/hooks/data/query-keys.ts b/wavefront/client/src/hooks/data/query-keys.ts
index 4f9dae8c..b7cddee6 100644
--- a/wavefront/client/src/hooks/data/query-keys.ts
+++ b/wavefront/client/src/hooks/data/query-keys.ts
@@ -64,10 +64,14 @@ const getPipelineFilesKey = (appId: string, pipelineId: string) => ['pipeline-fi
 const getAppByIdKey = (appId: string) => ['app-by-id', appId];
 const getUsersKey = () => ['users'];
 const getUserKey = (userId: string) => ['user', userId];
+const getVoiceAgentToolsKey = (appId: string) => ['voice-agent-tools', appId];
+const getVoiceAgentToolKey = (appId: string, toolId: string) => ['voice-agent-tool', appId, toolId];
+const getAgentToolsKey = (appId: string, agentId: string) => ['agent-tools', appId, agentId];
 
 export {
   getAgentKey,
   getAgentsKey,
+  getAgentToolsKey,
   getAllAppsKey,
   getAllDatasourcesKey,
   getApiServiceKey,
@@ -100,12 +104,14 @@ export {
   getToolsKey,
   getTtsConfigKey,
   getTtsConfigsKey,
+  getUserKey,
+  getUsersKey,
   getVoiceAgentKey,
+  getVoiceAgentToolKey,
+  getVoiceAgentToolsKey,
   getVoiceAgentsKey,
   getWorkflowPipelinesKey,
   getWorkflowRunsKey,
   getWorkflowsKey,
   getAppByIdKey,
-  getUserKey,
-  getUsersKey,
 };
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
index 21f358f4..66894768 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
@@ -8,6 +8,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@app/components/ui/dialog';
+import VoiceAgentToolsManager from './VoiceAgentToolsManager';
 import {
   Form,
   FormControl,
@@ -989,6 +990,12 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
                   )}
                 />
               </div>
+
+              {/* Tools Section */}
+              <div className="space-y-4">
+                <h3 className="text-sm font-semibold">Tools & Function Calling</h3>
+                <VoiceAgentToolsManager appId={appId} agentId={agent.id} />
+              </div>
             </div>
 
             <DialogFooter>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/VoiceAgentToolsManager.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/VoiceAgentToolsManager.tsx
new file mode 100644
index 00000000..59b7a9e0
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/VoiceAgentToolsManager.tsx
@@ -0,0 +1,186 @@
+import floConsoleService from '@app/api';
+import { Button } from '@app/components/ui/button';
+import { Switch } from '@app/components/ui/switch';
+import { Badge } from '@app/components/ui/badge';
+import { useGetVoiceAgentTools, useGetAgentTools } from '@app/hooks';
+import { getVoiceAgentToolsKey, getAgentToolsKey } from '@app/hooks/data/query-keys';
+import { extractErrorMessage } from '@app/lib/utils';
+import { useNotifyStore } from '@app/store';
+import { useQueryClient } from '@tanstack/react-query';
+import { Plus, X } from 'lucide-react';
+import React, { useState } from 'react';
+
+interface VoiceAgentToolsManagerProps {
+  appId: string;
+  agentId: string;
+}
+
+const VoiceAgentToolsManager: React.FC<VoiceAgentToolsManagerProps> = ({ appId, agentId }) => {
+  const queryClient = useQueryClient();
+  const { notifySuccess, notifyError } = useNotifyStore();
+  const [loadingToolId, setLoadingToolId] = useState<string | null>(null);
+
+  // Fetch all tools
+  const { data: allTools = [], isLoading: allToolsLoading } = useGetVoiceAgentTools(appId);
+
+  // Fetch tools attached to this agent
+  const { data: agentTools = [], isLoading: agentToolsLoading } = useGetAgentTools(appId, agentId);
+
+  const attachedToolIds = new Set(agentTools.map((t) => t.id));
+  const availableTools = allTools.filter((t) => !attachedToolIds.has(t.id));
+
+  const handleToggleEnabled = async (toolId: string, currentEnabled: boolean) => {
+    setLoadingToolId(toolId);
+    try {
+      await floConsoleService.toolService.updateAgentTool(agentId, toolId, {
+        is_enabled: !currentEnabled,
+      });
+      notifySuccess(`Tool ${!currentEnabled ? 'enabled' : 'disabled'} successfully`);
+      queryClient.invalidateQueries({ queryKey: getAgentToolsKey(appId, agentId) });
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to toggle tool');
+    } finally {
+      setLoadingToolId(null);
+    }
+  };
+
+  const handleAttachTool = async (toolId: string) => {
+    setLoadingToolId(toolId);
+    try {
+      await floConsoleService.toolService.attachToolToAgent(agentId, {
+        tool_id: toolId,
+        is_enabled: true,
+        priority: 0,
+      });
+      notifySuccess('Tool attached successfully');
+      queryClient.invalidateQueries({ queryKey: getAgentToolsKey(appId, agentId) });
+      queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(appId) });
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to attach tool');
+    } finally {
+      setLoadingToolId(null);
+    }
+  };
+
+  const handleDetachTool = async (toolId: string) => {
+    setLoadingToolId(toolId);
+    try {
+      await floConsoleService.toolService.detachToolFromAgent(agentId, toolId);
+      notifySuccess('Tool detached successfully');
+      queryClient.invalidateQueries({ queryKey: getAgentToolsKey(appId, agentId) });
+      queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(appId) });
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to detach tool');
+    } finally {
+      setLoadingToolId(null);
+    }
+  };
+
+  const getToolTypeColor = (type: string) => {
+    return type === 'api' ? 'bg-blue-100 text-blue-800' : 'bg-purple-100 text-purple-800';
+  };
+
+  if (allToolsLoading || agentToolsLoading) {
+    return (
+      <div className="flex justify-center py-4">
+        <div className="text-sm text-gray-500">Loading tools...</div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Attached Tools */}
+      <div>
+        <h4 className="mb-3 text-sm font-semibold">Attached Tools ({agentTools.length})</h4>
+        {agentTools.length === 0 ? (
+          <div className="rounded-md border border-dashed p-4 text-center text-sm text-gray-500">
+            No tools attached to this agent yet. Add tools from the available tools below.
+          </div>
+        ) : (
+          <div className="space-y-2">
+            {agentTools.map((tool) => (
+              <div
+                key={tool.id}
+                className="flex items-center justify-between rounded-md border bg-white p-3 hover:bg-gray-50"
+              >
+                <div className="flex flex-1 items-center gap-3">
+                  <Badge className={getToolTypeColor(tool.tool_type)}>{tool.tool_type.toUpperCase()}</Badge>
+                  <div className="flex-1">
+                    <div className="font-medium">{tool.display_name}</div>
+                    <div className="text-xs text-gray-500">Function: {tool.name}</div>
+                  </div>
+                </div>
+                <div className="flex items-center gap-3">
+                  <div className="flex items-center gap-2">
+                    <span className="text-sm text-gray-600">
+                      {tool.association.is_enabled ? 'Enabled' : 'Disabled'}
+                    </span>
+                    <Switch
+                      checked={tool.association.is_enabled}
+                      onCheckedChange={() => handleToggleEnabled(tool.id, tool.association.is_enabled)}
+                      disabled={loadingToolId === tool.id}
+                    />
+                  </div>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    onClick={() => handleDetachTool(tool.id)}
+                    disabled={loadingToolId === tool.id}
+                    title="Detach tool"
+                  >
+                    <X className="h-4 w-4 text-red-600" />
+                  </Button>
+                </div>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+
+      {/* Available Tools */}
+      <div>
+        <h4 className="mb-3 text-sm font-semibold">Available Tools ({availableTools.length})</h4>
+        {availableTools.length === 0 ? (
+          <div className="rounded-md border border-dashed p-4 text-center text-sm text-gray-500">
+            {allTools.length === 0
+              ? 'No tools available. Create tools first from the Tools page.'
+              : 'All available tools are already attached to this agent.'}
+          </div>
+        ) : (
+          <div className="space-y-2">
+            {availableTools.map((tool) => (
+              <div
+                key={tool.id}
+                className="flex items-center justify-between rounded-md border bg-gray-50 p-3 hover:bg-gray-100"
+              >
+                <div className="flex flex-1 items-center gap-3">
+                  <Badge className={getToolTypeColor(tool.tool_type)}>{tool.tool_type.toUpperCase()}</Badge>
+                  <div className="flex-1">
+                    <div className="font-medium">{tool.display_name}</div>
+                    <div className="text-xs text-gray-500">Function: {tool.name}</div>
+                    <div className="mt-1 text-xs text-gray-600">{tool.description}</div>
+                  </div>
+                </div>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => handleAttachTool(tool.id)}
+                  disabled={loadingToolId === tool.id}
+                >
+                  <Plus className="mr-1 h-4 w-4" />
+                  Attach
+                </Button>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default VoiceAgentToolsManager;
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/layout.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/layout.tsx
index 74d1e3d8..971f4d1b 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/layout.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/layout.tsx
@@ -28,6 +28,9 @@ const VoiceAgentsLayout: React.FC = () => {
     if (location.pathname.startsWith(`${basePath}/telephony-configs`)) {
       return 'telephony-configs';
     }
+    if (location.pathname.startsWith(`${basePath}/tools`)) {
+      return 'tools';
+    }
     return 'agents';
   };
 
@@ -88,6 +91,7 @@ const VoiceAgentsLayout: React.FC = () => {
           <Tabs value={activeTab} onValueChange={handleTabChange} className="w-full">
             <TabsList>
               <TabsTrigger value="agents">Agents</TabsTrigger>
+              <TabsTrigger value="tools">Tools</TabsTrigger>
               <TabsTrigger value="stt-configs">STT Configs</TabsTrigger>
               <TabsTrigger value="tts-configs">TTS Configs</TabsTrigger>
               <TabsTrigger value="telephony-configs">Telephony Configs</TabsTrigger>
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/CreateToolDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/CreateToolDialog.tsx
new file mode 100644
index 00000000..86233b43
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/CreateToolDialog.tsx
@@ -0,0 +1,453 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import floConsoleService from '@app/api';
+import { Button } from '@app/components/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@app/components/ui/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@app/components/ui/form';
+import { Input } from '@app/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Textarea } from '@app/components/ui/textarea';
+import { extractErrorMessage } from '@app/lib/utils';
+import { useNotifyStore } from '@app/store';
+import { zodResolver } from '@hookform/resolvers/zod';
+import React, { useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'] as const;
+const AUTH_TYPES = ['none', 'bearer', 'api_key', 'basic'] as const;
+
+const createToolSchema = z.object({
+  name: z
+    .string()
+    .min(1, 'Name is required')
+    .max(100, 'Name must be 100 characters or less')
+    .regex(/^[a-z_][a-z0-9_]*$/, 'Name must follow Python function naming (lowercase, underscores, no spaces)'),
+  display_name: z.string().min(1, 'Display name is required').max(255, 'Display name must be 255 characters or less'),
+  description: z.string().min(1, 'Description is required'),
+  tool_type: z.enum(['api', 'python']),
+  // API Config fields
+  method: z.enum(HTTP_METHODS).optional(),
+  url: z.string().url('Must be a valid URL').optional(),
+  timeout: z.number().min(1).max(300).optional(),
+  auth_type: z.enum(AUTH_TYPES).optional(),
+  auth_token: z.string().optional(),
+  api_key_name: z.string().optional(),
+  api_key_value: z.string().optional(),
+  basic_username: z.string().optional(),
+  basic_password: z.string().optional(),
+  // Parameter schema as JSON string
+  parameter_schema: z.string().optional(),
+});
+
+type CreateToolInput = z.infer<typeof createToolSchema>;
+
+interface CreateToolDialogProps {
+  isOpen: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSuccess?: () => void;
+}
+
+const CreateToolDialog: React.FC<CreateToolDialogProps> = ({ isOpen, onOpenChange, onSuccess }) => {
+  const { notifySuccess, notifyError } = useNotifyStore();
+  const [loading, setLoading] = useState(false);
+
+  const form = useForm<CreateToolInput>({
+    resolver: zodResolver(createToolSchema),
+    defaultValues: {
+      name: '',
+      display_name: '',
+      description: '',
+      tool_type: 'api',
+      method: 'POST',
+      url: '',
+      timeout: 30,
+      auth_type: 'none',
+      auth_token: '',
+      api_key_name: 'X-API-Key',
+      api_key_value: '',
+      basic_username: '',
+      basic_password: '',
+      parameter_schema: '',
+    },
+  });
+
+  const watchToolType = form.watch('tool_type');
+  const watchAuthType = form.watch('auth_type');
+
+  // Reset form when dialog closes
+  useEffect(() => {
+    if (!isOpen) {
+      form.reset();
+    }
+  }, [isOpen, form]);
+
+  const onSubmit = async (data: CreateToolInput) => {
+    setLoading(true);
+    try {
+      let config: any = {};
+      let parameterSchema: any = undefined;
+
+      if (data.tool_type === 'api') {
+        const authCredentials: Record<string, string> = {};
+        if (data.auth_type === 'bearer' && data.auth_token) {
+          authCredentials.token = data.auth_token;
+        } else if (data.auth_type === 'api_key' && data.api_key_value) {
+          authCredentials.key_name = data.api_key_name || 'X-API-Key';
+          authCredentials.key_value = data.api_key_value;
+        } else if (data.auth_type === 'basic' && data.basic_username && data.basic_password) {
+          authCredentials.username = data.basic_username;
+          authCredentials.password = data.basic_password;
+        }
+
+        config = {
+          method: data.method,
+          url: data.url,
+          timeout: data.timeout || 30,
+          auth_type: data.auth_type || 'none',
+          auth_credentials: Object.keys(authCredentials).length > 0 ? authCredentials : undefined,
+        };
+      }
+
+      // Parse parameter schema if provided
+      if (data.parameter_schema && data.parameter_schema.trim()) {
+        try {
+          parameterSchema = JSON.parse(data.parameter_schema);
+        } catch {
+          notifyError('Invalid JSON in parameter schema');
+          setLoading(false);
+          return;
+        }
+      }
+
+      await floConsoleService.toolService.createTool({
+        name: data.name.trim(),
+        display_name: data.display_name.trim(),
+        description: data.description.trim(),
+        tool_type: data.tool_type,
+        config,
+        parameter_schema: parameterSchema,
+      });
+
+      notifySuccess('Tool created successfully');
+      onSuccess?.();
+      onOpenChange(false);
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to create tool');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogContent className="max-h-[90vh] max-w-4xl overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Create Tool</DialogTitle>
+          <DialogDescription>Create a new tool that voice agents can use during conversations</DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+            {/* Basic Information */}
+            <div className="space-y-4">
+              <h3 className="text-lg font-semibold">Basic Information</h3>
+
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Function Name*</FormLabel>
+                    <FormControl>
+                      <Input placeholder="e.g., get_weather, book_appointment" {...field} />
+                    </FormControl>
+                    <FormDescription>Python-style naming: lowercase letters, numbers, underscores only</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="display_name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Display Name*</FormLabel>
+                    <FormControl>
+                      <Input placeholder="e.g., Weather API, Booking System" {...field} />
+                    </FormControl>
+                    <FormDescription>Human-readable name for the tool</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="description"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Description*</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        placeholder="Describe what this tool does and when the LLM should use it"
+                        rows={3}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormDescription>The LLM uses this description to decide when to call this tool</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="tool_type"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Tool Type*</FormLabel>
+                    <Select onValueChange={field.onChange} defaultValue={field.value}>
+                      <FormControl>
+                        <SelectTrigger>
+                          <SelectValue placeholder="Select tool type" />
+                        </SelectTrigger>
+                      </FormControl>
+                      <SelectContent>
+                        <SelectItem value="api">API Tool</SelectItem>
+                        <SelectItem value="python" disabled>
+                          Python Tool (Coming Soon)
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            {/* API Configuration */}
+            {watchToolType === 'api' && (
+              <div className="space-y-4">
+                <h3 className="text-lg font-semibold">API Configuration</h3>
+
+                <div className="grid grid-cols-2 gap-4">
+                  <FormField
+                    control={form.control}
+                    name="method"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>HTTP Method*</FormLabel>
+                        <Select onValueChange={field.onChange} defaultValue={field.value}>
+                          <FormControl>
+                            <SelectTrigger>
+                              <SelectValue />
+                            </SelectTrigger>
+                          </FormControl>
+                          <SelectContent>
+                            {HTTP_METHODS.map((method) => (
+                              <SelectItem key={method} value={method}>
+                                {method}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="timeout"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Timeout (seconds)</FormLabel>
+                        <FormControl>
+                          <Input
+                            type="number"
+                            {...field}
+                            onChange={(e) => field.onChange(parseInt(e.target.value) || 30)}
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                </div>
+
+                <FormField
+                  control={form.control}
+                  name="url"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>API URL*</FormLabel>
+                      <FormControl>
+                        <Input placeholder="https://api.example.com/endpoint" {...field} />
+                      </FormControl>
+                      <FormDescription>Full URL to the API endpoint</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="auth_type"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Authentication Type</FormLabel>
+                      <Select onValueChange={field.onChange} defaultValue={field.value}>
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          <SelectItem value="none">None</SelectItem>
+                          <SelectItem value="bearer">Bearer Token</SelectItem>
+                          <SelectItem value="api_key">API Key</SelectItem>
+                          <SelectItem value="basic">Basic Auth</SelectItem>
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                {watchAuthType === 'bearer' && (
+                  <FormField
+                    control={form.control}
+                    name="auth_token"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Bearer Token</FormLabel>
+                        <FormControl>
+                          <Input type="password" placeholder="Enter bearer token" {...field} />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                )}
+
+                {watchAuthType === 'api_key' && (
+                  <div className="grid grid-cols-2 gap-4">
+                    <FormField
+                      control={form.control}
+                      name="api_key_name"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>API Key Header Name</FormLabel>
+                          <FormControl>
+                            <Input placeholder="X-API-Key" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                    <FormField
+                      control={form.control}
+                      name="api_key_value"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>API Key Value</FormLabel>
+                          <FormControl>
+                            <Input type="password" placeholder="Enter API key" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                )}
+
+                {watchAuthType === 'basic' && (
+                  <div className="grid grid-cols-2 gap-4">
+                    <FormField
+                      control={form.control}
+                      name="basic_username"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>Username</FormLabel>
+                          <FormControl>
+                            <Input placeholder="Enter username" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                    <FormField
+                      control={form.control}
+                      name="basic_password"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>Password</FormLabel>
+                          <FormControl>
+                            <Input type="password" placeholder="Enter password" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                )}
+              </div>
+            )}
+
+            {/* Parameter Schema */}
+            <div className="space-y-4">
+              <h3 className="text-lg font-semibold">Parameter Schema (Optional)</h3>
+              <FormField
+                control={form.control}
+                name="parameter_schema"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>JSON Schema</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        placeholder='{"type": "object", "properties": {"location": {"type": "string"}}}'
+                        rows={6}
+                        className="font-mono text-sm"
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormDescription>JSON Schema defining the parameters this tool accepts</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            <DialogFooter>
+              <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
+                Cancel
+              </Button>
+              <Button type="submit" disabled={loading}>
+                {loading ? 'Creating...' : 'Create Tool'}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default CreateToolDialog;
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/EditToolDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/EditToolDialog.tsx
new file mode 100644
index 00000000..f38b3fac
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/EditToolDialog.tsx
@@ -0,0 +1,455 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import floConsoleService from '@app/api';
+import { Button } from '@app/components/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@app/components/ui/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@app/components/ui/form';
+import { Input } from '@app/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@app/components/ui/select';
+import { Textarea } from '@app/components/ui/textarea';
+import { extractErrorMessage } from '@app/lib/utils';
+import { useNotifyStore } from '@app/store';
+import { VoiceAgentTool, ApiToolConfig } from '@app/types/tool';
+import { zodResolver } from '@hookform/resolvers/zod';
+import React, { useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'] as const;
+const AUTH_TYPES = ['none', 'bearer', 'api_key', 'basic'] as const;
+
+const editToolSchema = z.object({
+  display_name: z.string().min(1, 'Display name is required').max(255, 'Display name must be 255 characters or less'),
+  description: z.string().min(1, 'Description is required'),
+  // API Config fields
+  method: z.enum(HTTP_METHODS).optional(),
+  url: z.string().url('Must be a valid URL').optional(),
+  timeout: z.number().min(1).max(300).optional(),
+  auth_type: z.enum(AUTH_TYPES).optional(),
+  auth_token: z.string().optional(),
+  api_key_name: z.string().optional(),
+  api_key_value: z.string().optional(),
+  basic_username: z.string().optional(),
+  basic_password: z.string().optional(),
+  // Parameter schema as JSON string
+  parameter_schema: z.string().optional(),
+});
+
+type EditToolInput = z.infer<typeof editToolSchema>;
+
+interface EditToolDialogProps {
+  isOpen: boolean;
+  onOpenChange: (open: boolean) => void;
+  tool: VoiceAgentTool;
+  onSuccess?: () => void;
+}
+
+const EditToolDialog: React.FC<EditToolDialogProps> = ({ isOpen, onOpenChange, tool, onSuccess }) => {
+  const { notifySuccess, notifyError } = useNotifyStore();
+  const [loading, setLoading] = useState(false);
+
+  const form = useForm<EditToolInput>({
+    resolver: zodResolver(editToolSchema),
+    defaultValues: {
+      display_name: '',
+      description: '',
+      method: 'POST',
+      url: '',
+      timeout: 30,
+      auth_type: 'none',
+      auth_token: '',
+      api_key_name: 'X-API-Key',
+      api_key_value: '',
+      basic_username: '',
+      basic_password: '',
+      parameter_schema: '',
+    },
+  });
+
+  const watchAuthType = form.watch('auth_type');
+
+  // Load tool data when dialog opens
+  useEffect(() => {
+    if (isOpen && tool) {
+      const apiConfig = tool.config as ApiToolConfig;
+
+      form.reset({
+        display_name: tool.display_name,
+        description: tool.description,
+        method: apiConfig?.method || 'POST',
+        url: apiConfig?.url || '',
+        timeout: apiConfig?.timeout || 30,
+        auth_type: apiConfig?.auth_type || 'none',
+        auth_token: '',
+        api_key_name: apiConfig?.auth_credentials?.key_name || 'X-API-Key',
+        api_key_value: '',
+        basic_username: apiConfig?.auth_credentials?.username || '',
+        basic_password: '',
+        parameter_schema: tool.parameter_schema ? JSON.stringify(tool.parameter_schema, null, 2) : '',
+      });
+    }
+  }, [isOpen, tool, form]);
+
+  const onSubmit = async (data: EditToolInput) => {
+    setLoading(true);
+    try {
+      let config: any = {};
+      let parameterSchema: any = undefined;
+
+      if (tool.tool_type === 'api') {
+        config = {
+          method: data.method,
+          url: data.url,
+          timeout: data.timeout || 30,
+          auth_type: data.auth_type || 'none',
+        };
+
+        // Only include auth_credentials if user provided NEW credentials
+        if (data.auth_type === 'bearer' && data.auth_token && data.auth_token.trim()) {
+          // User provided new bearer token
+          config.auth_credentials = { token: data.auth_token };
+        } else if (data.auth_type === 'api_key' && data.api_key_value && data.api_key_value.trim()) {
+          // User provided new API key
+          config.auth_credentials = {
+            key_name: data.api_key_name || 'X-API-Key',
+            key_value: data.api_key_value,
+          };
+        } else if (
+          data.auth_type === 'basic' &&
+          data.basic_username &&
+          data.basic_password &&
+          data.basic_username.trim() &&
+          data.basic_password.trim()
+        ) {
+          // User provided new basic auth credentials
+          config.auth_credentials = {
+            username: data.basic_username,
+            password: data.basic_password,
+          };
+        }
+        // Otherwise: don't include auth_credentials at all - backend will preserve existing
+      }
+
+      // Parse parameter schema if provided
+      if (data.parameter_schema && data.parameter_schema.trim()) {
+        try {
+          parameterSchema = JSON.parse(data.parameter_schema);
+        } catch {
+          notifyError('Invalid JSON in parameter schema');
+          setLoading(false);
+          return;
+        }
+      }
+
+      await floConsoleService.toolService.updateTool(tool.id, {
+        display_name: data.display_name.trim(),
+        description: data.description.trim(),
+        config,
+        parameter_schema: parameterSchema,
+      });
+
+      notifySuccess('Tool updated successfully');
+      onSuccess?.();
+      onOpenChange(false);
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to update tool');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogContent className="max-h-[90vh] max-w-4xl overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Edit Tool</DialogTitle>
+          <DialogDescription>Update tool configuration</DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+            {/* Basic Information */}
+            <div className="space-y-4">
+              <h3 className="text-lg font-semibold">Basic Information</h3>
+
+              <div className="rounded-md bg-gray-50 p-3">
+                <div className="text-sm text-gray-600">Function Name (cannot be changed)</div>
+                <div className="font-mono text-sm font-medium">{tool.name}</div>
+              </div>
+
+              <FormField
+                control={form.control}
+                name="display_name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Display Name*</FormLabel>
+                    <FormControl>
+                      <Input placeholder="e.g., Weather API, Booking System" {...field} />
+                    </FormControl>
+                    <FormDescription>Human-readable name for the tool</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="description"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Description*</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        placeholder="Describe what this tool does and when the LLM should use it"
+                        rows={3}
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormDescription>The LLM uses this description to decide when to call this tool</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <div className="rounded-md bg-gray-50 p-3">
+                <div className="text-sm text-gray-600">Tool Type (cannot be changed)</div>
+                <div className="font-medium uppercase">{tool.tool_type}</div>
+              </div>
+            </div>
+
+            {/* API Configuration */}
+            {tool.tool_type === 'api' && (
+              <div className="space-y-4">
+                <h3 className="text-lg font-semibold">API Configuration</h3>
+
+                <div className="grid grid-cols-2 gap-4">
+                  <FormField
+                    control={form.control}
+                    name="method"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>HTTP Method*</FormLabel>
+                        <Select onValueChange={field.onChange} value={field.value}>
+                          <FormControl>
+                            <SelectTrigger>
+                              <SelectValue />
+                            </SelectTrigger>
+                          </FormControl>
+                          <SelectContent>
+                            {HTTP_METHODS.map((method) => (
+                              <SelectItem key={method} value={method}>
+                                {method}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+
+                  <FormField
+                    control={form.control}
+                    name="timeout"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Timeout (seconds)</FormLabel>
+                        <FormControl>
+                          <Input
+                            type="number"
+                            {...field}
+                            onChange={(e) => field.onChange(parseInt(e.target.value) || 30)}
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                </div>
+
+                <FormField
+                  control={form.control}
+                  name="url"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>API URL*</FormLabel>
+                      <FormControl>
+                        <Input placeholder="https://api.example.com/endpoint" {...field} />
+                      </FormControl>
+                      <FormDescription>Full URL to the API endpoint</FormDescription>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="auth_type"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>Authentication Type</FormLabel>
+                      <Select onValueChange={field.onChange} value={field.value}>
+                        <FormControl>
+                          <SelectTrigger>
+                            <SelectValue />
+                          </SelectTrigger>
+                        </FormControl>
+                        <SelectContent>
+                          <SelectItem value="none">None</SelectItem>
+                          <SelectItem value="bearer">Bearer Token</SelectItem>
+                          <SelectItem value="api_key">API Key</SelectItem>
+                          <SelectItem value="basic">Basic Auth</SelectItem>
+                        </SelectContent>
+                      </Select>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                {watchAuthType === 'bearer' && (
+                  <FormField
+                    control={form.control}
+                    name="auth_token"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>Bearer Token</FormLabel>
+                        <FormControl>
+                          <Input
+                            type="password"
+                            placeholder="Enter new bearer token (leave blank to keep existing)"
+                            {...field}
+                          />
+                        </FormControl>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                )}
+
+                {watchAuthType === 'api_key' && (
+                  <div className="grid grid-cols-2 gap-4">
+                    <FormField
+                      control={form.control}
+                      name="api_key_name"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>API Key Header Name</FormLabel>
+                          <FormControl>
+                            <Input placeholder="X-API-Key" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                    <FormField
+                      control={form.control}
+                      name="api_key_value"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>API Key Value</FormLabel>
+                          <FormControl>
+                            <Input
+                              type="password"
+                              placeholder="Enter new API key (leave blank to keep existing)"
+                              {...field}
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                )}
+
+                {watchAuthType === 'basic' && (
+                  <div className="grid grid-cols-2 gap-4">
+                    <FormField
+                      control={form.control}
+                      name="basic_username"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>Username</FormLabel>
+                          <FormControl>
+                            <Input placeholder="Enter new username (leave blank to keep existing)" {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                    <FormField
+                      control={form.control}
+                      name="basic_password"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel>Password</FormLabel>
+                          <FormControl>
+                            <Input
+                              type="password"
+                              placeholder="Enter new password (leave blank to keep existing)"
+                              {...field}
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+                )}
+              </div>
+            )}
+
+            {/* Parameter Schema */}
+            <div className="space-y-4">
+              <h3 className="text-lg font-semibold">Parameter Schema (Optional)</h3>
+              <FormField
+                control={form.control}
+                name="parameter_schema"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>JSON Schema</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        placeholder='{"type": "object", "properties": {"location": {"type": "string"}}}'
+                        rows={6}
+                        className="font-mono text-sm"
+                        {...field}
+                      />
+                    </FormControl>
+                    <FormDescription>JSON Schema defining the parameters this tool accepts</FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            <DialogFooter>
+              <Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={loading}>
+                Cancel
+              </Button>
+              <Button type="submit" disabled={loading}>
+                {loading ? 'Updating...' : 'Update Tool'}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default EditToolDialog;
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
new file mode 100644
index 00000000..122f2114
--- /dev/null
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
@@ -0,0 +1,217 @@
+import floConsoleService from '@app/api';
+import DeleteConfirmationDialog from '@app/components/DeleteConfirmationDialog';
+import { EmptyStateCard } from '@app/components/EmptyCard';
+import { Button } from '@app/components/ui/button';
+import { Input } from '@app/components/ui/input';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@app/components/ui/table';
+import { Badge } from '@app/components/ui/badge';
+import { useGetVoiceAgentTools } from '@app/hooks';
+import { getVoiceAgentToolsKey } from '@app/hooks/data/query-keys';
+import { extractErrorMessage } from '@app/lib/utils';
+import { useNotifyStore } from '@app/store';
+import { VoiceAgentTool } from '@app/types/tool';
+import { useQueryClient } from '@tanstack/react-query';
+import { Pencil, Trash2 } from 'lucide-react';
+import React, { useState } from 'react';
+import { useParams } from 'react-router';
+import CreateToolDialog from './CreateToolDialog';
+import EditToolDialog from './EditToolDialog';
+
+const ToolsPage: React.FC = () => {
+  const { app } = useParams<{ app: string }>();
+  const queryClient = useQueryClient();
+  const { notifySuccess, notifyError } = useNotifyStore();
+
+  const [searchQuery, setSearchQuery] = useState('');
+  const [deleteItem, setDeleteItem] = useState<VoiceAgentTool | null>(null);
+  const [deleting, setDeleting] = useState(false);
+  const [createDialogOpen, setCreateDialogOpen] = useState(false);
+  const [editItem, setEditItem] = useState<VoiceAgentTool | null>(null);
+
+  // Fetch tools
+  const { data: tools = [], isLoading: toolsLoading } = useGetVoiceAgentTools(app);
+
+  const handleDeleteClick = (e: React.MouseEvent, tool: VoiceAgentTool) => {
+    e.stopPropagation();
+    setDeleteItem(tool);
+  };
+
+  const handleEditClick = (e: React.MouseEvent, tool: VoiceAgentTool) => {
+    e.stopPropagation();
+    setEditItem(tool);
+  };
+
+  const handleEditSuccess = () => {
+    queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(app || '') });
+    setEditItem(null);
+  };
+
+  const handleDelete = async () => {
+    if (!deleteItem) return;
+
+    setDeleting(true);
+    try {
+      await floConsoleService.toolService.deleteTool(deleteItem.id);
+      notifySuccess('Tool deleted successfully');
+      queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(app || '') });
+      setDeleteItem(null);
+    } catch (error) {
+      const errorMessage = extractErrorMessage(error);
+      notifyError(errorMessage || 'Failed to delete tool');
+    } finally {
+      setDeleting(false);
+    }
+  };
+
+  const handleDeleteCancel = () => {
+    setDeleteItem(null);
+  };
+
+  const handleCreateTool = () => {
+    setCreateDialogOpen(true);
+  };
+
+  const handleCreateSuccess = () => {
+    queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(app || '') });
+    setCreateDialogOpen(false);
+  };
+
+  const filteredTools = tools.filter((tool) => {
+    const query = searchQuery.toLowerCase();
+    return (
+      tool.name.toLowerCase().includes(query) ||
+      tool.display_name.toLowerCase().includes(query) ||
+      (tool.description && tool.description.toLowerCase().includes(query)) ||
+      tool.tool_type.toLowerCase().includes(query)
+    );
+  });
+
+  const getToolTypeColor = (type: string) => {
+    return type === 'api' ? 'bg-blue-100 text-blue-800' : 'bg-purple-100 text-purple-800';
+  };
+
+  const getApiMethod = (tool: VoiceAgentTool) => {
+    if (tool.tool_type === 'api' && tool.config && 'method' in tool.config) {
+      return tool.config.method;
+    }
+    return '-';
+  };
+
+  const getApiUrl = (tool: VoiceAgentTool) => {
+    if (tool.tool_type === 'api' && tool.config && 'url' in tool.config) {
+      return tool.config.url;
+    }
+    return '-';
+  };
+
+  return (
+    <div className="h-full w-full overflow-hidden">
+      <div className="w-full">
+        <div className="mb-8 flex items-center justify-end">
+          <div className="flex items-center gap-4">
+            <Input
+              type="text"
+              placeholder="Search"
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              className="w-[180px]"
+            />
+            <div className="flex items-center gap-3">
+              <Button onClick={handleCreateTool}>
+                <p className="text-sm">Create Tool</p>
+              </Button>
+            </div>
+          </div>
+        </div>
+
+        {toolsLoading ? (
+          <div className="flex justify-center py-10">
+            <div className="text-gray-500">Loading tools...</div>
+          </div>
+        ) : filteredTools.length === 0 ? (
+          <div className="mt-10 flex justify-center">
+            <EmptyStateCard
+              title="No tools found"
+              description={
+                searchQuery ? 'No tools match your search.' : 'Get started by creating your first tool for voice agents'
+              }
+              actionText="Create Tool"
+              onActionClick={handleCreateTool}
+            />
+          </div>
+        ) : (
+          <div className="rounded-md border">
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Name</TableHead>
+                  <TableHead>Display Name</TableHead>
+                  <TableHead>Type</TableHead>
+                  <TableHead>Method</TableHead>
+                  <TableHead>URL</TableHead>
+                  <TableHead>Description</TableHead>
+                  <TableHead className="text-right">Actions</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {filteredTools.map((tool) => (
+                  <TableRow key={tool.id}>
+                    <TableCell className="font-mono text-sm">{tool.name}</TableCell>
+                    <TableCell className="font-medium">{tool.display_name}</TableCell>
+                    <TableCell>
+                      <Badge className={getToolTypeColor(tool.tool_type)}>{tool.tool_type.toUpperCase()}</Badge>
+                    </TableCell>
+                    <TableCell className="font-mono text-xs">{getApiMethod(tool)}</TableCell>
+                    <TableCell className="max-w-xs truncate text-xs">{getApiUrl(tool)}</TableCell>
+                    <TableCell className="max-w-md truncate">{tool.description || '-'}</TableCell>
+                    <TableCell className="text-right" onClick={(e) => e.stopPropagation()}>
+                      <div className="flex items-center justify-end gap-2">
+                        <Button variant="ghost" size="sm" onClick={(e) => handleEditClick(e, tool)} title="Edit">
+                          <Pencil className="h-4 w-4" />
+                        </Button>
+                        <Button variant="ghost" size="sm" onClick={(e) => handleDeleteClick(e, tool)} title="Delete">
+                          <Trash2 className="h-4 w-4 text-red-600" />
+                        </Button>
+                      </div>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </div>
+        )}
+
+        {/* Delete Confirmation Dialog */}
+        <DeleteConfirmationDialog
+          isOpen={!!deleteItem}
+          title="Delete Tool"
+          message={`Are you sure you want to delete "${deleteItem?.display_name}"? This will also detach it from all voice agents.`}
+          onConfirm={handleDelete}
+          onCancel={handleDeleteCancel}
+          loading={deleting}
+        />
+
+        {/* Create Tool Dialog */}
+        {app && (
+          <CreateToolDialog
+            isOpen={createDialogOpen}
+            onOpenChange={setCreateDialogOpen}
+            onSuccess={handleCreateSuccess}
+          />
+        )}
+
+        {/* Edit Tool Dialog */}
+        {app && editItem && (
+          <EditToolDialog
+            isOpen={!!editItem}
+            onOpenChange={(open) => !open && setEditItem(null)}
+            tool={editItem}
+            onSuccess={handleEditSuccess}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default ToolsPage;
diff --git a/wavefront/client/src/router/routes.tsx b/wavefront/client/src/router/routes.tsx
index d2a2dcc5..9608a3b2 100644
--- a/wavefront/client/src/router/routes.tsx
+++ b/wavefront/client/src/router/routes.tsx
@@ -19,6 +19,7 @@ import VoiceAgentsPage from '@app/pages/apps/[appId]/voice-agents';
 import VoiceAgentsLayout from '@app/pages/apps/[appId]/voice-agents/layout';
 import SttConfigsPage from '@app/pages/apps/[appId]/voice-agents/stt-configs';
 import TelephonyConfigsPage from '@app/pages/apps/[appId]/voice-agents/telephony-configs';
+import ToolsPage from '@app/pages/apps/[appId]/voice-agents/tools';
 import TtsConfigsPage from '@app/pages/apps/[appId]/voice-agents/tts-configs';
 import WorkflowManagement from '@app/pages/apps/[appId]/workflows';
 import WorkflowDetail from '@app/pages/apps/[appId]/workflows/[id]';
@@ -172,6 +173,10 @@ const routes = {
               index: true,
               element: <VoiceAgentsPage />,
             },
+            {
+              path: 'tools',
+              element: <ToolsPage />,
+            },
             {
               path: 'tts-configs',
               element: <TtsConfigsPage />,
diff --git a/wavefront/client/src/types/tool.ts b/wavefront/client/src/types/tool.ts
index 261eabe5..cfc0e694 100644
--- a/wavefront/client/src/types/tool.ts
+++ b/wavefront/client/src/types/tool.ts
@@ -1,5 +1,18 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/**
+ * Type definitions for Tools
+ *
+ * This file contains two separate tool systems:
+ * 1. Tools for Agents (workflow agents) - lines 8-64
+ * 2. Tools for Voice Agents (voice agent function calling) - lines 67+
+ */
+
 import { IApiResponse } from '@app/lib/axios';
 
+// ============================================================================
+// TOOLS FOR AGENTS (Workflow Agents)
+// ============================================================================
+
 export interface Tool {
   name: string;
   description: string;
@@ -12,6 +25,7 @@ export interface Tool {
   >;
   category: string;
 }
+
 export interface ToolDetails {
   name: string;
   parameters: {
@@ -56,3 +70,177 @@ export interface ToolDetailsData {
 
 export type ToolNamesResponse = IApiResponse<ToolNamesData>;
 export type ToolDetailsResponse = IApiResponse<ToolDetailsData>;
+
+// ============================================================================
+// TOOLS FOR VOICE AGENTS (Function Calling)
+// ============================================================================
+
+export type ToolType = 'api' | 'python';
+
+export type AuthType = 'none' | 'bearer' | 'api_key';
+
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+
+/**
+ * API Tool Configuration
+ */
+export interface ApiToolConfig {
+  method: HttpMethod;
+  url: string;
+  headers?: Record<string, string>;
+  timeout?: number;
+  auth_type?: AuthType;
+  auth_credentials?: Record<string, string>;
+}
+
+/**
+ * Python Tool Configuration (Phase 2)
+ */
+export interface PythonToolConfig {
+  code_storage_key?: string;
+  cloud_run_url?: string;
+  resource_limits?: {
+    cpu?: string;
+    memory?: string;
+    timeout?: number;
+  };
+}
+
+/**
+ * Voice Agent Tool (database model)
+ */
+export interface VoiceAgentTool {
+  id: string;
+  name: string;
+  display_name: string;
+  description: string;
+  tool_type: ToolType;
+  config: ApiToolConfig | PythonToolConfig;
+  parameter_schema?: Record<string, any>;
+  response_template?: string;
+  created_by?: string;
+  created_at: string;
+  updated_at: string;
+  is_deleted: boolean;
+}
+
+/**
+ * Voice Agent Tool Association
+ */
+export interface VoiceAgentToolAssociation {
+  id: string;
+  voice_agent_id: string;
+  tool_id: string;
+  is_enabled: boolean;
+  config_overrides?: Record<string, any>;
+  priority: number;
+  created_at: string;
+  updated_at: string;
+}
+
+/**
+ * Combined tool with association details (returned by GET /voice-agents/{id}/tools)
+ */
+export interface VoiceAgentToolWithAssociation extends VoiceAgentTool {
+  association: {
+    id: string;
+    is_enabled: boolean;
+    config_overrides?: Record<string, any>;
+    priority: number;
+  };
+}
+
+/**
+ * Create Tool Request
+ */
+export interface CreateToolRequest {
+  name: string;
+  display_name: string;
+  description: string;
+  tool_type: ToolType;
+  config: ApiToolConfig | PythonToolConfig;
+  parameter_schema?: Record<string, any>;
+  response_template?: string;
+}
+
+/**
+ * Update Tool Request
+ */
+export interface UpdateToolRequest {
+  display_name?: string;
+  description?: string;
+  config?: ApiToolConfig | PythonToolConfig;
+  parameter_schema?: Record<string, any>;
+  response_template?: string;
+}
+
+/**
+ * Attach Tool to Agent Request
+ */
+export interface AttachToolToAgentRequest {
+  tool_id: string;
+  is_enabled?: boolean;
+  config_overrides?: Record<string, any>;
+  priority?: number;
+}
+
+/**
+ * Update Agent Tool Association Request
+ */
+export interface UpdateAgentToolRequest {
+  is_enabled?: boolean;
+  config_overrides?: Record<string, any>;
+  priority?: number;
+}
+
+/**
+ * List Tools Query Parameters
+ */
+export interface ListToolsParams {
+  tool_type?: ToolType;
+  limit?: number;
+  offset?: number;
+}
+
+/**
+ * Tool execution result (from Pipecat)
+ */
+export interface ToolExecutionResult {
+  success: boolean;
+  status_code?: number;
+  data?: any;
+  error?: string;
+}
+
+/**
+ * Response data for create/update/delete operations
+ */
+export interface ToolData {
+  message: string;
+  tool?: VoiceAgentTool;
+  tool_id?: string;
+}
+
+/**
+ * Response data for list operations
+ */
+export interface ToolListData {
+  tools: VoiceAgentTool[];
+  count?: number;
+}
+
+/**
+ * Response data for agent tools operations
+ */
+export interface AgentToolsData {
+  tools: VoiceAgentToolWithAssociation[];
+  count?: number;
+}
+
+/**
+ * Response types using IApiResponse wrapper
+ */
+export type ToolResponse = IApiResponse<ToolData>;
+export type ToolDetailResponse = IApiResponse<VoiceAgentTool>;
+export type ToolListResponse = IApiResponse<ToolListData>;
+export type AgentToolsResponse = IApiResponse<AgentToolsData>;
diff --git a/wavefront/server/apps/call_processing/call_processing/cache/cache_utils.py b/wavefront/server/apps/call_processing/call_processing/cache/cache_utils.py
index aab6157f..f9251896 100644
--- a/wavefront/server/apps/call_processing/call_processing/cache/cache_utils.py
+++ b/wavefront/server/apps/call_processing/call_processing/cache/cache_utils.py
@@ -26,3 +26,8 @@ def get_stt_config_cache_key(config_id: UUID) -> str:
 def get_telephony_config_cache_key(config_id: UUID) -> str:
     """Generate cache key for a telephony config"""
     return f'telephony_config:{config_id}'
+
+
+def get_tools_config_cache_key(agent_id: UUID) -> str:
+    """Generate cache key for voice agent tools"""
+    return f'voice_agent:{agent_id}:tools'
diff --git a/wavefront/server/apps/call_processing/call_processing/constants/api_endpoints.py b/wavefront/server/apps/call_processing/call_processing/constants/api_endpoints.py
index bc169447..1f888c0f 100644
--- a/wavefront/server/apps/call_processing/call_processing/constants/api_endpoints.py
+++ b/wavefront/server/apps/call_processing/call_processing/constants/api_endpoints.py
@@ -6,6 +6,7 @@
 TTS_CONFIG_ENDPOINT = '/floware/v1/tts-configs/{config_id}'
 STT_CONFIG_ENDPOINT = '/floware/v1/stt-configs/{config_id}'
 TELEPHONY_CONFIG_ENDPOINT = '/floware/v1/telephony-configs/{config_id}'
+TOOLS_ENDPOINT = '/floware/v1/voice-agents/{agent_id}/tools'
 
 # Config type mapping for cache invalidation
 CONFIG_TYPE_ENDPOINTS = {
diff --git a/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py b/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
index 28822b77..dc391e6a 100644
--- a/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
+++ b/wavefront/server/apps/call_processing/call_processing/controllers/cache_controller.py
@@ -15,6 +15,7 @@
     get_tts_config_cache_key,
     get_stt_config_cache_key,
     get_telephony_config_cache_key,
+    get_tools_config_cache_key,
 )
 from call_processing.constants.api_endpoints import VALID_CONFIG_TYPES
 from call_processing.di.application_container import ApplicationContainer
@@ -171,6 +172,15 @@ async def invalidate_cache(
     else:
         logger.warning(f'{config_type} {config_id} was not in cache')
 
+    # If invalidating voice_agent, also invalidate its tools cache
+    if config_type == 'voice_agent':
+        tools_cache_key = get_tools_config_cache_key(config_id)
+        tools_removed = voice_agent_cache_service.cache_manager.remove(tools_cache_key)
+        if tools_removed:
+            logger.info(f'Removed tools cache for voice agent {config_id}')
+        else:
+            logger.warning(f'Tools cache for voice agent {config_id} was not in cache')
+
     # Step 4: Fetch fresh config from floware API
     try:
         if not voice_agent_cache_service.floware_http_client:
@@ -223,6 +233,36 @@ async def invalidate_cache(
 
         logger.info(f'Successfully refreshed cache for {config_type} {config_id}')
 
+        # If voice_agent, also refresh the tools cache
+        if config_type == 'voice_agent':
+            try:
+                tools = (
+                    await voice_agent_cache_service.floware_http_client.get_agent_tools(
+                        config_id
+                    )
+                )
+                tools_cache_key = get_tools_config_cache_key(config_id)
+                if tools:
+                    voice_agent_cache_service.cache_manager.set_json(
+                        tools_cache_key,
+                        tools,
+                        expiry=voice_agent_cache_service.cache_ttl,
+                    )
+                    logger.info(
+                        f'Successfully refreshed tools cache for voice agent {config_id} ({len(tools)} tools)'
+                    )
+                else:
+                    # Cache empty list
+                    voice_agent_cache_service.cache_manager.set_json(
+                        tools_cache_key, [], expiry=voice_agent_cache_service.cache_ttl
+                    )
+                    logger.info(f'Cached empty tools list for voice agent {config_id}')
+            except Exception as e:
+                # Don't fail the whole invalidation if tools refresh fails
+                logger.warning(
+                    f'Failed to refresh tools cache for voice agent {config_id}: {e}'
+                )
+
         return JSONResponse(
             status_code=status.HTTP_200_OK,
             content={
diff --git a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
index fae95511..8941d540 100644
--- a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
+++ b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
@@ -276,6 +276,7 @@ async def websocket_endpoint(
             llm_config=configs['llm_config'],
             tts_config=configs['tts_config'],
             stt_config=configs['stt_config'],
+            tools=configs['tools'],
         )
 
     except Exception as e:
diff --git a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
index 361de52a..ad82ba75 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
@@ -214,3 +214,49 @@ async def get_welcome_message_audio_url(self, agent_id: str) -> str:
                     f'Request error fetching welcome message URL for agent {agent_id}: {e}'
                 )
                 raise
+
+    async def get_agent_tools(self, agent_id: UUID) -> list:
+        """
+        Get all tools for a voice agent (with real credentials for execution).
+
+        Args:
+            agent_id: Voice agent UUID
+
+        Returns:
+            List of tool dicts with association details and real credentials, or empty list if none found
+
+        Raises:
+            httpx.HTTPStatusError: If API returns 4xx/5xx error (except 404)
+            httpx.RequestError: If request fails (network error, timeout, etc.)
+        """
+        url = f'{self.base_url}/floware/v1/voice-agents/{agent_id}/tools?include_credentials=true'
+
+        async with httpx.AsyncClient(timeout=self.timeout) as client:
+            try:
+                response = await client.get(url, headers=self._get_headers())
+                response.raise_for_status()
+
+                # Extract tools from response
+                data = response.json()
+                if 'data' in data:
+                    # Handle response_formatter wrapped response
+                    tools_data = data['data']
+                    if isinstance(tools_data, dict) and 'tools' in tools_data:
+                        return tools_data['tools']
+                    elif isinstance(tools_data, list):
+                        return tools_data
+                    return []
+                return data.get('tools', []) if isinstance(data, dict) else []
+
+            except httpx.HTTPStatusError as e:
+                if e.response.status_code == 404:
+                    logger.info(f'No tools found for agent: {agent_id}')
+                    return []
+                logger.error(
+                    f'HTTP error fetching tools for agent {agent_id}: '
+                    f'status={e.response.status_code}'
+                )
+                raise
+            except httpx.RequestError as e:
+                logger.error(f'Request error fetching tools for agent {agent_id}: {e}')
+                raise
diff --git a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
index ad97e0af..db29a8af 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/pipecat_service.py
@@ -7,9 +7,11 @@
 from typing import Dict, Any, List
 from copy import deepcopy
 from call_processing.log.logger import logger
+from call_processing.services.tool_wrapper_service import ToolWrapperFactory
 
 # Pipecat core imports
 from pipecat.adapters.schemas.tools_schema import ToolsSchema
+from pipecat.adapters.schemas.function_schema import FunctionSchema
 from pipecat.audio.interruptions.min_words_interruption_strategy import (
     MinWordsInterruptionStrategy,
 )
@@ -142,6 +144,7 @@ async def run_conversation(
         llm_config: Dict[str, Any],
         tts_config: Dict[str, Any],
         stt_config: Dict[str, Any],
+        tools: List[Dict[str, Any]],
     ):
         """
         Create and run the Pipecat pipeline for a voice conversation
@@ -153,6 +156,7 @@ async def run_conversation(
             llm_config: LLM provider configuration
             tts_config: TTS provider configuration (credentials only)
             stt_config: STT provider configuration (credentials only)
+            tools: List of tool dicts with association details
         """
         # Extract language configuration from agent_config
         supported_languages = agent_config.get('supported_languages', ['en'])
@@ -261,14 +265,53 @@ async def run_conversation(
             }
         ]
 
-        # ADD: Register function handler with LLM service
+        # Load and register tools for this agent
+        function_schemas = []
+        agent_id = agent_config.get('id')
+
+        if tools:
+            try:
+                logger.info(f'Loaded {len(tools)} tools for agent {agent_id}')
+
+                # Create FunctionSchema objects and callable functions for all tools
+                (
+                    function_schemas,
+                    tool_registrations,
+                ) = ToolWrapperFactory.create_all_tool_functions(tools)
+
+                # Register each tool with LLM
+                for tool_name, tool_func in tool_registrations:
+                    llm.register_function(tool_name, tool_func)
+                    logger.info(f"Registered tool '{tool_name}' with LLM")
+
+            except Exception as e:
+                logger.error(
+                    f'Error loading tools for agent {agent_id}: {str(e)}',
+                    exc_info=True,
+                )
+                # Continue without tools rather than failing the call
+        else:
+            logger.info(f'No tools configured for agent {agent_id}')
+
+        # Register built-in function handler with LLM service
         llm.register_function(
             'check_conversation_complete', check_conversation_complete
         )
 
-        tools = ToolsSchema(standard_tools=[check_conversation_complete])
+        # Create FunctionSchema for check_conversation_complete
+        check_complete_schema = FunctionSchema(
+            name='check_conversation_complete',
+            description='Check if conversation should end based on goodbye detection',
+            properties={},  # No parameters needed
+            required=[],
+        )
+
+        # Combine all FunctionSchema objects for ToolsSchema
+        all_function_schemas = [check_complete_schema] + function_schemas
+        tools_schema = ToolsSchema(standard_tools=all_function_schemas)
+
         # Create LLM context and aggregator
-        context = LLMContext(messages, tools=tools)
+        context = LLMContext(messages, tools=tools_schema)
         context_aggregator = LLMContextAggregatorPair(context)
 
         # Create transcript processor for language detection
diff --git a/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py b/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
new file mode 100644
index 00000000..e393eba4
--- /dev/null
+++ b/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
@@ -0,0 +1,355 @@
+"""
+Tool Wrapper Service for executing tools during voice agent calls.
+
+This service provides wrapper classes and a factory for creating Pipecat-compatible
+functions that can be registered with the LLM for function calling.
+"""
+
+import base64
+from typing import Dict, Any, List, Tuple, Callable, Optional
+import httpx
+
+from common_module.log.logger import logger
+from pipecat.adapters.schemas.function_schema import FunctionSchema
+
+
+class ApiToolWrapper:
+    """Wrapper for API-based tools that makes HTTP requests"""
+
+    def __init__(
+        self,
+        url: str,
+        method: str,
+        headers: Optional[Dict[str, str]] = None,
+        auth_type: Optional[str] = None,
+        auth_credentials: Optional[Dict[str, str]] = None,
+        timeout: int = 30,
+    ):
+        """
+        Initialize API tool wrapper
+
+        Args:
+            url: API endpoint URL
+            method: HTTP method (GET, POST, PUT, PATCH, DELETE)
+            headers: HTTP headers to include
+            auth_type: Authentication type (none, bearer, api_key, basic)
+            auth_credentials: Authentication credentials
+            timeout: Request timeout in seconds
+        """
+        self.url = url
+        self.method = method.upper()
+        self.headers = headers or {}
+        self.auth_type = auth_type or 'none'
+        self.auth_credentials = auth_credentials or {}
+        self.timeout = timeout
+
+    def _apply_auth(self, headers: Dict[str, str]) -> Dict[str, str]:
+        """
+        Apply authentication to headers
+
+        Args:
+            headers: Base headers dictionary
+
+        Returns:
+            Headers with authentication applied
+        """
+        if self.auth_type == 'bearer':
+            token = self.auth_credentials.get('token')
+            if token:
+                headers['Authorization'] = f'Bearer {token}'
+        elif self.auth_type == 'api_key':
+            key_name = self.auth_credentials.get('key_name', 'X-API-Key')
+            key_value = self.auth_credentials.get('key_value')
+            if key_value:
+                headers[key_name] = key_value
+        elif self.auth_type == 'basic':
+            username = self.auth_credentials.get('username')
+            password = self.auth_credentials.get('password')
+            if username and password:
+                # Encode credentials as base64
+                credentials = f'{username}:{password}'
+                encoded = base64.b64encode(credentials.encode()).decode()
+                headers['Authorization'] = f'Basic {encoded}'
+        return headers
+
+    async def execute(self, params: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Execute the API call
+
+        Args:
+            params: Parameters provided by LLM
+
+        Returns:
+            Structured response dictionary with:
+            - success (bool): Whether the API call succeeded
+            - status_code (int): HTTP status code
+            - data (dict): Response body (if successful)
+            - error (str): Error message (if failed)
+        """
+        try:
+            # Apply authentication
+            headers = self._apply_auth(self.headers.copy())
+
+            # Make HTTP request
+            async with httpx.AsyncClient(timeout=self.timeout) as client:
+                if self.method == 'GET':
+                    response = await client.get(
+                        self.url, params=params, headers=headers
+                    )
+                elif self.method in ['POST', 'PUT', 'PATCH']:
+                    response = await client.request(
+                        self.method, self.url, json=params, headers=headers
+                    )
+                elif self.method == 'DELETE':
+                    response = await client.delete(self.url, headers=headers)
+                else:
+                    return {
+                        'success': False,
+                        'error': f'Unsupported HTTP method: {self.method}',
+                        'status_code': 400,
+                    }
+
+                # Parse response
+                response.raise_for_status()
+                try:
+                    data = response.json()
+                except Exception:
+                    data = {'raw': response.text}
+
+                return data
+
+        except httpx.TimeoutException as e:
+            logger.warning(f'API tool timeout for {self.url}: {str(e)}')
+            return {'success': False, 'error': 'Request timeout', 'status_code': 408}
+        except httpx.HTTPStatusError as e:
+            logger.warning(
+                f'API tool HTTP error for {self.url}: {e.response.status_code}'
+            )
+            return {
+                'success': False,
+                'error': f'HTTP error: {e.response.status_code}',
+                'status_code': e.response.status_code,
+            }
+        except Exception as e:
+            logger.error(f'API tool unexpected error for {self.url}: {str(e)}')
+            return {
+                'success': False,
+                'error': f'Unexpected error: {str(e)}',
+                'status_code': 500,
+            }
+
+
+class PythonToolWrapper:
+    """Wrapper for Python code tools (Phase 2 - stub implementation)"""
+
+    def __init__(self, config: Dict[str, Any]):
+        """
+        Initialize Python tool wrapper
+
+        Args:
+            config: Python tool configuration
+        """
+        self.config = config
+        logger.info('PythonToolWrapper initialized (Phase 2 - not yet implemented)')
+
+    async def execute(self, params: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Execute Python code (stub - Phase 2)
+
+        Args:
+            params: Parameters provided by LLM
+
+        Returns:
+            Error response indicating not implemented
+        """
+        logger.warning('Python tool execution attempted but not yet implemented')
+        return {
+            'success': False,
+            'error': 'Python tool execution not yet implemented (Phase 2)',
+            'status_code': 501,
+        }
+
+
+class ToolWrapperFactory:
+    """Factory for creating tool wrapper instances and Pipecat-compatible functions"""
+
+    @staticmethod
+    def create_wrapper(tool: Dict[str, Any]):
+        """
+        Create appropriate wrapper based on tool type
+
+        Args:
+            tool: Tool configuration dictionary
+
+        Returns:
+            ApiToolWrapper or PythonToolWrapper instance
+
+        Raises:
+            ValueError: If tool type is unsupported
+        """
+        tool_type = tool.get('tool_type')
+        config = tool.get('config', {})
+
+        if tool_type == 'api':
+            return ApiToolWrapper(
+                url=config.get('url'),
+                method=config.get('method', 'POST'),
+                headers=config.get('headers', {}),
+                auth_type=config.get('auth_type', 'none'),
+                auth_credentials=config.get('auth_credentials', {}),
+                timeout=config.get('timeout', 30),
+            )
+        elif tool_type == 'python':
+            return PythonToolWrapper(config)
+        else:
+            raise ValueError(f'Unsupported tool type: {tool_type}')
+
+    @staticmethod
+    def create_pipecat_function(
+        tool: Dict[str, Any], wrapper
+    ) -> Tuple[FunctionSchema, Callable]:
+        """
+        Create a Pipecat FunctionSchema and callable function for a tool
+
+        Args:
+            tool: Tool configuration dictionary
+            wrapper: Tool wrapper instance (ApiToolWrapper or PythonToolWrapper)
+
+        Returns:
+            Tuple of (FunctionSchema, callable_function)
+            - FunctionSchema: For passing to ToolsSchema
+            - callable_function: For registering with llm.register_function()
+        """
+        tool_name = tool.get('name')
+        tool_description = tool.get('description')
+        parameter_schema = tool.get('parameter_schema', {}) or {}
+
+        # Extract properties and required fields from parameter_schema
+        properties = parameter_schema.get('properties', {})
+        required = parameter_schema.get('required', [])
+
+        # Create FunctionSchema object (Pipecat's official way)
+        function_schema = FunctionSchema(
+            name=tool_name,
+            description=tool_description,
+            properties=properties,
+            required=required,
+        )
+
+        async def tool_function(params):
+            """
+            Generated function for Pipecat integration
+
+            This function is called by Pipecat when the LLM decides to invoke the tool.
+            It executes the tool wrapper and returns results to the LLM.
+            """
+            try:
+                logger.info(
+                    f"Executing tool '{tool_name}' with params: {params.arguments if hasattr(params, 'arguments') else params}"
+                )
+
+                # Handle different parameter formats from Pipecat
+                if hasattr(params, 'arguments'):
+                    # FunctionCallParams object
+                    tool_params = params.arguments
+                    result_callback = params.result_callback
+                else:
+                    # Direct dict parameters
+                    tool_params = params
+                    result_callback = None
+
+                # Execute the tool wrapper
+                result = await wrapper.execute(tool_params)
+
+                logger.info(f"Tool '{tool_name}' execution result: {result}")
+
+                # Return result via callback if available
+                if result_callback:
+                    await result_callback(result)
+
+                return result
+
+            except Exception as e:
+                error_msg = f"Error executing tool '{tool_name}': {str(e)}"
+                logger.error(error_msg)
+                error_result = {
+                    'success': False,
+                    'error': error_msg,
+                    'status_code': 500,
+                }
+
+                if result_callback:
+                    await result_callback(error_result)
+
+                return error_result
+
+        # Set function metadata for Pipecat
+        tool_function.__name__ = tool_name
+        tool_function.__doc__ = tool_description
+
+        return function_schema, tool_function
+
+    @staticmethod
+    def create_all_tool_functions(
+        agent_tools: List[Dict[str, Any]],
+    ) -> Tuple[List[FunctionSchema], List[Tuple[str, Callable]]]:
+        """
+        Create wrapper functions for all tools attached to an agent
+
+        Args:
+            agent_tools: List of tool configurations from get_agent_tools()
+                        Each dict contains: {id, name, description, tool_type,
+                                            config, parameter_schema, is_enabled, association}
+
+        Returns:
+            Tuple containing:
+            - function_schemas: List of FunctionSchema objects (for ToolsSchema)
+            - tool_registrations: List of (name, callable) tuples (for llm.register_function)
+        """
+        function_schemas = []
+        tool_registrations = []
+
+        # Filter to only enabled tools
+        enabled_tools = [
+            t for t in agent_tools if t.get('association', {}).get('is_enabled', True)
+        ]
+
+        logger.info(
+            f'Creating wrapper functions for {len(enabled_tools)} enabled tools'
+        )
+
+        for tool in enabled_tools:
+            try:
+                # Create wrapper based on tool type
+                wrapper = ToolWrapperFactory.create_wrapper(tool)
+
+                # Apply config overrides if present
+                config_overrides = tool.get('association', {}).get('config_overrides')
+                if config_overrides and hasattr(wrapper, 'config'):
+                    wrapper.config.update(config_overrides)
+
+                # Create Pipecat FunctionSchema and callable function
+                function_schema, callable_func = (
+                    ToolWrapperFactory.create_pipecat_function(tool, wrapper)
+                )
+
+                # Add to both lists
+                function_schemas.append(function_schema)
+                tool_registrations.append((tool['name'], callable_func))
+
+                logger.info(
+                    f"Created wrapper for tool '{tool['name']}' (type: {tool['tool_type']})"
+                )
+
+            except Exception as e:
+                logger.error(
+                    f"Error creating wrapper for tool '{tool.get('name')}': {str(e)}"
+                )
+                # Skip this tool but continue with others
+                continue
+
+        logger.info(
+            f'Successfully created {len(function_schemas)} tool wrapper functions'
+        )
+
+        return function_schemas, tool_registrations
diff --git a/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py b/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
index 8d928b07..55140562 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/voice_agent_cache_service.py
@@ -11,6 +11,7 @@
     get_tts_config_cache_key,
     get_stt_config_cache_key,
     get_telephony_config_cache_key,
+    get_tools_config_cache_key,
 )
 from call_processing.log.logger import logger
 from call_processing.services.floware_http_client import FlowareHttpClient
@@ -37,6 +38,7 @@ async def _fetch_missing_configs_from_api(
 
         Args:
             missing_configs: List of (config_type, config_id) tuples
+                            For 'tools', config_id is the agent_id
 
         Returns:
             Dict mapping config_type to fetched config data
@@ -51,10 +53,16 @@ async def _fetch_missing_configs_from_api(
             )
 
         # Create parallel fetch tasks
-        tasks = [
-            self.floware_http_client.fetch_config(config_type, config_id)
-            for config_type, config_id in missing_configs
-        ]
+        tasks = []
+        for config_type, config_id in missing_configs:
+            if config_type == 'tools':
+                # Tools are fetched by agent_id
+                tasks.append(self.floware_http_client.get_agent_tools(config_id))
+            else:
+                # Other configs are fetched by config_id
+                tasks.append(
+                    self.floware_http_client.fetch_config(config_type, config_id)
+                )
 
         try:
             # Execute all fetches in parallel
@@ -102,13 +110,19 @@ def _cache_config(
             'tts_config': get_tts_config_cache_key,
             'stt_config': get_stt_config_cache_key,
             'telephony_config': get_telephony_config_cache_key,
+            'tools': get_tools_config_cache_key,
         }
 
         cache_key_func = cache_key_funcs.get(config_type)
         if cache_key_func:
             cache_key = cache_key_func(config_id)
             self.cache_manager.set_json(cache_key, config_data, expiry=self.cache_ttl)
-            logger.info(f'Cached {config_type} {config_id}')
+            if config_type == 'tools':
+                logger.info(
+                    f'Cached {len(config_data) if config_data else 0} tools for agent {config_id}'
+                )
+            else:
+                logger.info(f'Cached {config_type} {config_id}')
 
     async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
         """
@@ -131,7 +145,8 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
                 'llm_config': {...},
                 'tts_config': {...},
                 'stt_config': {...},
-                'telephony_config': {...}
+                'telephony_config': {...},
+                'tools': {...}
             }
 
         Raises:
@@ -195,6 +210,9 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
             get_telephony_config_cache_key(telephony_config_id)
         )
 
+        # Try fetching tools from cache
+        tools = self.cache_manager.get_json(get_tools_config_cache_key(agent_id))
+
         # Identify missing configs
         missing_configs = []
         if not llm_config:
@@ -205,6 +223,8 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
             missing_configs.append(('stt_config', stt_config_id))
         if telephony_config_id and not telephony_config:
             missing_configs.append(('telephony_config', telephony_config_id))
+        if tools is None:
+            missing_configs.append(('tools', agent_id))
 
         # If any configs are missing, fetch from API
         if missing_configs:
@@ -234,6 +254,9 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
                 elif config_type == 'telephony_config':
                     telephony_config = config_data
                     self._cache_config(config_type, telephony_config_id, config_data)
+                elif config_type == 'tools':
+                    tools = config_data
+                    self._cache_config(config_type, agent_id, config_data)
 
         # Final validation
         if not all([llm_config, tts_config, stt_config, telephony_config]):
@@ -253,6 +276,10 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
                 detail=f'Failed to fetch all required configs: {", ".join(missing)}',
             )
 
+        # Default tools to empty list if not fetched
+        if tools is None:
+            tools = []
+
         logger.info(f'Successfully fetched all configs for voice agent {agent_id}')
 
         return {
@@ -261,6 +288,7 @@ async def get_all_agent_configs(self, agent_id: UUID) -> Dict[str, Any]:
             'tts_config': tts_config,
             'stt_config': stt_config,
             'telephony_config': telephony_config,
+            'tools': tools,
         }
 
     async def get_agent_by_inbound_number(
diff --git a/wavefront/server/apps/floware/floware/server.py b/wavefront/server/apps/floware/floware/server.py
index 01020d1c..8ac2e37b 100644
--- a/wavefront/server/apps/floware/floware/server.py
+++ b/wavefront/server/apps/floware/floware/server.py
@@ -89,6 +89,7 @@
 from voice_agents_module.controllers.tts_config_controller import tts_config_router
 from voice_agents_module.controllers.stt_config_controller import stt_config_router
 from voice_agents_module.controllers.voice_agent_controller import voice_agent_router
+from voice_agents_module.controllers.tool_controller import tool_router
 from plugins_module.controllers.message_processor_controller import (
     message_processor_router,
 )
@@ -383,6 +384,7 @@ async def metrics(request: Request):
 app.include_router(tts_config_router, prefix='/floware')
 app.include_router(stt_config_router, prefix='/floware')
 app.include_router(voice_agent_router, prefix='/floware')
+app.include_router(tool_router, prefix='/floware')
 app.include_router(message_processor_router, prefix='/floware')
 
 
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
new file mode 100644
index 00000000..e8477860
--- /dev/null
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
@@ -0,0 +1,148 @@
+"""create_voice_agent_tools_tables
+
+Revision ID: a5b3c4d5e6f7
+Revises: 6010e49da528
+Create Date: 2026-01-13 12:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'a5b3c4d5e6f7'
+down_revision: Union[str, None] = '6010e49da528'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Create enum type for tool_type (check if it exists first)
+    connection = op.get_bind()
+
+    # Check if enum type already exists
+    result = connection.execute(
+        sa.text("SELECT 1 FROM pg_type WHERE typname = 'tool_type_enum'")
+    ).fetchone()
+
+    if not result:
+        tool_type_enum = postgresql.ENUM(
+            'api', 'python', name='tool_type_enum', create_type=True
+        )
+        tool_type_enum.create(connection, checkfirst=False)
+
+    # Use the enum type (whether we just created it or it already existed)
+    tool_type_enum = postgresql.ENUM(
+        'api', 'python', name='tool_type_enum', create_type=False
+    )
+
+    # Check if voice_agent_tools table already exists
+    inspector = sa.inspect(connection)
+    if 'voice_agent_tools' in inspector.get_table_names():
+        print("Table 'voice_agent_tools' already exists, skipping creation")
+        return
+
+    # Create voice_agent_tools table
+    op.create_table(
+        'voice_agent_tools',
+        sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('name', sa.String(length=100), nullable=False),
+        sa.Column('display_name', sa.String(length=255), nullable=False),
+        sa.Column('description', sa.Text(), nullable=False),
+        sa.Column('tool_type', tool_type_enum, nullable=False),
+        sa.Column('config', postgresql.JSONB(astext_type=sa.Text()), nullable=False),
+        sa.Column(
+            'parameter_schema', postgresql.JSONB(astext_type=sa.Text()), nullable=True
+        ),
+        sa.Column('response_template', sa.Text(), nullable=True),
+        sa.Column('created_by', postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column('is_deleted', sa.Boolean(), nullable=False, server_default='false'),
+        sa.Column(
+            'created_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
+        ),
+        sa.Column(
+            'updated_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
+        ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('name', name='uq_voice_agent_tool_name'),
+    )
+    op.create_index(
+        op.f('ix_voice_agent_tools_id'), 'voice_agent_tools', ['id'], unique=False
+    )
+    op.create_index(
+        op.f('ix_voice_agent_tools_name'), 'voice_agent_tools', ['name'], unique=True
+    )
+
+    # Create voice_agent_tool_associations table
+    op.create_table(
+        'voice_agent_tool_associations',
+        sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('voice_agent_id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('tool_id', postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column('is_enabled', sa.Boolean(), nullable=False, server_default='true'),
+        sa.Column(
+            'config_overrides', postgresql.JSONB(astext_type=sa.Text()), nullable=True
+        ),
+        sa.Column('priority', sa.Integer(), nullable=False, server_default='0'),
+        sa.Column(
+            'created_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
+        ),
+        sa.Column(
+            'updated_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
+        ),
+        sa.ForeignKeyConstraint(
+            ['voice_agent_id'], ['voice_agents.id'], ondelete='CASCADE'
+        ),
+        sa.ForeignKeyConstraint(
+            ['tool_id'], ['voice_agent_tools.id'], ondelete='CASCADE'
+        ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('voice_agent_id', 'tool_id', name='uq_voice_agent_tool'),
+    )
+    op.create_index(
+        op.f('ix_voice_agent_tool_associations_id'),
+        'voice_agent_tool_associations',
+        ['id'],
+        unique=False,
+    )
+    op.create_index(
+        op.f('ix_voice_agent_tool_associations_voice_agent_id'),
+        'voice_agent_tool_associations',
+        ['voice_agent_id'],
+        unique=False,
+    )
+    op.create_index(
+        op.f('ix_voice_agent_tool_associations_tool_id'),
+        'voice_agent_tool_associations',
+        ['tool_id'],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    # Drop tables in reverse order
+    op.drop_index(
+        op.f('ix_voice_agent_tool_associations_tool_id'),
+        table_name='voice_agent_tool_associations',
+    )
+    op.drop_index(
+        op.f('ix_voice_agent_tool_associations_voice_agent_id'),
+        table_name='voice_agent_tool_associations',
+    )
+    op.drop_index(
+        op.f('ix_voice_agent_tool_associations_id'),
+        table_name='voice_agent_tool_associations',
+    )
+    op.drop_table('voice_agent_tool_associations')
+
+    op.drop_index(op.f('ix_voice_agent_tools_name'), table_name='voice_agent_tools')
+    op.drop_index(op.f('ix_voice_agent_tools_id'), table_name='voice_agent_tools')
+    op.drop_table('voice_agent_tools')
+
+    # Drop enum type
+    tool_type_enum = postgresql.ENUM('api', 'python', name='tool_type_enum')
+    tool_type_enum.drop(op.get_bind(), checkfirst=True)
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool.py
new file mode 100644
index 00000000..d4d267c5
--- /dev/null
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool.py
@@ -0,0 +1,81 @@
+import uuid
+from datetime import datetime
+from typing import Optional
+import enum
+
+from sqlalchemy import Enum as SQLEnum, String, Text, func
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from ..database.base import Base
+
+
+class ToolType(str, enum.Enum):
+    """Enum for tool types"""
+
+    API = 'api'
+    PYTHON = 'python'
+
+
+class VoiceAgentTool(Base):
+    __tablename__ = 'voice_agent_tools'
+
+    id: Mapped[uuid.UUID] = mapped_column(
+        primary_key=True, default=uuid.uuid4, index=True
+    )
+    name: Mapped[str] = mapped_column(
+        String(length=100), nullable=False, unique=True, index=True
+    )
+    display_name: Mapped[str] = mapped_column(String(length=255), nullable=False)
+    description: Mapped[str] = mapped_column(Text, nullable=False)
+    tool_type: Mapped[ToolType] = mapped_column(
+        SQLEnum(
+            ToolType,
+            name='tool_type_enum',
+            values_callable=lambda x: [e.value for e in x],
+        ),
+        nullable=False,
+    )
+    config: Mapped[dict] = mapped_column(JSONB, nullable=False)
+    parameter_schema: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    response_template: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    created_by: Mapped[Optional[uuid.UUID]] = mapped_column(nullable=True)
+    is_deleted: Mapped[bool] = mapped_column(default=False, nullable=False)
+    created_at: Mapped[datetime] = mapped_column(default=func.now())
+    updated_at: Mapped[datetime] = mapped_column(
+        default=func.now(), onupdate=func.now()
+    )
+
+    @staticmethod
+    def get_table_name():
+        return (VoiceAgentTool()).__tablename__
+
+    def to_dict(self, exclude_sensitive: bool = True):
+        """Convert model to dictionary"""
+        result = {}
+        for column in self.__table__.columns:
+            value = getattr(self, column.name)
+
+            # Handle UUID serialization
+            if isinstance(value, uuid.UUID):
+                result[column.name] = str(value)
+            # Handle datetime serialization
+            elif isinstance(value, datetime):
+                result[column.name] = value.isoformat()
+            # Handle enum serialization
+            elif isinstance(value, ToolType):
+                result[column.name] = value.value
+            # Handle JSONB fields
+            elif column.name in ['config', 'parameter_schema']:
+                result[column.name] = value if value else None
+            else:
+                result[column.name] = value
+
+            # Optionally mask sensitive data in config
+            if exclude_sensitive and column.name == 'config' and value:
+                masked_config = value.copy()
+                if 'auth_credentials' in masked_config:
+                    masked_config['auth_credentials'] = {'masked': True}
+                result[column.name] = masked_config
+
+        return result
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool_association.py b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool_association.py
new file mode 100644
index 00000000..ba66ef25
--- /dev/null
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/models/voice_agent_tool_association.py
@@ -0,0 +1,58 @@
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import ForeignKey, UniqueConstraint, func
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from ..database.base import Base
+
+
+class VoiceAgentToolAssociation(Base):
+    __tablename__ = 'voice_agent_tool_associations'
+
+    __table_args__ = (
+        UniqueConstraint('voice_agent_id', 'tool_id', name='uq_voice_agent_tool'),
+    )
+
+    id: Mapped[uuid.UUID] = mapped_column(
+        primary_key=True, default=uuid.uuid4, index=True
+    )
+    voice_agent_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey('voice_agents.id'), nullable=False, index=True
+    )
+    tool_id: Mapped[uuid.UUID] = mapped_column(
+        ForeignKey('voice_agent_tools.id'), nullable=False, index=True
+    )
+    is_enabled: Mapped[bool] = mapped_column(default=True, nullable=False)
+    config_overrides: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    priority: Mapped[int] = mapped_column(default=0, nullable=False)
+    created_at: Mapped[datetime] = mapped_column(default=func.now())
+    updated_at: Mapped[datetime] = mapped_column(
+        default=func.now(), onupdate=func.now()
+    )
+
+    @staticmethod
+    def get_table_name():
+        return (VoiceAgentToolAssociation()).__tablename__
+
+    def to_dict(self):
+        """Convert model to dictionary"""
+        result = {}
+        for column in self.__table__.columns:
+            value = getattr(self, column.name)
+
+            # Handle UUID serialization
+            if isinstance(value, uuid.UUID):
+                result[column.name] = str(value)
+            # Handle datetime serialization
+            elif isinstance(value, datetime):
+                result[column.name] = value.isoformat()
+            # Handle JSONB fields
+            elif column.name == 'config_overrides':
+                result[column.name] = value if value else None
+            else:
+                result[column.name] = value
+
+        return result
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tool_controller.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tool_controller.py
new file mode 100644
index 00000000..9f565589
--- /dev/null
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/controllers/tool_controller.py
@@ -0,0 +1,314 @@
+from uuid import UUID
+
+from dependency_injector.wiring import Provide, inject
+from fastapi import APIRouter, Depends, Path, Query, Request, status
+from fastapi.responses import JSONResponse
+
+from common_module.common_container import CommonContainer
+from common_module.response_formatter import ResponseFormatter
+from voice_agents_module.models.tool_schemas import (
+    CreateToolPayload,
+    UpdateToolPayload,
+    AttachToolToAgentPayload,
+    UpdateAgentToolPayload,
+)
+from voice_agents_module.services.tool_service import ToolService
+from voice_agents_module.voice_agents_container import VoiceAgentsContainer
+
+tool_router = APIRouter()
+
+
+@tool_router.post('/v1/tools')
+@inject
+async def create_tool(
+    request: Request,
+    payload: CreateToolPayload,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Create a new tool
+
+    Creates a tool that can be attached to voice agents for function calling.
+
+    Args:
+        payload: Tool details including name, type, and configuration
+
+    Returns:
+        JSONResponse: Created tool details
+    """
+    tool = await tool_service.create_tool(payload)
+    tool_dict = tool.to_dict(exclude_sensitive=True)
+
+    return JSONResponse(
+        status_code=status.HTTP_201_CREATED,
+        content=response_formatter.buildSuccessResponse(
+            {'message': 'Tool created successfully', 'tool': tool_dict}
+        ),
+    )
+
+
+@tool_router.get('/v1/tools')
+@inject
+async def list_tools(
+    tool_type: str = Query(None, description='Filter by tool type (api, python)'),
+    include_deleted: bool = Query(False, description='Include soft-deleted tools'),
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    List all tools
+
+    Returns:
+        JSONResponse: List of all tools
+    """
+    tools = await tool_service.list_tools(
+        include_deleted=include_deleted, tool_type=tool_type
+    )
+    tools_data = [tool.to_dict(exclude_sensitive=True) for tool in tools]
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse({'tools': tools_data}),
+    )
+
+
+@tool_router.get('/v1/tools/{tool_id}')
+@inject
+async def get_tool(
+    tool_id: UUID = Path(..., description='The ID of the tool'),
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Get a single tool by ID
+
+    Args:
+        tool_id: UUID of the tool to retrieve
+
+    Returns:
+        JSONResponse: Tool details
+    """
+    tool = await tool_service.get_tool(tool_id, exclude_sensitive=True)
+
+    if not tool:
+        return JSONResponse(
+            status_code=status.HTTP_404_NOT_FOUND,
+            content=response_formatter.buildErrorResponse('Tool not found'),
+        )
+
+    tool_dict = tool.to_dict(exclude_sensitive=True)
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse({'tool': tool_dict}),
+    )
+
+
+@tool_router.patch('/v1/tools/{tool_id}')
+@inject
+async def update_tool(
+    tool_id: UUID,
+    payload: UpdateToolPayload,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Update a tool
+
+    Args:
+        tool_id: UUID of the tool to update
+        payload: Fields to update
+
+    Returns:
+        JSONResponse: Updated tool details
+    """
+    tool = await tool_service.update_tool(tool_id, payload)
+    tool_dict = tool.to_dict(exclude_sensitive=True)
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse(
+            {'message': 'Tool updated successfully', 'tool': tool_dict}
+        ),
+    )
+
+
+@tool_router.delete('/v1/tools/{tool_id}')
+@inject
+async def delete_tool(
+    tool_id: UUID,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Delete a tool (soft delete)
+
+    Args:
+        tool_id: UUID of the tool to delete
+
+    Returns:
+        JSONResponse: Success message
+    """
+    await tool_service.delete_tool(tool_id)
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse(
+            {'message': 'Tool deleted successfully'}
+        ),
+    )
+
+
+# Voice Agent Tool Association Endpoints
+
+
+@tool_router.post('/v1/voice-agents/{agent_id}/tools')
+@inject
+async def attach_tool_to_agent(
+    agent_id: UUID,
+    payload: AttachToolToAgentPayload,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Attach a tool to a voice agent
+
+    Args:
+        agent_id: UUID of the voice agent
+        payload: Tool attachment details
+
+    Returns:
+        JSONResponse: Created association details
+    """
+    association = await tool_service.attach_tool_to_agent(agent_id, payload)
+    assoc_dict = association.to_dict()
+
+    return JSONResponse(
+        status_code=status.HTTP_201_CREATED,
+        content=response_formatter.buildSuccessResponse(
+            {
+                'message': 'Tool attached to agent successfully',
+                'association': assoc_dict,
+            }
+        ),
+    )
+
+
+@tool_router.get('/v1/voice-agents/{agent_id}/tools')
+@inject
+async def get_agent_tools(
+    agent_id: UUID,
+    include_credentials: bool = Query(
+        False, description='Include real credentials (for internal services)'
+    ),
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Get all tools for a voice agent
+
+    Args:
+        agent_id: UUID of the voice agent
+        include_credentials: If True, returns real credentials (default: False, returns masked)
+
+    Returns:
+        JSONResponse: List of tools with association details
+    """
+    tools = await tool_service.get_agent_tools(agent_id)
+
+    if not include_credentials:
+        # Mask credentials for frontend/external requests
+        masked_tools = []
+        for tool in tools:
+            tool_copy = tool.copy()
+            if 'config' in tool_copy and isinstance(tool_copy['config'], dict):
+                if 'auth_credentials' in tool_copy['config']:
+                    tool_copy['config']['auth_credentials'] = {'masked': True}
+            masked_tools.append(tool_copy)
+        tools = masked_tools
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse({'tools': tools}),
+    )
+
+
+@tool_router.patch('/v1/voice-agents/{agent_id}/tools/{tool_id}')
+@inject
+async def update_agent_tool(
+    agent_id: UUID,
+    tool_id: UUID,
+    payload: UpdateAgentToolPayload,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Update a tool association for a voice agent
+
+    Args:
+        agent_id: UUID of the voice agent
+        tool_id: UUID of the tool
+        payload: Fields to update
+
+    Returns:
+        JSONResponse: Updated association details
+    """
+    association = await tool_service.update_agent_tool(agent_id, tool_id, payload)
+    assoc_dict = association.to_dict()
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse(
+            {
+                'message': 'Tool association updated successfully',
+                'association': assoc_dict,
+            }
+        ),
+    )
+
+
+@tool_router.delete('/v1/voice-agents/{agent_id}/tools/{tool_id}')
+@inject
+async def detach_tool_from_agent(
+    agent_id: UUID,
+    tool_id: UUID,
+    response_formatter: ResponseFormatter = Depends(
+        Provide[CommonContainer.response_formatter]
+    ),
+    tool_service: ToolService = Depends(Provide[VoiceAgentsContainer.tool_service]),
+):
+    """
+    Detach a tool from a voice agent
+
+    Args:
+        agent_id: UUID of the voice agent
+        tool_id: UUID of the tool
+
+    Returns:
+        JSONResponse: Success message
+    """
+    await tool_service.detach_tool_from_agent(agent_id, tool_id)
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content=response_formatter.buildSuccessResponse(
+            {'message': 'Tool detached from agent successfully'}
+        ),
+    )
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
new file mode 100644
index 00000000..a3e6e76c
--- /dev/null
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
@@ -0,0 +1,294 @@
+from pydantic import BaseModel, Field, field_validator
+from typing import Optional, Union, Any, Dict
+from enum import Enum
+from datetime import datetime
+import uuid
+import re
+
+# Sentinel value for partial updates
+UNSET = object()
+
+
+class ToolType(str, Enum):
+    API = 'api'
+    PYTHON = 'python'
+
+
+class AuthType(str, Enum):
+    NONE = 'none'
+    BEARER = 'bearer'
+    API_KEY = 'api_key'
+    BASIC = 'basic'
+
+
+class ApiToolConfig(BaseModel):
+    """Configuration for API-type tools"""
+
+    method: str = Field(..., description='HTTP method (GET, POST, PUT, PATCH, DELETE)')
+    url: str = Field(..., description='API endpoint URL')
+    headers: Optional[Dict[str, str]] = Field(
+        default=None, description='HTTP headers to include'
+    )
+    timeout: int = Field(
+        default=30, ge=1, le=300, description='Request timeout in seconds'
+    )
+    auth_type: Optional[str] = Field(
+        default='none', description='Authentication type (none, bearer, api_key)'
+    )
+    auth_credentials: Optional[Dict[str, str]] = Field(
+        default=None, description='Authentication credentials'
+    )
+
+    @field_validator('method')
+    @classmethod
+    def validate_method(cls, v):
+        allowed_methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE']
+        if v.upper() not in allowed_methods:
+            raise ValueError(f'Method must be one of {allowed_methods}')
+        return v.upper()
+
+    @field_validator('url')
+    @classmethod
+    def validate_url(cls, v):
+        # Basic URL validation
+        if not v.startswith(('http://', 'https://')):
+            raise ValueError('URL must start with http:// or https://')
+        # Reject localhost and internal IPs
+        if any(
+            host in v.lower()
+            for host in [
+                'localhost',
+                '127.0.0.1',
+                '0.0.0.0',
+                '::1',
+                '10.',
+                '192.168.',
+                '172.16.',
+            ]
+        ):
+            raise ValueError('Cannot use localhost or internal IP addresses')
+        return v
+
+    @field_validator('auth_type')
+    @classmethod
+    def validate_auth_type(cls, v):
+        if v and v not in ['none', 'bearer', 'api_key', 'basic']:
+            raise ValueError('auth_type must be none, bearer, api_key, or basic')
+        return v
+
+
+class PythonToolConfig(BaseModel):
+    """Configuration for Python-type tools (Phase 2)"""
+
+    code_storage_key: str = Field(..., description='Cloud Storage key for Python code')
+    cloud_run_url: str = Field(..., description='Cloud Run service URL')
+    timeout: int = Field(
+        default=60, ge=1, le=300, description='Execution timeout in seconds'
+    )
+    resource_limits: Optional[Dict[str, Any]] = Field(
+        default=None, description='CPU and memory limits'
+    )
+
+
+class CreateToolPayload(BaseModel):
+    """Payload for creating a new tool"""
+
+    model_config = {'use_enum_values': True}
+
+    name: str = Field(
+        ...,
+        min_length=1,
+        max_length=100,
+        description='Function identifier (lowercase with underscores)',
+    )
+    display_name: str = Field(
+        ..., min_length=1, max_length=255, description='Human-readable name'
+    )
+    description: str = Field(
+        ..., min_length=1, description='Description for LLM to decide when to call'
+    )
+    tool_type: ToolType = Field(..., description='Type of tool (api or python)')
+    config: Dict[str, Any] = Field(..., description='Tool-specific configuration')
+    parameter_schema: Optional[Dict[str, Any]] = Field(
+        default=None, description='JSON Schema for parameter validation'
+    )
+    response_template: Optional[str] = Field(
+        default=None, description='Template for formatting responses'
+    )
+    created_by: Optional[uuid.UUID] = Field(
+        default=None, description='User who created the tool'
+    )
+
+    @field_validator('name')
+    @classmethod
+    def validate_name(cls, v):
+        # Python function naming convention
+        if not re.match(r'^[a-z_][a-z0-9_]*$', v):
+            raise ValueError(
+                'Name must follow Python function naming: lowercase letters, numbers, underscores only, cannot start with number'
+            )
+        return v
+
+    @field_validator('config')
+    @classmethod
+    def validate_config(cls, v, info):
+        # Validate config structure based on tool_type
+        tool_type = info.data.get('tool_type')
+        # Handle both enum and string values
+        tool_type_value = (
+            tool_type
+            if isinstance(tool_type, str)
+            else (tool_type.value if tool_type else None)
+        )
+
+        if tool_type_value == 'api':
+            # Validate as ApiToolConfig
+            try:
+                ApiToolConfig(**v)
+            except Exception as e:
+                raise ValueError(f'Invalid API tool config: {str(e)}')
+        elif tool_type_value == 'python':
+            # Validate as PythonToolConfig (Phase 2)
+            try:
+                PythonToolConfig(**v)
+            except Exception as e:
+                raise ValueError(f'Invalid Python tool config: {str(e)}')
+        return v
+
+    @field_validator('parameter_schema')
+    @classmethod
+    def validate_parameter_schema(cls, v):
+        if v is None:
+            return v
+
+        # Validate that it's a proper JSON Schema
+        if not isinstance(v, dict):
+            raise ValueError('parameter_schema must be a JSON object')
+
+        # Check for required JSON Schema fields
+        if 'type' not in v:
+            raise ValueError(
+                'parameter_schema must have a "type" field (usually "object")'
+            )
+
+        if v.get('type') == 'object':
+            if 'properties' not in v:
+                raise ValueError(
+                    'parameter_schema with type "object" must have a "properties" field'
+                )
+
+            # Validate that properties is a dict
+            if not isinstance(v['properties'], dict):
+                raise ValueError('parameter_schema "properties" must be an object')
+
+        return v
+
+
+class UpdateToolPayload(BaseModel):
+    """Payload for updating a tool (partial updates)"""
+
+    name: Union[str, Any] = Field(default=UNSET)
+    display_name: Union[str, Any] = Field(default=UNSET)
+    description: Union[str, Any] = Field(default=UNSET)
+    tool_type: Union[ToolType, Any] = Field(default=UNSET)
+    config: Union[Dict[str, Any], Any] = Field(default=UNSET)
+    parameter_schema: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
+    response_template: Union[str, None, Any] = Field(default=UNSET)
+
+    @field_validator('name')
+    @classmethod
+    def validate_name(cls, v):
+        if v is UNSET:
+            return v
+        if not re.match(r'^[a-z_][a-z0-9_]*$', v):
+            raise ValueError(
+                'Name must follow Python function naming: lowercase letters, numbers, underscores only'
+            )
+        return v
+
+    @field_validator('parameter_schema')
+    @classmethod
+    def validate_parameter_schema(cls, v):
+        if v is UNSET or v is None:
+            return v
+
+        # Validate that it's a proper JSON Schema
+        if not isinstance(v, dict):
+            raise ValueError('parameter_schema must be a JSON object')
+
+        # Check for required JSON Schema fields
+        if 'type' not in v:
+            raise ValueError(
+                'parameter_schema must have a "type" field (usually "object")'
+            )
+
+        if v.get('type') == 'object':
+            if 'properties' not in v:
+                raise ValueError(
+                    'parameter_schema with type "object" must have a "properties" field'
+                )
+
+            # Validate that properties is a dict
+            if not isinstance(v['properties'], dict):
+                raise ValueError('parameter_schema "properties" must be an object')
+
+        return v
+
+
+class AttachToolToAgentPayload(BaseModel):
+    """Payload for attaching a tool to a voice agent"""
+
+    tool_id: uuid.UUID = Field(..., description='ID of the tool to attach')
+    is_enabled: bool = Field(default=True, description='Enable/disable the tool')
+    config_overrides: Optional[Dict[str, Any]] = Field(
+        default=None, description='Agent-specific config overrides'
+    )
+    priority: int = Field(
+        default=0, description='Execution priority (higher = earlier)'
+    )
+
+
+class UpdateAgentToolPayload(BaseModel):
+    """Payload for updating a tool association"""
+
+    is_enabled: Union[bool, Any] = Field(default=UNSET)
+    config_overrides: Union[Dict[str, Any], None, Any] = Field(default=UNSET)
+    priority: Union[int, Any] = Field(default=UNSET)
+
+
+class ToolResponse(BaseModel):
+    """Response model for tool data"""
+
+    id: uuid.UUID
+    name: str
+    display_name: str
+    description: str
+    tool_type: str
+    config: Dict[str, Any]
+    parameter_schema: Optional[Dict[str, Any]]
+    response_template: Optional[str]
+    created_by: Optional[uuid.UUID]
+    is_deleted: bool
+    created_at: datetime
+    updated_at: datetime
+
+    class Config:
+        from_attributes = True
+
+
+class AgentToolResponse(BaseModel):
+    """Response model for agent-tool association"""
+
+    id: uuid.UUID
+    voice_agent_id: uuid.UUID
+    tool_id: uuid.UUID
+    is_enabled: bool
+    config_overrides: Optional[Dict[str, Any]]
+    priority: int
+    created_at: datetime
+    updated_at: datetime
+    # Include tool details
+    tool: Optional[ToolResponse] = None
+
+    class Config:
+        from_attributes = True
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py
new file mode 100644
index 00000000..5ae614fe
--- /dev/null
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py
@@ -0,0 +1,538 @@
+import json
+import uuid
+from typing import List, Optional, Dict, Any
+from uuid import UUID
+
+from common_module.log.logger import logger
+from db_repo_module.cache.cache_manager import CacheManager
+from db_repo_module.models.voice_agent_tool import VoiceAgentTool
+from db_repo_module.models.voice_agent_tool_association import VoiceAgentToolAssociation
+from db_repo_module.repositories.sql_alchemy_repository import SQLAlchemyRepository
+from voice_agents_module.models.tool_schemas import (
+    CreateToolPayload,
+    UpdateToolPayload,
+    AttachToolToAgentPayload,
+    UpdateAgentToolPayload,
+    UNSET,
+)
+from voice_agents_module.utils.cache_invalidation import (
+    invalidate_call_processing_cache,
+)
+
+
+class ToolService:
+    """Service for handling tool CRUD operations with caching"""
+
+    def __init__(
+        self,
+        tool_repository: SQLAlchemyRepository[VoiceAgentTool],
+        tool_association_repository: SQLAlchemyRepository[VoiceAgentToolAssociation],
+        cache_manager: CacheManager,
+    ):
+        """
+        Initialize the tool service
+
+        Args:
+            tool_repository: Repository for voice agent tools
+            tool_association_repository: Repository for voice agent tool associations
+            cache_manager: Cache manager instance
+        """
+        self.tool_repository = tool_repository
+        self.tool_association_repository = tool_association_repository
+        self.cache_manager = cache_manager
+        self.tool_cache_time = 3600 * 24  # 24 hours matching voice agent pattern
+
+    def _get_tool_cache_key(self, tool_id: UUID) -> str:
+        """Generate cache key for a single tool"""
+        return f'tool:{tool_id}'
+
+    def _get_tools_list_cache_key(self) -> str:
+        """Generate cache key for tools list"""
+        return 'tools:list'
+
+    def _get_agent_tools_cache_key(self, agent_id: UUID) -> str:
+        """Generate cache key for agent's tools"""
+        return f'voice_agent:{agent_id}:tools'
+
+    async def create_tool(self, payload: CreateToolPayload) -> VoiceAgentTool:
+        """
+        Create a new tool
+
+        Args:
+            payload: Tool creation payload
+
+        Returns:
+            Created VoiceAgentTool instance
+
+        Raises:
+            ValueError: If tool with same name exists
+        """
+        try:
+            # Check if tool with same name exists
+            existing = await self.tool_repository.find_one(
+                name=payload.name, is_deleted=False
+            )
+            if existing:
+                raise ValueError(f'Tool with name "{payload.name}" already exists')
+
+            # Get tool_type as string and ensure lowercase
+            tool_type_str = (
+                payload.tool_type
+                if isinstance(payload.tool_type, str)
+                else payload.tool_type.value
+            )
+            tool_type_str = tool_type_str.lower()  # Ensure lowercase for database enum
+
+            # Save to database
+            created_tool = await self.tool_repository.create(
+                id=uuid.uuid4(),
+                name=payload.name,
+                display_name=payload.display_name,
+                description=payload.description,
+                tool_type=tool_type_str,  # Pass string directly, SQLAlchemy handles enum conversion
+                config=payload.config,
+                parameter_schema=payload.parameter_schema,
+                response_template=payload.response_template,
+                created_by=payload.created_by,
+            )
+
+            # Invalidate list cache
+            self.cache_manager.remove(self._get_tools_list_cache_key())
+
+            logger.info(f'Created tool: {created_tool.name} (ID: {created_tool.id})')
+            return created_tool
+
+        except Exception as e:
+            logger.error(f'Error creating tool: {str(e)}')
+            raise
+
+    async def get_tool(
+        self, tool_id: UUID, exclude_sensitive: bool = True
+    ) -> Optional[VoiceAgentTool]:
+        """
+        Get a tool by ID with caching
+
+        Args:
+            tool_id: Tool ID
+            exclude_sensitive: Whether to mask sensitive data in config
+
+        Returns:
+            VoiceAgentTool instance or None
+        """
+        try:
+            cache_key = self._get_tool_cache_key(tool_id)
+
+            # Try to get from cache
+            cached_str = self.cache_manager.get_str(cache_key)
+            if cached_str:
+                logger.debug(f'Tool {tool_id} retrieved from cache')
+                # Reconstruct tool from cached dict
+                cached_data = json.loads(cached_str)
+                tool = VoiceAgentTool(**cached_data)
+                return tool
+
+            # Get from database
+            tool = await self.tool_repository.find_one(id=tool_id, is_deleted=False)
+
+            if tool:
+                # Cache the tool data
+                tool_dict = tool.to_dict(exclude_sensitive=False)  # Cache unmasked
+                self.cache_manager.add(
+                    cache_key, json.dumps(tool_dict), expiry=self.tool_cache_time
+                )
+                logger.debug(f'Tool {tool_id} cached for {self.tool_cache_time}s')
+
+            return tool
+
+        except Exception as e:
+            logger.error(f'Error getting tool {tool_id}: {str(e)}')
+            raise
+
+    async def list_tools(
+        self, include_deleted: bool = False, tool_type: Optional[str] = None
+    ) -> List[VoiceAgentTool]:
+        """
+        List all tools with caching
+
+        Args:
+            include_deleted: Whether to include soft-deleted tools
+            tool_type: Filter by tool type (api, python)
+
+        Returns:
+            List of VoiceAgentTool instances
+        """
+        try:
+            cache_key = self._get_tools_list_cache_key()
+
+            # Try to get from cache (only for non-deleted, all types)
+            if not include_deleted and tool_type is None:
+                cached_str = self.cache_manager.get_str(cache_key)
+                if cached_str:
+                    logger.debug('Tools list retrieved from cache')
+                    # Reconstruct tools from cached list
+                    cached_data = json.loads(cached_str)
+                    tools = [VoiceAgentTool(**tool_dict) for tool_dict in cached_data]
+                    return tools
+
+            # Build filters
+            filters = {}
+            if not include_deleted:
+                filters['is_deleted'] = False
+            if tool_type:
+                filters['tool_type'] = tool_type  # Pass string value directly
+
+            # Get from database
+            tools = await self.tool_repository.find(limit=1000, **filters)
+
+            # Cache if appropriate
+            if not include_deleted and tool_type is None:
+                tools_data = [tool.to_dict(exclude_sensitive=False) for tool in tools]
+                self.cache_manager.add(
+                    cache_key, json.dumps(tools_data), expiry=self.tool_cache_time
+                )
+                logger.debug(f'Tools list cached for {self.tool_cache_time}s')
+
+            return tools
+
+        except Exception as e:
+            logger.error(f'Error listing tools: {str(e)}')
+            raise
+
+    async def update_tool(
+        self, tool_id: UUID, payload: UpdateToolPayload
+    ) -> VoiceAgentTool:
+        """
+        Update a tool
+
+        Args:
+            tool_id: Tool ID
+            payload: Update payload with optional fields
+
+        Returns:
+            Updated VoiceAgentTool instance
+
+        Raises:
+            ValueError: If tool not found or name conflict
+        """
+        try:
+            # Get existing tool
+            tool = await self.tool_repository.find_one(id=tool_id, is_deleted=False)
+            if not tool:
+                raise ValueError(f'Tool with ID {tool_id} not found')
+
+            # Prepare update data
+            update_data = {}
+            for field, value in payload.model_dump().items():
+                if value is not UNSET:
+                    update_data[field] = value
+
+            # Handle credentials in config updates
+            if 'config' in update_data and isinstance(update_data['config'], dict):
+                existing_config = tool.config or {}
+                auth_creds = update_data['config'].get('auth_credentials')
+
+                if auth_creds == {'masked': True}:
+                    # Explicit masked indicator - preserve existing credentials
+                    logger.info(
+                        f'Preserving existing credentials for tool {tool_id} (masked indicator)'
+                    )
+                    if 'auth_credentials' in existing_config:
+                        update_data['config']['auth_credentials'] = existing_config[
+                            'auth_credentials'
+                        ]
+                    else:
+                        # No existing credentials, remove masked placeholder
+                        del update_data['config']['auth_credentials']
+                elif 'auth_credentials' not in update_data['config']:
+                    # auth_credentials not included in update - preserve existing
+                    logger.info(
+                        f'Preserving existing credentials for tool {tool_id} (not in update)'
+                    )
+                    if 'auth_credentials' in existing_config:
+                        update_data['config']['auth_credentials'] = existing_config[
+                            'auth_credentials'
+                        ]
+                # else: new credentials provided, use them
+
+            # Check name uniqueness if name is being updated
+            if 'name' in update_data and update_data['name'] != tool.name:
+                existing = await self.tool_repository.find_one(
+                    name=update_data['name'], is_deleted=False
+                )
+                if existing:
+                    raise ValueError(
+                        f'Tool with name "{update_data["name"]}" already exists'
+                    )
+
+            # Update tool
+            updated_tool = await self.tool_repository.find_one_and_update(
+                filters={'id': tool_id}, refresh=True, **update_data
+            )
+
+            # Invalidate caches
+            self.cache_manager.remove(self._get_tool_cache_key(tool_id))
+            self.cache_manager.remove(self._get_tools_list_cache_key())
+
+            # Invalidate agent tools cache for all agents using this tool
+            associations = await self.tool_association_repository.find(
+                limit=1000, tool_id=tool_id
+            )
+            for assoc in associations:
+                self.cache_manager.remove(
+                    self._get_agent_tools_cache_key(assoc.voice_agent_id)
+                )
+                # Invalidate call processing cache
+                await invalidate_call_processing_cache(
+                    'voice_agent', assoc.voice_agent_id, 'update'
+                )
+
+            logger.info(f'Updated tool: {updated_tool.name} (ID: {tool_id})')
+            return updated_tool
+
+        except Exception as e:
+            logger.error(f'Error updating tool {tool_id}: {str(e)}')
+            raise
+
+    async def delete_tool(self, tool_id: UUID) -> bool:
+        """
+        Soft delete a tool
+
+        Args:
+            tool_id: Tool ID
+
+        Returns:
+            True if successful
+
+        Raises:
+            ValueError: If tool not found
+        """
+        try:
+            # Get existing tool
+            tool = await self.tool_repository.find_one(id=tool_id, is_deleted=False)
+            if not tool:
+                raise ValueError(f'Tool with ID {tool_id} not found')
+
+            # Soft delete
+            await self.tool_repository.find_one_and_update(
+                filters={'id': tool_id}, refresh=True, is_deleted=True
+            )
+
+            # Delete all associations for this tool
+            associations = await self.tool_association_repository.find(
+                limit=1000, tool_id=tool_id
+            )
+            for assoc in associations:
+                await self.tool_association_repository.delete_all(id=assoc.id)
+                # Invalidate agent cache
+                self.cache_manager.remove(
+                    self._get_agent_tools_cache_key(assoc.voice_agent_id)
+                )
+                # Invalidate call processing cache
+                await invalidate_call_processing_cache(
+                    'voice_agent', assoc.voice_agent_id, 'update'
+                )
+
+            # Invalidate caches
+            self.cache_manager.remove(self._get_tool_cache_key(tool_id))
+            self.cache_manager.remove(self._get_tools_list_cache_key())
+
+            logger.info(f'Deleted tool: {tool.name} (ID: {tool_id})')
+            return True
+
+        except Exception as e:
+            logger.error(f'Error deleting tool {tool_id}: {str(e)}')
+            raise
+
+    async def attach_tool_to_agent(
+        self, agent_id: UUID, payload: AttachToolToAgentPayload
+    ) -> VoiceAgentToolAssociation:
+        """
+        Attach a tool to a voice agent
+
+        Args:
+            agent_id: Voice agent ID
+            payload: Attachment payload
+
+        Returns:
+            Created association
+
+        Raises:
+            ValueError: If tool not found or already attached
+        """
+        try:
+            # Check if tool exists
+            tool = await self.get_tool(payload.tool_id)
+            if not tool:
+                raise ValueError(f'Tool with ID {payload.tool_id} not found')
+
+            # Check if already attached
+            existing = await self.tool_association_repository.find_one(
+                voice_agent_id=agent_id, tool_id=payload.tool_id
+            )
+            if existing:
+                raise ValueError(
+                    f'Tool {payload.tool_id} already attached to agent {agent_id}'
+                )
+
+            # Create association
+            created = await self.tool_association_repository.create(
+                id=uuid.uuid4(),
+                voice_agent_id=agent_id,
+                tool_id=payload.tool_id,
+                is_enabled=payload.is_enabled,
+                config_overrides=payload.config_overrides,
+                priority=payload.priority,
+            )
+
+            # Invalidate agent tools cache
+            self.cache_manager.remove(self._get_agent_tools_cache_key(agent_id))
+            # Invalidate call processing cache
+            await invalidate_call_processing_cache('voice_agent', agent_id, 'update')
+
+            logger.info(
+                f'Attached tool {payload.tool_id} to agent {agent_id} (priority: {payload.priority})'
+            )
+            return created
+
+        except Exception as e:
+            logger.error(f'Error attaching tool to agent {agent_id}: {str(e)}')
+            raise
+
+    async def detach_tool_from_agent(self, agent_id: UUID, tool_id: UUID) -> bool:
+        """
+        Detach a tool from a voice agent
+
+        Args:
+            agent_id: Voice agent ID
+            tool_id: Tool ID
+
+        Returns:
+            True if successful
+
+        Raises:
+            ValueError: If association not found
+        """
+        try:
+            # Find association
+            association = await self.tool_association_repository.find_one(
+                voice_agent_id=agent_id, tool_id=tool_id
+            )
+            if not association:
+                raise ValueError(f'Tool {tool_id} not attached to agent {agent_id}')
+
+            # Delete association
+            await self.tool_association_repository.delete_all(id=association.id)
+
+            # Invalidate agent tools cache
+            self.cache_manager.remove(self._get_agent_tools_cache_key(agent_id))
+            # Invalidate call processing cache
+            await invalidate_call_processing_cache('voice_agent', agent_id, 'update')
+
+            logger.info(f'Detached tool {tool_id} from agent {agent_id}')
+            return True
+
+        except Exception as e:
+            logger.error(f'Error detaching tool from agent {agent_id}: {str(e)}')
+            raise
+
+    async def get_agent_tools(self, agent_id: UUID) -> List[Dict[str, Any]]:
+        """
+        Get all tools for a voice agent (sorted by priority)
+
+        Args:
+            agent_id: Voice agent ID
+
+        Returns:
+            List of tool dicts with association details
+        """
+        try:
+            cache_key = self._get_agent_tools_cache_key(agent_id)
+
+            # Try to get from cache
+            cached_str = self.cache_manager.get_str(cache_key)
+            if cached_str:
+                logger.debug(f'Agent {agent_id} tools retrieved from cache')
+                return json.loads(cached_str)
+
+            # Get associations sorted by priority (descending)
+            # Note: SQLAlchemyRepository.find() doesn't support order_by, results may not be sorted
+            associations = await self.tool_association_repository.find(
+                limit=1000, voice_agent_id=agent_id
+            )
+            # Sort in Python since repo doesn't support order_by
+            associations = sorted(associations, key=lambda x: x.priority, reverse=True)
+
+            # Build result with tool details
+            result = []
+            for assoc in associations:
+                tool = await self.get_tool(assoc.tool_id, exclude_sensitive=False)
+                if tool and not tool.is_deleted:
+                    tool_data = tool.to_dict(exclude_sensitive=False)
+                    tool_data['association'] = {
+                        'is_enabled': assoc.is_enabled,
+                        'config_overrides': assoc.config_overrides,
+                        'priority': assoc.priority,
+                    }
+                    result.append(tool_data)
+
+            # Cache the result
+            self.cache_manager.add(
+                cache_key, json.dumps(result), expiry=self.tool_cache_time
+            )
+            logger.debug(
+                f'Agent {agent_id} tools cached ({len(result)} tools, {self.tool_cache_time}s TTL)'
+            )
+
+            return result
+
+        except Exception as e:
+            logger.error(f'Error getting tools for agent {agent_id}: {str(e)}')
+            raise
+
+    async def update_agent_tool(
+        self, agent_id: UUID, tool_id: UUID, payload: UpdateAgentToolPayload
+    ) -> VoiceAgentToolAssociation:
+        """
+        Update a tool association for an agent
+
+        Args:
+            agent_id: Voice agent ID
+            tool_id: Tool ID
+            payload: Update payload
+
+        Returns:
+            Updated association
+
+        Raises:
+            ValueError: If association not found
+        """
+        try:
+            # Find association
+            association = await self.tool_association_repository.find_one(
+                voice_agent_id=agent_id, tool_id=tool_id
+            )
+            if not association:
+                raise ValueError(f'Tool {tool_id} not attached to agent {agent_id}')
+
+            # Prepare update data
+            update_data = {}
+            for field, value in payload.model_dump().items():
+                if value is not UNSET:
+                    update_data[field] = value
+
+            # Update association
+            updated = await self.tool_association_repository.find_one_and_update(
+                filters={'id': association.id}, refresh=True, **update_data
+            )
+
+            # Invalidate agent tools cache
+            self.cache_manager.remove(self._get_agent_tools_cache_key(agent_id))
+            # Invalidate call processing cache
+            await invalidate_call_processing_cache('voice_agent', agent_id, 'update')
+
+            logger.info(f'Updated tool {tool_id} association for agent {agent_id}')
+            return updated
+
+        except Exception as e:
+            logger.error(f'Error updating agent tool association: {str(e)}')
+            raise
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/voice_agents_container.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/voice_agents_container.py
index f799c4f8..c35172ea 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/voice_agents_container.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/voice_agents_container.py
@@ -5,6 +5,8 @@
 from db_repo_module.models.stt_config import SttConfig
 from db_repo_module.models.voice_agent import VoiceAgent
 from db_repo_module.models.llm_inference_config import LlmInferenceConfig
+from db_repo_module.models.voice_agent_tool import VoiceAgentTool
+from db_repo_module.models.voice_agent_tool_association import VoiceAgentToolAssociation
 from db_repo_module.repositories.sql_alchemy_repository import SQLAlchemyRepository
 from voice_agents_module.services.telephony_config_service import TelephonyConfigService
 from voice_agents_module.services.tts_config_service import TtsConfigService
@@ -12,6 +14,7 @@
 from voice_agents_module.services.voice_agent_service import VoiceAgentService
 from voice_agents_module.services.twilio_service import TwilioService
 from voice_agents_module.services.tts_generator_service import TTSGeneratorService
+from voice_agents_module.services.tool_service import ToolService
 
 
 class VoiceAgentsContainer(containers.DeclarativeContainer):
@@ -53,6 +56,18 @@ class VoiceAgentsContainer(containers.DeclarativeContainer):
         db_client=db_client,
     )
 
+    tool_repository = providers.Singleton(
+        SQLAlchemyRepository[VoiceAgentTool],
+        model=VoiceAgentTool,
+        db_client=db_client,
+    )
+
+    tool_association_repository = providers.Singleton(
+        SQLAlchemyRepository[VoiceAgentToolAssociation],
+        model=VoiceAgentToolAssociation,
+        db_client=db_client,
+    )
+
     # Services
     telephony_config_service = providers.Singleton(
         TelephonyConfigService,
@@ -93,3 +108,10 @@ class VoiceAgentsContainer(containers.DeclarativeContainer):
         TwilioService,
         call_processing_base_url=config.voice_agents.call_processing_base_url,
     )
+
+    tool_service = providers.Singleton(
+        ToolService,
+        tool_repository=tool_repository,
+        tool_association_repository=tool_association_repository,
+        cache_manager=cache_manager,
+    )

From d50dc856b25dc4b9eb1a41d2db5e06909af7aa26 Mon Sep 17 00:00:00 2001
From: rootflo-hardik <hardik@rootflo.ai>
Date: Mon, 19 Jan 2026 15:25:42 +0530
Subject: [PATCH 8/8] resolved comments

---
 .../voice-agents/CreateVoiceAgentDialog.tsx   |  14 +-
 .../voice-agents/EditVoiceAgentDialog.tsx     |  14 +-
 .../apps/[appId]/voice-agents/tools/index.tsx |  13 +-
 wavefront/client/src/types/tool.ts            |   6 +-
 .../controllers/webhook_controller.py         |   7 +-
 .../services/floware_http_client.py           |   9 +-
 .../services/tool_wrapper_service.py          |  30 ++-
 ...49da528_add_inbound_voice_agent_support.py |   2 +-
 ...4d5e6f7_create_voice_agent_tools_tables.py | 205 +++++++++++-------
 .../models/tool_schemas.py                    |  73 +++++--
 .../services/tool_service.py                  |  42 +++-
 11 files changed, 297 insertions(+), 118 deletions(-)

diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
index 7929eb74..ec275b5f 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/CreateVoiceAgentDialog.tsx
@@ -169,18 +169,24 @@ const CreateVoiceAgentDialog: React.FC<CreateVoiceAgentDialogProps> = ({ isOpen,
       }
     }
 
-    // Build TTS parameters (filter out empty values)
+    // Build TTS parameters (filter out empty values + unsupported keys)
+    const allowedTtsKeys = new Set(
+      Object.keys(ttsProviderConfig?.parameters ?? {}).filter((key) => key !== 'language')
+    );
     const builtTtsParameters: Record<string, unknown> = {};
     Object.entries(ttsParameters).forEach(([key, value]) => {
-      if (value !== '' && value !== undefined && value !== null) {
+      if (allowedTtsKeys.has(key) && value !== '' && value !== undefined && value !== null) {
         builtTtsParameters[key] = value;
       }
     });
 
-    // Build STT parameters (filter out empty values)
+    // Build STT parameters (filter out empty values + unsupported keys)
+    const allowedSttKeys = new Set(
+      Object.keys(sttProviderConfig?.parameters ?? {}).filter((key) => key !== 'language')
+    );
     const builtSttParameters: Record<string, unknown> = {};
     Object.entries(sttParameters).forEach(([key, value]) => {
-      if (value !== '' && value !== undefined && value !== null) {
+      if (allowedSttKeys.has(key) && value !== '' && value !== undefined && value !== null) {
         builtSttParameters[key] = value;
       }
     });
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
index 66894768..5475064e 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/EditVoiceAgentDialog.tsx
@@ -182,18 +182,24 @@ const EditVoiceAgentDialog: React.FC<EditVoiceAgentDialogProps> = ({
       }
     }
 
-    // Build TTS parameters (filter out empty values)
+    // Build TTS parameters (filter out empty values + unsupported keys)
+    const allowedTtsKeys = new Set(
+      Object.keys(ttsProviderConfig?.parameters ?? {}).filter((key) => key !== 'language')
+    );
     const builtTtsParameters: Record<string, unknown> = {};
     Object.entries(ttsParameters).forEach(([key, value]) => {
-      if (value !== '' && value !== undefined && value !== null) {
+      if (allowedTtsKeys.has(key) && value !== '' && value !== undefined && value !== null) {
         builtTtsParameters[key] = value;
       }
     });
 
-    // Build STT parameters (filter out empty values)
+    // Build STT parameters (filter out empty values + unsupported keys)
+    const allowedSttKeys = new Set(
+      Object.keys(sttProviderConfig?.parameters ?? {}).filter((key) => key !== 'language')
+    );
     const builtSttParameters: Record<string, unknown> = {};
     Object.entries(sttParameters).forEach(([key, value]) => {
-      if (value !== '' && value !== undefined && value !== null) {
+      if (allowedSttKeys.has(key) && value !== '' && value !== undefined && value !== null) {
         builtSttParameters[key] = value;
       }
     });
diff --git a/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
index 122f2114..b5875864 100644
--- a/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
+++ b/wavefront/client/src/pages/apps/[appId]/voice-agents/tools/index.tsx
@@ -29,7 +29,7 @@ const ToolsPage: React.FC = () => {
   const [editItem, setEditItem] = useState<VoiceAgentTool | null>(null);
 
   // Fetch tools
-  const { data: tools = [], isLoading: toolsLoading } = useGetVoiceAgentTools(app);
+  const { data: tools = [], isLoading: toolsLoading, isError, error } = useGetVoiceAgentTools(app);
 
   const handleDeleteClick = (e: React.MouseEvent, tool: VoiceAgentTool) => {
     e.stopPropagation();
@@ -124,7 +124,16 @@ const ToolsPage: React.FC = () => {
           </div>
         </div>
 
-        {toolsLoading ? (
+        {isError ? (
+          <div className="mt-10 flex justify-center">
+            <EmptyStateCard
+              title="Error loading tools"
+              description={extractErrorMessage(error) || 'Failed to fetch voice agent tools. Please try again.'}
+              actionText="Retry"
+              onActionClick={() => queryClient.invalidateQueries({ queryKey: getVoiceAgentToolsKey(app || '') })}
+            />
+          </div>
+        ) : toolsLoading ? (
           <div className="flex justify-center py-10">
             <div className="text-gray-500">Loading tools...</div>
           </div>
diff --git a/wavefront/client/src/types/tool.ts b/wavefront/client/src/types/tool.ts
index cfc0e694..45521d8f 100644
--- a/wavefront/client/src/types/tool.ts
+++ b/wavefront/client/src/types/tool.ts
@@ -97,12 +97,12 @@ export interface ApiToolConfig {
  * Python Tool Configuration (Phase 2)
  */
 export interface PythonToolConfig {
-  code_storage_key?: string;
-  cloud_run_url?: string;
+  code_storage_key: string;
+  cloud_run_url: string;
+  timeout?: number;
   resource_limits?: {
     cpu?: string;
     memory?: string;
-    timeout?: number;
   };
 }
 
diff --git a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
index 8941d540..22410e0a 100644
--- a/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
+++ b/wavefront/server/apps/call_processing/call_processing/controllers/webhook_controller.py
@@ -54,7 +54,12 @@ async def inbound_webhook(
         To: Called phone number (E.164 format, the inbound number)
         CallSid: Twilio call identifier
     """
-    logger.info(f'Inbound call received: From={From}, To={To}, CallSid={CallSid}')
+    # Mask phone numbers for privacy (show last 4 digits only)
+    masked_from = f'***{From[-4:]}' if len(From) > 4 else '****'
+    masked_to = f'***{To[-4:]}' if len(To) > 4 else '****'
+    logger.info(
+        f'Inbound call received: From={masked_from}, To={masked_to}, CallSid={CallSid}'
+    )
 
     # Look up agent by inbound number
     agent = await voice_agent_cache_service.get_agent_by_inbound_number(To)
diff --git a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
index ad82ba75..ed801990 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/floware_http_client.py
@@ -156,11 +156,16 @@ async def get_agent_by_inbound_number(
                 return data
 
             except httpx.HTTPStatusError as e:
+                redacted = (
+                    f'{phone_number[:2]}****{phone_number[-2:]}'
+                    if phone_number
+                    else 'unknown'
+                )
                 if e.response.status_code == 404:
-                    logger.info(f'No agent found for inbound number: {phone_number}')
+                    logger.info(f'No agent found for inbound number: {redacted}')
                     return None
                 logger.error(
-                    f'HTTP error fetching agent by inbound number {phone_number}: '
+                    f'HTTP error fetching agent by inbound number {redacted}: '
                     f'status={e.response.status_code}'
                 )
                 raise
diff --git a/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py b/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
index e393eba4..07adc927 100644
--- a/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
+++ b/wavefront/server/apps/call_processing/call_processing/services/tool_wrapper_service.py
@@ -325,8 +325,34 @@ def create_all_tool_functions(
 
                 # Apply config overrides if present
                 config_overrides = tool.get('association', {}).get('config_overrides')
-                if config_overrides and hasattr(wrapper, 'config'):
-                    wrapper.config.update(config_overrides)
+                if config_overrides:
+                    if isinstance(wrapper, ApiToolWrapper):
+                        # For ApiToolWrapper, set attributes directly
+                        allowed_attrs = {
+                            'url',
+                            'method',
+                            'headers',
+                            'auth_type',
+                            'auth_credentials',
+                            'timeout',
+                        }
+                        for key, value in config_overrides.items():
+                            if key in allowed_attrs:
+                                if hasattr(wrapper, key):
+                                    setattr(wrapper, key, value)
+                                    logger.debug(
+                                        f"Applied config override for tool '{tool['name']}': {key}={value}"
+                                    )
+                            else:
+                                logger.debug(
+                                    f"Ignoring unknown config override key for tool '{tool['name']}': {key}"
+                                )
+                    elif hasattr(wrapper, 'config'):
+                        # For wrappers with config dict (e.g., PythonToolWrapper)
+                        wrapper.config.update(config_overrides)
+                        logger.debug(
+                            f"Applied config overrides for tool '{tool['name']}': {config_overrides}"
+                        )
 
                 # Create Pipecat FunctionSchema and callable function
                 function_schema, callable_func = (
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
index 62b3ed1b..d04dde26 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_08_1547-6010e49da528_add_inbound_voice_agent_support.py
@@ -150,7 +150,7 @@ def upgrade() -> None:
 
 
 def downgrade() -> None:
-    # Restore phone_numbers column to telephony_configs table
+    # Restore phone_numbers column to telephony_configs table (won't restore data)
     op.add_column(
         'telephony_configs', sa.Column('phone_numbers', sa.Text(), nullable=True)
     )
diff --git a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
index e8477860..3752a9c3 100644
--- a/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
+++ b/wavefront/server/modules/db_repo_module/db_repo_module/alembic/versions/2026_01_13_1200-a5b3c4d5e6f7_create_voice_agent_tools_tables.py
@@ -40,87 +40,118 @@ def upgrade() -> None:
         'api', 'python', name='tool_type_enum', create_type=False
     )
 
-    # Check if voice_agent_tools table already exists
+    # Get inspector to check for existing tables
     inspector = sa.inspect(connection)
-    if 'voice_agent_tools' in inspector.get_table_names():
+    existing_tables = inspector.get_table_names()
+
+    # Create voice_agent_tools table if it doesn't exist
+    if 'voice_agent_tools' not in existing_tables:
+        op.create_table(
+            'voice_agent_tools',
+            sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column('name', sa.String(length=100), nullable=False),
+            sa.Column('display_name', sa.String(length=255), nullable=False),
+            sa.Column('description', sa.Text(), nullable=False),
+            sa.Column('tool_type', tool_type_enum, nullable=False),
+            sa.Column(
+                'config', postgresql.JSONB(astext_type=sa.Text()), nullable=False
+            ),
+            sa.Column(
+                'parameter_schema',
+                postgresql.JSONB(astext_type=sa.Text()),
+                nullable=True,
+            ),
+            sa.Column('response_template', sa.Text(), nullable=True),
+            sa.Column('created_by', postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column(
+                'is_deleted', sa.Boolean(), nullable=False, server_default='false'
+            ),
+            sa.Column(
+                'created_at',
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.text('now()'),
+            ),
+            sa.Column(
+                'updated_at',
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.text('now()'),
+            ),
+            sa.PrimaryKeyConstraint('id'),
+            sa.UniqueConstraint('name', name='uq_voice_agent_tool_name'),
+        )
+        op.create_index(
+            op.f('ix_voice_agent_tools_id'), 'voice_agent_tools', ['id'], unique=False
+        )
+        op.create_index(
+            op.f('ix_voice_agent_tools_name'),
+            'voice_agent_tools',
+            ['name'],
+            unique=True,
+        )
+    else:
         print("Table 'voice_agent_tools' already exists, skipping creation")
-        return
-
-    # Create voice_agent_tools table
-    op.create_table(
-        'voice_agent_tools',
-        sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
-        sa.Column('name', sa.String(length=100), nullable=False),
-        sa.Column('display_name', sa.String(length=255), nullable=False),
-        sa.Column('description', sa.Text(), nullable=False),
-        sa.Column('tool_type', tool_type_enum, nullable=False),
-        sa.Column('config', postgresql.JSONB(astext_type=sa.Text()), nullable=False),
-        sa.Column(
-            'parameter_schema', postgresql.JSONB(astext_type=sa.Text()), nullable=True
-        ),
-        sa.Column('response_template', sa.Text(), nullable=True),
-        sa.Column('created_by', postgresql.UUID(as_uuid=True), nullable=True),
-        sa.Column('is_deleted', sa.Boolean(), nullable=False, server_default='false'),
-        sa.Column(
-            'created_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
-        ),
-        sa.Column(
-            'updated_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
-        ),
-        sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('name', name='uq_voice_agent_tool_name'),
-    )
-    op.create_index(
-        op.f('ix_voice_agent_tools_id'), 'voice_agent_tools', ['id'], unique=False
-    )
-    op.create_index(
-        op.f('ix_voice_agent_tools_name'), 'voice_agent_tools', ['name'], unique=True
-    )
 
-    # Create voice_agent_tool_associations table
-    op.create_table(
-        'voice_agent_tool_associations',
-        sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
-        sa.Column('voice_agent_id', postgresql.UUID(as_uuid=True), nullable=False),
-        sa.Column('tool_id', postgresql.UUID(as_uuid=True), nullable=False),
-        sa.Column('is_enabled', sa.Boolean(), nullable=False, server_default='true'),
-        sa.Column(
-            'config_overrides', postgresql.JSONB(astext_type=sa.Text()), nullable=True
-        ),
-        sa.Column('priority', sa.Integer(), nullable=False, server_default='0'),
-        sa.Column(
-            'created_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
-        ),
-        sa.Column(
-            'updated_at', sa.DateTime(), nullable=False, server_default=sa.text('now()')
-        ),
-        sa.ForeignKeyConstraint(
-            ['voice_agent_id'], ['voice_agents.id'], ondelete='CASCADE'
-        ),
-        sa.ForeignKeyConstraint(
-            ['tool_id'], ['voice_agent_tools.id'], ondelete='CASCADE'
-        ),
-        sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('voice_agent_id', 'tool_id', name='uq_voice_agent_tool'),
-    )
-    op.create_index(
-        op.f('ix_voice_agent_tool_associations_id'),
-        'voice_agent_tool_associations',
-        ['id'],
-        unique=False,
-    )
-    op.create_index(
-        op.f('ix_voice_agent_tool_associations_voice_agent_id'),
-        'voice_agent_tool_associations',
-        ['voice_agent_id'],
-        unique=False,
-    )
-    op.create_index(
-        op.f('ix_voice_agent_tool_associations_tool_id'),
-        'voice_agent_tool_associations',
-        ['tool_id'],
-        unique=False,
-    )
+    # Create voice_agent_tool_associations table if it doesn't exist
+    if 'voice_agent_tool_associations' not in existing_tables:
+        op.create_table(
+            'voice_agent_tool_associations',
+            sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column('voice_agent_id', postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column('tool_id', postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column(
+                'is_enabled', sa.Boolean(), nullable=False, server_default='true'
+            ),
+            sa.Column(
+                'config_overrides',
+                postgresql.JSONB(astext_type=sa.Text()),
+                nullable=True,
+            ),
+            sa.Column('priority', sa.Integer(), nullable=False, server_default='0'),
+            sa.Column(
+                'created_at',
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.text('now()'),
+            ),
+            sa.Column(
+                'updated_at',
+                sa.DateTime(),
+                nullable=False,
+                server_default=sa.text('now()'),
+            ),
+            sa.ForeignKeyConstraint(
+                ['voice_agent_id'], ['voice_agents.id'], ondelete='CASCADE'
+            ),
+            sa.ForeignKeyConstraint(
+                ['tool_id'], ['voice_agent_tools.id'], ondelete='CASCADE'
+            ),
+            sa.PrimaryKeyConstraint('id'),
+            sa.UniqueConstraint(
+                'voice_agent_id', 'tool_id', name='uq_voice_agent_tool'
+            ),
+        )
+        op.create_index(
+            op.f('ix_voice_agent_tool_associations_id'),
+            'voice_agent_tool_associations',
+            ['id'],
+            unique=False,
+        )
+        op.create_index(
+            op.f('ix_voice_agent_tool_associations_voice_agent_id'),
+            'voice_agent_tool_associations',
+            ['voice_agent_id'],
+            unique=False,
+        )
+        op.create_index(
+            op.f('ix_voice_agent_tool_associations_tool_id'),
+            'voice_agent_tool_associations',
+            ['tool_id'],
+            unique=False,
+        )
+    else:
+        print("Table 'voice_agent_tool_associations' already exists, skipping creation")
 
 
 def downgrade() -> None:
@@ -143,6 +174,18 @@ def downgrade() -> None:
     op.drop_index(op.f('ix_voice_agent_tools_id'), table_name='voice_agent_tools')
     op.drop_table('voice_agent_tools')
 
-    # Drop enum type
-    tool_type_enum = postgresql.ENUM('api', 'python', name='tool_type_enum')
-    tool_type_enum.drop(op.get_bind(), checkfirst=True)
+    # Only drop enum type if no other columns are using it
+    connection = op.get_bind()
+    result = connection.execute(
+        sa.text("""
+            SELECT COUNT(*)
+            FROM pg_attribute a
+            JOIN pg_type t ON a.atttypid = t.oid
+            WHERE t.typname = 'tool_type_enum'
+        """)
+    ).fetchone()
+
+    # Only drop the enum if no columns are using it
+    if result and result[0] == 0:
+        tool_type_enum = postgresql.ENUM('api', 'python', name='tool_type_enum')
+        tool_type_enum.drop(op.get_bind(), checkfirst=True)
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
index a3e6e76c..128b42bc 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/models/tool_schemas.py
@@ -4,6 +4,8 @@
 from datetime import datetime
 import uuid
 import re
+import ipaddress
+from urllib.parse import urlparse
 
 # Sentinel value for partial updates
 UNSET = object()
@@ -50,23 +52,27 @@ def validate_method(cls, v):
     @field_validator('url')
     @classmethod
     def validate_url(cls, v):
-        # Basic URL validation
-        if not v.startswith(('http://', 'https://')):
+        parsed = urlparse(v)
+        if parsed.scheme not in {'http', 'https'}:
             raise ValueError('URL must start with http:// or https://')
-        # Reject localhost and internal IPs
-        if any(
-            host in v.lower()
-            for host in [
-                'localhost',
-                '127.0.0.1',
-                '0.0.0.0',
-                '::1',
-                '10.',
-                '192.168.',
-                '172.16.',
-            ]
-        ):
+        host = parsed.hostname
+        if not host:
+            raise ValueError('URL must include a hostname')
+        if host in {'localhost'}:
             raise ValueError('Cannot use localhost or internal IP addresses')
+        try:
+            ip = ipaddress.ip_address(host)
+            if (
+                ip.is_private
+                or ip.is_loopback
+                or ip.is_link_local
+                or ip.is_reserved
+                or ip.is_multicast
+            ):
+                raise ValueError('Cannot use localhost or internal IP addresses')
+        except ValueError:
+            # Non-IP hostnames are allowed (optionally add DNS-based checks)
+            pass
         return v
 
     @field_validator('auth_type')
@@ -206,6 +212,43 @@ def validate_name(cls, v):
             )
         return v
 
+    @field_validator('config')
+    @classmethod
+    def validate_config(cls, v, info):
+        """
+        Validate config structure when both config and tool_type are provided.
+        Note: Service-level validation handles cases where only config is updated.
+        """
+        if v is UNSET:
+            return v
+
+        # Only validate if tool_type is also provided in this update
+        tool_type = info.data.get('tool_type')
+        if tool_type is UNSET or tool_type is None:
+            # Config will be validated at service layer against existing tool_type
+            return v
+
+        # Handle both enum and string values
+        tool_type_value = (
+            tool_type
+            if isinstance(tool_type, str)
+            else (tool_type.value if tool_type else None)
+        )
+
+        if tool_type_value == 'api':
+            # Validate as ApiToolConfig
+            try:
+                ApiToolConfig(**v)
+            except Exception as e:
+                raise ValueError(f'Invalid API tool config: {str(e)}')
+        elif tool_type_value == 'python':
+            # Validate as PythonToolConfig
+            try:
+                PythonToolConfig(**v)
+            except Exception as e:
+                raise ValueError(f'Invalid Python tool config: {str(e)}')
+        return v
+
     @field_validator('parameter_schema')
     @classmethod
     def validate_parameter_schema(cls, v):
diff --git a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py
index 5ae614fe..b1152014 100644
--- a/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py
+++ b/wavefront/server/modules/voice_agents_module/voice_agents_module/services/tool_service.py
@@ -13,6 +13,9 @@
     UpdateToolPayload,
     AttachToolToAgentPayload,
     UpdateAgentToolPayload,
+    ToolType,
+    ApiToolConfig,
+    PythonToolConfig,
     UNSET,
 )
 from voice_agents_module.utils.cache_invalidation import (
@@ -69,9 +72,7 @@ async def create_tool(self, payload: CreateToolPayload) -> VoiceAgentTool:
         """
         try:
             # Check if tool with same name exists
-            existing = await self.tool_repository.find_one(
-                name=payload.name, is_deleted=False
-            )
+            existing = await self.tool_repository.find_one(name=payload.name)
             if existing:
                 raise ValueError(f'Tool with name "{payload.name}" already exists')
 
@@ -226,6 +227,41 @@ async def update_tool(
                 if value is not UNSET:
                     update_data[field] = value
 
+            # Validate and normalize tool_type if provided
+            if 'tool_type' in update_data:
+                tool_type_value = update_data['tool_type']
+                # Convert enum to string value if needed
+                if hasattr(tool_type_value, 'value'):
+                    tool_type_value = tool_type_value.value
+                tool_type_value = str(tool_type_value).lower()
+                # Validate against ToolType enum
+                valid_types = {t.value for t in ToolType}
+                if tool_type_value not in valid_types:
+                    raise ValueError(
+                        f'Invalid tool_type: {tool_type_value}. Must be one of {valid_types}'
+                    )
+                update_data['tool_type'] = tool_type_value
+
+            # Validate config against the appropriate schema
+            if 'config' in update_data and isinstance(update_data['config'], dict):
+                tool_type_value = update_data.get('tool_type')
+                if not tool_type_value:
+                    tool_type_value = tool.tool_type
+                tool_type_value = (
+                    tool_type_value.value
+                    if hasattr(tool_type_value, 'value')
+                    else str(tool_type_value).lower()
+                )
+                try:
+                    if tool_type_value == 'api':
+                        ApiToolConfig(**update_data['config'])
+                    elif tool_type_value == 'python':
+                        PythonToolConfig(**update_data['config'])
+                except Exception as e:
+                    raise ValueError(
+                        f'Invalid config for tool type {tool_type_value}: {str(e)}'
+                    )
+
             # Handle credentials in config updates
             if 'config' in update_data and isinstance(update_data['config'], dict):
                 existing_config = tool.config or {}