fix: regression in sso login caused due to attempting in hiding client secret in the API response. Resolves #21

feat: set conversation reference number in the subject of conversation for better thread matching.
fix: hide CSAT link from conversation last message.

README.md

@@ -7,7 +7,7 @@ Open source, self-hosted customer support desk. Single binary app.
 
 Visit [libredesk.io](https://libredesk.io) for more info. Check out the [**Live demo**](https://demo.libredesk.io/).
 
-![Screenshot_20250220_231723](https://github.com/user-attachments/assets/55e0ec68-b624-4442-8387-6157742da253)
+![Screenshot_20250220_231723](https://hebbkx1anhila5yf.public.blob.vercel-storage.com/image-HvmxvOkalQSLp4qVezdTXaCd3dB4Rm.png)
 
 
 > **CAUTION:** This project is currently in **alpha**. Features and APIs may change and are not yet fully tested.
@@ -74,7 +74,7 @@ __________________
 - Run `./libredesk --set-system-user-password` to set the password for the System user.
 - Run `./libredesk` and visit `http://localhost:9000` and login with username `System` and the password you set using the --set-system-user-password command.
 
-See [installation docs](https://libredesk.app/docs/installation)
+See [installation docs](https://libredesk.io/docs/installation)
 __________________
 
 

cmd/ai.go

@@ -1,6 +1,14 @@
 package main
 
-import "github.com/zerodha/fastglue"
+import (
+	"github.com/abhinavxd/libredesk/internal/envelope"
+	"github.com/zerodha/fastglue"
+)
+
+type providerUpdateReq struct {
+	Provider string `json:"provider"`
+	APIKey   string `json:"api_key"`
+}
 
 // handleAICompletion handles AI completion requests
 func handleAICompletion(r *fastglue.Request) error {
@@ -27,3 +35,18 @@ func handleGetAIPrompts(r *fastglue.Request) error {
 	}
 	return r.SendEnvelope(resp)
 }
+
+// handleUpdateAIProvider updates the AI provider
+func handleUpdateAIProvider(r *fastglue.Request) error {
+	var (
+		app = r.Context.(*App)
+		req providerUpdateReq
+	)
+	if err := r.Decode(&req, "json"); err != nil {
+		return sendErrorEnvelope(r, envelope.NewError(envelope.InputError, "Error unmarshalling request", nil))
+	}
+	if err := app.ai.UpdateProvider(req.Provider, req.APIKey); err != nil {
+		return sendErrorEnvelope(r, err)
+	}
+	return r.SendEnvelope("Provider updated successfully")
+}

cmd/auth.go

@@ -75,7 +75,7 @@ func handleOIDCCallback(r *fastglue.Request) error {
 	}
 
 	// Lookup the user by email and set the session.
-	user, err := app.user.GetByEmail(claims.Email)
+	user, err := app.user.GetAgentByEmail(claims.Email)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}

cmd/conversation.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"strconv"
+	"strings"
 	"time"
 
 	amodels "github.com/abhinavxd/libredesk/internal/auth/models"
@@ -42,7 +43,6 @@ func handleGetAllConversations(r *fastglue.Request) error {
 		if conversations[i].SLAPolicyID.Int != 0 {
 			setSLADeadlines(app, &conversations[i])
 		}
-		conversations[i].ID = 0
 	}
 
 	return r.SendEnvelope(envelope.PageResults{
@@ -79,7 +79,6 @@ func handleGetAssignedConversations(r *fastglue.Request) error {
 		if conversations[i].SLAPolicyID.Int != 0 {
 			setSLADeadlines(app, &conversations[i])
 		}
-		conversations[i].ID = 0
 	}
 
 	return r.SendEnvelope(envelope.PageResults{
@@ -116,7 +115,6 @@ func handleGetUnassignedConversations(r *fastglue.Request) error {
 		if conversations[i].SLAPolicyID.Int != 0 {
 			setSLADeadlines(app, &conversations[i])
 		}
-		conversations[i].ID = 0
 	}
 
 	return r.SendEnvelope(envelope.PageResults{
@@ -153,7 +151,7 @@ func handleGetViewConversations(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusForbidden, "You don't have access to this view.", nil, envelope.PermissionError)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -195,7 +193,6 @@ func handleGetViewConversations(r *fastglue.Request) error {
 		if conversations[i].SLAPolicyID.Int != 0 {
 			setSLADeadlines(app, &conversations[i])
 		}
-		conversations[i].ID = 0
 	}
 
 	return r.SendEnvelope(envelope.PageResults{
@@ -248,7 +245,6 @@ func handleGetTeamUnassignedConversations(r *fastglue.Request) error {
 		if conversations[i].SLAPolicyID.Int != 0 {
 			setSLADeadlines(app, &conversations[i])
 		}
-		conversations[i].ID = 0
 	}
 
 	return r.SendEnvelope(envelope.PageResults{
@@ -268,7 +264,7 @@ func handleGetConversation(r *fastglue.Request) error {
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -284,7 +280,6 @@ func handleGetConversation(r *fastglue.Request) error {
 
 	prev, _ := app.conversation.GetContactConversations(conv.ContactID)
 	conv.PreviousConversations = filterCurrentConv(prev, conv.UUID)
-	conv.ID = 0
 	return r.SendEnvelope(conv)
 }
 
@@ -295,7 +290,7 @@ func handleUpdateConversationAssigneeLastSeen(r *fastglue.Request) error {
 		uuid  = r.RequestCtx.UserValue("uuid").(string)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -316,7 +311,7 @@ func handleGetConversationParticipants(r *fastglue.Request) error {
 		uuid  = r.RequestCtx.UserValue("uuid").(string)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -343,7 +338,7 @@ func handleUpdateUserAssignee(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Invalid `assignee_id`", nil, envelope.InputError)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -375,7 +370,7 @@ func handleUpdateTeamAssignee(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Invalid assignee `id`.", nil, envelope.InputError)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -426,7 +421,7 @@ func handleUpdateConversationPriority(r *fastglue.Request) error {
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -471,7 +466,7 @@ func handleUpdateConversationStatus(r *fastglue.Request) error {
 	}
 
 	// Enforce conversation access.
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -528,7 +523,7 @@ func handleUpdateConversationtags(r *fastglue.Request) error {
 		return sendErrorEnvelope(r, err)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -607,7 +602,7 @@ func handleRemoveUserAssignee(r *fastglue.Request) error {
 		uuid  = r.RequestCtx.UserValue("uuid").(string)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -628,7 +623,7 @@ func handleRemoveTeamAssignee(r *fastglue.Request) error {
 		uuid  = r.RequestCtx.UserValue("uuid").(string)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -651,3 +646,99 @@ func filterCurrentConv(convs []cmodels.Conversation, uuid string) []cmodels.Conv
 	}
 	return []cmodels.Conversation{}
 }
+
+// handleCreateConversation creates a new conversation and sends a message to it.
+func handleCreateConversation(r *fastglue.Request) error {
+	var (
+		app             = r.Context.(*App)
+		auser           = r.RequestCtx.UserValue("user").(amodels.User)
+		inboxID         = r.RequestCtx.PostArgs().GetUintOrZero("inbox_id")
+		assignedAgentID = r.RequestCtx.PostArgs().GetUintOrZero("agent_id")
+		assignedTeamID  = r.RequestCtx.PostArgs().GetUintOrZero("team_id")
+		email           = strings.TrimSpace(string(r.RequestCtx.PostArgs().Peek("contact_email")))
+		firstName       = strings.TrimSpace(string(r.RequestCtx.PostArgs().Peek("first_name")))
+		lastName        = strings.TrimSpace(string(r.RequestCtx.PostArgs().Peek("last_name")))
+		subject         = strings.TrimSpace(string(r.RequestCtx.PostArgs().Peek("subject")))
+		content         = string(r.RequestCtx.PostArgs().Peek("content"))
+	)
+	// Validate required fields
+	if inboxID <= 0 {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "inbox_id is required", nil, envelope.InputError)
+	}
+	if subject == "" {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "subject is required", nil, envelope.InputError)
+	}
+	if content == "" {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "content is required", nil, envelope.InputError)
+	}
+	if email == "" {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Contact email is required", nil, envelope.InputError)
+	}
+	if firstName == "" {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "First name is required when creating a new contact", nil, envelope.InputError)
+	}
+
+	user, err := app.user.GetAgent(auser.ID)
+	if err != nil {
+		return sendErrorEnvelope(r, err)
+	}
+
+	// Check if inbox exists and is enabled.
+	inbox, err := app.inbox.GetDBRecord(inboxID)
+	if err != nil {
+		return sendErrorEnvelope(r, err)
+	}
+	if !inbox.Enabled {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "The chosen inbox is disabled", nil, envelope.InputError)
+	}
+
+	// Find or create contact.
+	contact := umodels.User{
+		Email:           null.StringFrom(email),
+		SourceChannelID: null.StringFrom(email),
+		FirstName:       firstName,
+		LastName:        lastName,
+		InboxID:         inboxID,
+	}
+	if err := app.user.CreateContact(&contact); err != nil {
+		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Error creating contact", nil))
+	}
+
+	// Create conversation
+	conversationID, conversationUUID, err := app.conversation.CreateConversation(
+		contact.ID,
+		contact.ContactChannelID,
+		inboxID,
+		"", /** last_message **/
+		time.Now(),
+		subject,
+		true, /** append reference number to subject **/
+	)
+	if err != nil {
+		app.lo.Error("error creating conversation", "error", err)
+		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Error creating conversation", nil))
+	}
+
+	// Send reply to the created conversation.
+	if err := app.conversation.SendReply(nil /**media**/, inboxID, auser.ID, conversationUUID, content, nil /**cc**/, nil /**bcc**/, map[string]any{} /**meta**/); err != nil {
+		if err := app.conversation.DeleteConversation(conversationUUID); err != nil {
+			app.lo.Error("error deleting conversation", "error", err)
+		}
+		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Error sending message", nil))
+	}
+
+	// Assign the conversation to the agent or team.
+	if assignedAgentID > 0 {
+		app.conversation.UpdateConversationUserAssignee(conversationUUID, assignedAgentID, user)
+	}
+	if assignedTeamID > 0 {
+		app.conversation.UpdateConversationTeamAssignee(conversationUUID, assignedTeamID, user)
+	}
+
+	// Send the created conversation back to the client.
+	conversation, err := app.conversation.GetConversation(conversationID, "")
+	if err != nil {
+		app.lo.Error("error fetching created conversation", "error", err)
+	}
+	return r.SendEnvelope(conversation)
+}

cmd/handlers.go

@@ -63,10 +63,12 @@ func initHandlers(g *fastglue.Fastglue, hub *ws.Hub) {
 	g.GET("/api/v1/conversations/{uuid}/messages", perm(handleGetMessages, "messages:read"))
 	g.POST("/api/v1/conversations/{cuuid}/messages", perm(handleSendMessage, "messages:write"))
 	g.PUT("/api/v1/conversations/{cuuid}/messages/{uuid}/retry", perm(handleRetryMessage, "messages:write"))
+	g.POST("/api/v1/conversations", perm(handleCreateConversation, "conversations:write"))
 
 	// Search.
 	g.GET("/api/v1/conversations/search", perm(handleSearchConversations, "conversations:read"))
 	g.GET("/api/v1/messages/search", perm(handleSearchMessages, "messages:read"))
+	g.GET("/api/v1/contacts/search", perm(handleSearchContacts, "conversations:write"))
 
 	// Views.
 	g.GET("/api/v1/views/me", perm(handleGetUserViews, "view:manage"))
@@ -174,6 +176,7 @@ func initHandlers(g *fastglue.Fastglue, hub *ws.Hub) {
 	// AI completion.
 	g.GET("/api/v1/ai/prompts", auth(handleGetAIPrompts))
 	g.POST("/api/v1/ai/completion", auth(handleAICompletion))
+	g.PUT("/api/v1/ai/provider", perm(handleUpdateAIProvider, "ai:manage"))
 
 	// WebSocket.
 	g.GET("/ws", auth(func(r *fastglue.Request) error {

cmd/login.go

@@ -20,6 +20,10 @@ func handleLogin(r *fastglue.Request) error {
 		return sendErrorEnvelope(r, err)
 	}
 
+	if !user.Enabled {
+		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Your account is disabled, please contact administrator", nil))
+	}
+
 	// Set user availability status to online.
 	if err := app.user.UpdateAvailability(user.ID, umodels.Online); err != nil {
 		return sendErrorEnvelope(r, err)

cmd/macro.go

@@ -145,7 +145,7 @@ func handleApplyMacro(r *fastglue.Request) error {
 		id, _            = strconv.Atoi(r.RequestCtx.UserValue("id").(string))
 		incomingActions  = []autoModels.RuleAction{}
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -239,7 +239,7 @@ func setDisplayValues(app *App, actions []autoModels.RuleAction) error {
 			return t.Name, nil
 		},
 		autoModels.ActionAssignUser: func(id int) (string, error) {
-			u, err := app.user.Get(id)
+			u, err := app.user.GetAgent(id)
 			if err != nil {
 				app.lo.Warn("user not found for macro action", "user_id", id)
 				return "", err

cmd/main.go

@@ -250,7 +250,7 @@ func main() {
 
 	// Start the app update checker.
 	if ko.Bool("app.check_updates") {
-		go checkUpdates(versionString, time.Hour*24, app)
+		go checkUpdates(versionString, time.Hour*1, app)
 	}
 
 	// Wait for shutdown signal.

cmd/media.go

@@ -150,7 +150,7 @@ func handleServeMedia(r *fastglue.Request) error {
 		uuid  = r.RequestCtx.UserValue("uuid").(string)
 	)
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}

cmd/messages.go

@@ -30,7 +30,7 @@ func handleGetMessages(r *fastglue.Request) error {
 		total       = 0
 	)
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -70,7 +70,7 @@ func handleGetMessage(r *fastglue.Request) error {
 		cuuid = r.RequestCtx.UserValue("cuuid").(string)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -105,7 +105,7 @@ func handleRetryMessage(r *fastglue.Request) error {
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -133,13 +133,13 @@ func handleSendMessage(r *fastglue.Request) error {
 		req   = messageReq{}
 	)
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
 
 	// Check permission
-	_, err = enforceConversationAccess(app, cuuid, user)
+	conv, err := enforceConversationAccess(app, cuuid, user)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -163,7 +163,7 @@ func handleSendMessage(r *fastglue.Request) error {
 			return sendErrorEnvelope(r, err)
 		}
 	} else {
-		if err := app.conversation.SendReply(media, user.ID, cuuid, req.Message, req.CC, req.BCC, map[string]interface{}{}); err != nil {
+		if err := app.conversation.SendReply(media, conv.InboxID, user.ID, cuuid, req.Message, req.CC, req.BCC, map[string]any{} /**meta**/); err != nil {
 			return sendErrorEnvelope(r, err)
 		}
 		// Evaluate automation rules.

cmd/middlewares.go

@@ -8,6 +8,7 @@ import (
 	"github.com/abhinavxd/libredesk/internal/envelope"
 	"github.com/valyala/fasthttp"
 	"github.com/zerodha/fastglue"
+	"github.com/zerodha/simplesessions/v3"
 )
 
 // tryAuth is a middleware that attempts to authenticate the user and add them to the context
@@ -23,7 +24,7 @@ func tryAuth(handler fastglue.FastRequestHandler) fastglue.FastRequestHandler {
 		}
 
 		// Try to get user.
-		user, err := app.user.Get(userSession.ID)
+		user, err := app.user.GetAgent(userSession.ID)
 		if err != nil {
 			return handler(r)
 		}
@@ -53,7 +54,7 @@ func auth(handler fastglue.FastRequestHandler) fastglue.FastRequestHandler {
 		}
 
 		// Set user in the request context.
-		user, err := app.user.Get(userSession.ID)
+		user, err := app.user.GetAgent(userSession.ID)
 		if err != nil {
 			return sendErrorEnvelope(r, err)
 		}
@@ -90,11 +91,19 @@ func perm(handler fastglue.FastRequestHandler, perm string) fastglue.FastRequest
 		}
 
 		// Get user from DB.
-		user, err := app.user.Get(sessUser.ID)
+		user, err := app.user.GetAgent(sessUser.ID)
 		if err != nil {
 			return sendErrorEnvelope(r, err)
 		}
 
+		// Destroy session if user is disabled.
+		if !user.Enabled {
+			if err := app.auth.DestroySession(r); err != nil {
+				app.lo.Error("error destroying session", "error", err)
+			}
+			return r.SendErrorEnvelope(http.StatusUnauthorized, "User account disabled", nil, envelope.PermissionError)
+		}
+
 		// Split the permission string into object and action and enforce it.
 		parts := strings.Split(perm, ":")
 		if len(parts) != 2 {
@@ -129,9 +138,17 @@ func authPage(handler fastglue.FastRequestHandler) fastglue.FastRequestHandler {
 		// Validate session.
 		user, err := app.auth.ValidateSession(r)
 		if err != nil {
-			app.lo.Error("error validating session", "error", err)
-			return r.SendErrorEnvelope(http.StatusUnauthorized, "Invalid or expired session", nil, envelope.PermissionError)
+			// Session is not valid, destroy it and redirect to login.
+			if err != simplesessions.ErrInvalidSession {
+				app.lo.Error("error validating session", "error", err)
+				return r.SendErrorEnvelope(http.StatusUnauthorized, "Error validating session", nil, envelope.PermissionError)
+			}
+			if err := app.auth.DestroySession(r); err != nil {
+				app.lo.Error("error destroying session", "error", err)
+			}
 		}
+
+		// User is authenticated.
 		if user.ID > 0 {
 			return handler(r)
 		}
@@ -140,7 +157,7 @@ func authPage(handler fastglue.FastRequestHandler) fastglue.FastRequestHandler {
 		if len(nextURI) == 0 {
 			nextURI = r.RequestCtx.RequestURI()
 		}
-		return r.RedirectURI("/", fasthttp.StatusFound, map[string]interface{}{
+		return r.RedirectURI("/", fasthttp.StatusFound, map[string]any{
 			"next": string(nextURI),
 		}, "")
 	}

cmd/oidc.go

@@ -2,9 +2,11 @@ package main
 
 import (
 	"strconv"
+	"strings"
 
 	"github.com/abhinavxd/libredesk/internal/envelope"
 	"github.com/abhinavxd/libredesk/internal/oidc/models"
+	"github.com/abhinavxd/libredesk/internal/stringutil"
 	"github.com/valyala/fasthttp"
 	"github.com/zerodha/fastglue"
 )
@@ -26,6 +28,10 @@ func handleGetAllOIDC(r *fastglue.Request) error {
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
+	// Replace secrets with dummy values.
+	for i := range out {
+		out[i].ClientSecret = strings.Repeat(stringutil.PasswordDummy, 10)
+	}
 	return r.SendEnvelope(out)
 }
 

cmd/search.go

@@ -44,3 +44,19 @@ func handleSearchMessages(r *fastglue.Request) error {
 	}
 	return r.SendEnvelope(messages)
 }
+
+// handleSearchContacts searches contacts based on the query.
+func handleSearchContacts(r *fastglue.Request) error {
+	var (
+		app = r.Context.(*App)
+		q   = string(r.RequestCtx.QueryArgs().Peek("query"))
+	)
+	if len(q) < minSearchQueryLength {
+		return sendErrorEnvelope(r, envelope.NewError(envelope.InputError, "Query length should be at least 3 characters", nil))
+	}
+	contacts, err := app.search.Contacts(q)
+	if err != nil {
+		return sendErrorEnvelope(r, err)
+	}
+	return r.SendEnvelope(contacts)
+}

cmd/settings.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"net/mail"
 	"strings"
 
 	"github.com/abhinavxd/libredesk/internal/envelope"
@@ -20,14 +21,16 @@ func handleGetGeneralSettings(r *fastglue.Request) error {
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
-	// Unmarshal to add the app.update to the settings.
+	// Unmarshal to set the app.update to the settings, so the frontend can show that an update is available.
 	var settings map[string]interface{}
 	if err := json.Unmarshal(out, &settings); err != nil {
 		app.lo.Error("error unmarshalling settings", "err", err)
 		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Error fetching settings", nil))
 	}
-	// Add the app.update to the settings, adding `app` prefix to the key to match the settings structure in db.
+	// Set the app.update to the settings, adding `app` prefix to the key to match the settings structure in db.
 	settings["app.update"] = app.update
+	// Set app version.
+	settings["app.version"] = versionString
 	return r.SendEnvelope(settings)
 }
 
@@ -98,6 +101,11 @@ func handleUpdateEmailNotificationSettings(r *fastglue.Request) error {
 		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, "Error updating settings", nil))
 	}
 
+	// Make sure it's a valid from email address.
+	if _, err := mail.ParseAddress(req.EmailAddress); err != nil {
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Invalid from email address format", nil, envelope.InputError)
+	}
+
 	if req.Password == "" {
 		req.Password = cur.Password
 	}
@@ -105,5 +113,7 @@ func handleUpdateEmailNotificationSettings(r *fastglue.Request) error {
 	if err := app.setting.Update(req); err != nil {
 		return sendErrorEnvelope(r, err)
 	}
+
+	// No reload implemented, so user has to restart the app.
 	return r.SendEnvelope("Settings updated successfully, Please restart the app for changes to take effect.")
 }

cmd/updates.go

@@ -83,9 +83,9 @@ func checkUpdates(curVersion string, interval time.Duration, app *App) {
 		app.Unlock()
 	}
 
-	// Give a 15 minute buffer after app start in case the admin wants to disable
+	// Give a 5 minute buffer after app start in case the admin wants to disable
 	// update checks entirely and not make a request to upstream.
-	time.Sleep(time.Minute * 15)
+	time.Sleep(time.Minute * 5)
 	fnCheck()
 
 	// Thereafter, check every $interval.

cmd/upgrade.go

@@ -31,6 +31,7 @@ type migFunc struct {
 // The functions are named as: v0.7.0 => migrations.V0_7_0() and are idempotent.
 var migList = []migFunc{
 	{"v0.3.0", migrations.V0_3_0},
+	{"v0.4.0", migrations.V0_4_0},
 }
 
 // upgrade upgrades the database to the current version by running SQL migration files

cmd/users.go

@@ -57,7 +57,7 @@ func handleGetUser(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest,
 			"Invalid user `id`.", nil, envelope.InputError)
 	}
-	user, err := app.user.Get(id)
+	user, err := app.user.GetAgent(id)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -83,7 +83,7 @@ func handleGetCurrentUserTeams(r *fastglue.Request) error {
 		app   = r.Context.(*App)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -101,13 +101,7 @@ func handleUpdateCurrentUser(r *fastglue.Request) error {
 		app   = r.Context.(*App)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
-	if err != nil {
-		return sendErrorEnvelope(r, err)
-	}
-
-	// Get current user.
-	currentUser, err := app.user.Get(user.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -165,8 +159,8 @@ func handleUpdateCurrentUser(r *fastglue.Request) error {
 		}
 
 		// Delete current avatar.
-		if currentUser.AvatarURL.Valid {
-			fileName := filepath.Base(currentUser.AvatarURL.String)
+		if user.AvatarURL.Valid {
+			fileName := filepath.Base(user.AvatarURL.String)
 			app.media.Delete(fileName)
 		}
 
@@ -223,9 +217,9 @@ func handleCreateUser(r *fastglue.Request) error {
 		}
 
 		// Render template and send email.
-		content, err := app.tmpl.RenderTemplate(tmpl.TmplWelcome, map[string]interface{}{
+		content, err := app.tmpl.RenderInMemoryTemplate(tmpl.TmplWelcome, map[string]any{
 			"ResetToken": resetToken,
-			"Email":      user.Email,
+			"Email":      user.Email.String,
 		})
 		if err != nil {
 			app.lo.Error("error rendering template", "error", err)
@@ -316,7 +310,7 @@ func handleGetCurrentUser(r *fastglue.Request) error {
 		app   = r.Context.(*App)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	u, err := app.user.Get(auser.ID)
+	u, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -331,14 +325,14 @@ func handleDeleteAvatar(r *fastglue.Request) error {
 	)
 
 	// Get user
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
 
 	// Valid str?
 	if user.AvatarURL.String == "" {
-		return r.SendEnvelope(true)
+		return r.SendEnvelope("Avatar deleted successfully.")
 	}
 
 	fileName := filepath.Base(user.AvatarURL.String)
@@ -347,8 +341,8 @@ func handleDeleteAvatar(r *fastglue.Request) error {
 	if err := app.media.Delete(fileName); err != nil {
 		return sendErrorEnvelope(r, err)
 	}
-	err = app.user.UpdateAvatar(user.ID, "")
-	if err != nil {
+
+	if err = app.user.UpdateAvatar(user.ID, ""); err != nil {
 		return sendErrorEnvelope(r, err)
 	}
 	return r.SendEnvelope("Avatar deleted successfully.")
@@ -363,16 +357,17 @@ func handleResetPassword(r *fastglue.Request) error {
 		email     = string(p.Peek("email"))
 	)
 	if ok && auser.ID > 0 {
-		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "User is already logged in", nil, envelope.InputError)
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "User is already logged in, Please logout to reset password.", nil, envelope.InputError)
 	}
 
 	if email == "" {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Empty `email`", nil, envelope.InputError)
 	}
 
-	user, err := app.user.GetByEmail(email)
+	user, err := app.user.GetAgentByEmail(email)
 	if err != nil {
-		return sendErrorEnvelope(r, err)
+		// Send 200 even if user not found, to prevent email enumeration.
+		return r.SendEnvelope("Reset password email sent successfully.")
 	}
 
 	token, err := app.user.SetResetPasswordToken(user.ID)
@@ -381,10 +376,9 @@ func handleResetPassword(r *fastglue.Request) error {
 	}
 
 	// Send email.
-	content, err := app.tmpl.RenderTemplate(tmpl.TmplResetPassword,
-		map[string]string{
-			"ResetToken": token,
-		})
+	content, err := app.tmpl.RenderInMemoryTemplate(tmpl.TmplResetPassword, map[string]string{
+		"ResetToken": token,
+	})
 	if err != nil {
 		app.lo.Error("error rendering template", "error", err)
 		return r.SendErrorEnvelope(fasthttp.StatusInternalServerError, "Error rendering template", nil, envelope.GeneralError)
@@ -396,8 +390,8 @@ func handleResetPassword(r *fastglue.Request) error {
 		Content:  content,
 		Provider: notifier.ProviderEmail,
 	}); err != nil {
-		app.lo.Error("error sending notification message", "error", err)
-		return r.SendErrorEnvelope(fasthttp.StatusInternalServerError, "Error sending notification message", nil, envelope.GeneralError)
+		app.lo.Error("error sending password reset email", "error", err)
+		return r.SendErrorEnvelope(fasthttp.StatusInternalServerError, "Error sending password reset email", nil, envelope.GeneralError)
 	}
 
 	return r.SendEnvelope("Reset password email sent successfully.")

cmd/views.go

@@ -16,7 +16,7 @@ func handleGetUserViews(r *fastglue.Request) error {
 		app   = r.Context.(*App)
 		auser = r.RequestCtx.UserValue("user").(amodels.User)
 	)
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -37,7 +37,7 @@ func handleCreateUserView(r *fastglue.Request) error {
 	if err := r.Decode(&view, "json"); err != nil {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "decode failed", err.Error(), envelope.InputError)
 	}
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -46,7 +46,7 @@ func handleCreateUserView(r *fastglue.Request) error {
 	}
 
 	if string(view.Filters) == "" {
-		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Empty view `Filter`", nil, envelope.InputError)
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Please provide at least one filter", nil, envelope.InputError)
 	}
 
 	if err := app.view.Create(view.Name, view.Filters, user.ID); err != nil {
@@ -71,7 +71,7 @@ func handleDeleteUserView(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "Empty view `ID`", nil, envelope.InputError)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
@@ -109,7 +109,7 @@ func handleUpdateUserView(r *fastglue.Request) error {
 		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, "decode failed", err.Error(), envelope.InputError)
 	}
 
-	user, err := app.user.Get(auser.ID)
+	user, err := app.user.GetAgent(auser.ID)
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}

config.sample.toml

@@ -36,8 +36,9 @@ expiry = "6h"
 # If using docker compose, use the service name as the host. e.g. db
 host = "127.0.0.1"
 port = 5432
-user = "postgres"
-password = "postgres"
+# Update the following values with your database credentials.
+user = "libredesk"
+password = "libredesk"
 database = "libredesk"
 ssl_mode = "disable"
 max_open = 30
@@ -72,4 +73,4 @@ autoassign_interval = "5m"
 unsnooze_interval = "5m"
 
 [sla]
-evaluation_interval = "5m"
+evaluation_interval = "5m"

docs/docs/index.md

@@ -5,7 +5,7 @@ Libredesk is an open source, self-hosted customer support desk. Single binary ap
 
 <div style="border: 1px solid #ccc; padding: 1px; border-radius:5px; box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.1); background-color: #fff;">
     <a href="https://libredesk.io">
-        <img src="https://hebbkx1anhila5yf.public.blob.vercel-storage.com/Screenshot_20250220_231723-VxuEQgEiFfI9xhzJDOvgMK0yJ0TwR3.png" alt="libredesk screenshot" style="display: block; margin: 0 auto;">
+        <img src="https://hebbkx1anhila5yf.public.blob.vercel-storage.com/image-HvmxvOkalQSLp4qVezdTXaCd3dB4Rm.png" alt="libredesk screenshot" style="display: block; margin: 0 auto;">
     </a>
 </div>
 

frontend/package.json

@@ -29,7 +29,6 @@
     "@unovis/ts": "^1.4.4",
     "@unovis/vue": "^1.4.4",
     "@vee-validate/zod": "^4.13.2",
-    "@vueup/vue-quill": "^1.2.0",
     "@vueuse/core": "^12.4.0",
     "axios": "^1.7.9",
     "class-variance-authority": "^0.7.0",

frontend/pnpm-lock.yaml

@@ -50,9 +50,6 @@ importers:
       '@vee-validate/zod':
         specifier: ^4.13.2
         version: 4.15.0(vue@3.5.13(typescript@5.7.3))(zod@3.24.1)
-      '@vueup/vue-quill':
-        specifier: ^1.2.0
-        version: 1.2.0(vue@3.5.13(typescript@5.7.3))
       '@vueuse/core':
         specifier: ^12.4.0
         version: 12.4.0(typescript@5.7.3)
@@ -826,8 +823,8 @@ packages:
       '@tiptap/core': ^2.7.0
       '@tiptap/pm': ^2.7.0
 
-  '@tiptap/extension-hard-break@2.11.2':
-    resolution: {integrity: sha512-FNcXemfuwkiP4drZ9m90BC6GD4nyikfYHYEUyYuVd74Mm6w5vXpueWXus3mUcdT78xTs1XpQVibDorilLu7X8w==}
+  '@tiptap/extension-hard-break@2.11.5':
+    resolution: {integrity: sha512-q9doeN+Yg9F5QNTG8pZGYfNye3tmntOwch683v0CCVCI4ldKaLZ0jG3NbBTq+mosHYdgOH2rNbIORlRRsQ+iYQ==}
     peerDependencies:
       '@tiptap/core': ^2.7.0
 
@@ -1173,11 +1170,6 @@ packages:
   '@vue/shared@3.5.13':
     resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
 
-  '@vueup/vue-quill@1.2.0':
-    resolution: {integrity: sha512-kd5QPSHMDpycklojPXno2Kw2JSiKMYduKYQckTm1RJoVDA557MnyUXgcuuDpry4HY/Rny9nGNcK+m3AHk94wag==}
-    peerDependencies:
-      vue: ^3.2.41
-
   '@vueuse/core@10.11.1':
     resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
 
@@ -1360,10 +1352,6 @@ packages:
     resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==}
     engines: {node: '>= 0.4'}
 
-  call-bind@1.0.8:
-    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
-    engines: {node: '>= 0.4'}
-
   call-bound@1.0.3:
     resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
     engines: {node: '>= 0.4'}
@@ -1421,10 +1409,6 @@ packages:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
     engines: {node: '>=8'}
 
-  clone@2.1.2:
-    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: '>=0.8'}
-
   clsx@2.1.1:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
@@ -1692,21 +1676,9 @@ packages:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
 
-  deep-equal@1.1.2:
-    resolution: {integrity: sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==}
-    engines: {node: '>= 0.4'}
-
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
-
-  define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
-
   defu@6.1.4:
     resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
 
@@ -1880,9 +1852,6 @@ packages:
   eventemitter2@6.4.7:
     resolution: {integrity: sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==}
 
-  eventemitter3@2.0.3:
-    resolution: {integrity: sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==}
-
   execa@4.1.0:
     resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
     engines: {node: '>=10'}
@@ -1910,12 +1879,6 @@ packages:
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-diff@1.1.2:
-    resolution: {integrity: sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==}
-
-  fast-diff@1.2.0:
-    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==}
-
   fast-diff@1.3.0:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
 
@@ -2002,9 +1965,6 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-
   geojson-vt@3.2.1:
     resolution: {integrity: sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==}
 
@@ -2083,17 +2043,10 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
-
   has-symbols@1.1.0:
     resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
     engines: {node: '>= 0.4'}
 
-  has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
-
   hasown@2.0.2:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
@@ -2163,10 +2116,6 @@ packages:
     resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
     engines: {node: '>=12'}
 
-  is-arguments@1.2.0:
-    resolution: {integrity: sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==}
-    engines: {node: '>= 0.4'}
-
   is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
@@ -2178,10 +2127,6 @@ packages:
     resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
     engines: {node: '>= 0.4'}
 
-  is-date-object@1.1.0:
-    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
-    engines: {node: '>= 0.4'}
-
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -2206,10 +2151,6 @@ packages:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
-  is-regex@1.2.1:
-    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
-    engines: {node: '>= 0.4'}
-
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -2337,12 +2278,6 @@ packages:
   lodash.castarray@4.4.0:
     resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
 
-  lodash.clonedeep@4.5.0:
-    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
-
-  lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-
   lodash.isplainobject@4.0.6:
     resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
 
@@ -2491,14 +2426,6 @@ packages:
     resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
-  object-is@1.1.6:
-    resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==}
-    engines: {node: '>= 0.4'}
-
-  object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-
   once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
@@ -2531,9 +2458,6 @@ packages:
   package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
-  parchment@1.1.4:
-    resolution: {integrity: sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==}
-
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -2774,16 +2698,6 @@ packages:
   quickselect@2.0.0:
     resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==}
 
-  quill-delta@3.6.3:
-    resolution: {integrity: sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==}
-    engines: {node: '>=0.10'}
-
-  quill-delta@4.2.2:
-    resolution: {integrity: sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==}
-
-  quill@1.3.7:
-    resolution: {integrity: sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==}
-
   radix-vue@1.9.12:
     resolution: {integrity: sha512-zkr66Jqxbej4+oR6O/pZRzyM/VZi66ndbyIBZQjJKAXa1lIoYReZJse6W1EEDZKXknD7rXhpS+jM9Sr23lIqfg==}
     peerDependencies:
@@ -2803,10 +2717,6 @@ packages:
   regenerator-runtime@0.14.1:
     resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
-  regexp.prototype.flags@1.5.4:
-    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
-    engines: {node: '>= 0.4'}
-
   request-progress@3.0.0:
     resolution: {integrity: sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==}
 
@@ -2877,14 +2787,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
-
-  set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
-
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -3907,7 +3809,7 @@ snapshots:
       '@tiptap/core': 2.11.2(@tiptap/pm@2.11.2)
       '@tiptap/pm': 2.11.2
 
-  '@tiptap/extension-hard-break@2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))':
+  '@tiptap/extension-hard-break@2.11.5(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))':
     dependencies:
       '@tiptap/core': 2.11.2(@tiptap/pm@2.11.2)
 
@@ -4000,7 +3902,7 @@ snapshots:
       '@tiptap/extension-document': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))
       '@tiptap/extension-dropcursor': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))(@tiptap/pm@2.11.2)
       '@tiptap/extension-gapcursor': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))(@tiptap/pm@2.11.2)
-      '@tiptap/extension-hard-break': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))
+      '@tiptap/extension-hard-break': 2.11.5(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))
       '@tiptap/extension-heading': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))
       '@tiptap/extension-history': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))(@tiptap/pm@2.11.2)
       '@tiptap/extension-horizontal-rule': 2.11.2(@tiptap/core@2.11.2(@tiptap/pm@2.11.2))(@tiptap/pm@2.11.2)
@@ -4386,12 +4288,6 @@ snapshots:
 
   '@vue/shared@3.5.13': {}
 
-  '@vueup/vue-quill@1.2.0(vue@3.5.13(typescript@5.7.3))':
-    dependencies:
-      quill: 1.3.7
-      quill-delta: 4.2.2
-      vue: 3.5.13(typescript@5.7.3)
-
   '@vueuse/core@10.11.1(vue@3.5.13(typescript@5.7.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
@@ -4580,13 +4476,6 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
-  call-bind@1.0.8:
-    dependencies:
-      call-bind-apply-helpers: 1.0.1
-      es-define-property: 1.0.1
-      get-intrinsic: 1.2.7
-      set-function-length: 1.2.2
-
   call-bound@1.0.3:
     dependencies:
       call-bind-apply-helpers: 1.0.1
@@ -4646,8 +4535,6 @@ snapshots:
       slice-ansi: 3.0.0
       string-width: 4.2.3
 
-  clone@2.1.2: {}
-
   clsx@2.1.1: {}
 
   codeflask@1.4.1:
@@ -4964,29 +4851,8 @@ snapshots:
   decode-uri-component@0.2.2:
     optional: true
 
-  deep-equal@1.1.2:
-    dependencies:
-      is-arguments: 1.2.0
-      is-date-object: 1.1.0
-      is-regex: 1.2.1
-      object-is: 1.1.6
-      object-keys: 1.1.1
-      regexp.prototype.flags: 1.5.4
-
   deep-is@0.1.4: {}
 
-  define-data-property@1.1.4:
-    dependencies:
-      es-define-property: 1.0.1
-      es-errors: 1.3.0
-      gopd: 1.2.0
-
-  define-properties@1.2.1:
-    dependencies:
-      define-data-property: 1.1.4
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
-
   defu@6.1.4: {}
 
   delaunator@5.0.1:
@@ -5204,8 +5070,6 @@ snapshots:
 
   eventemitter2@6.4.7: {}
 
-  eventemitter3@2.0.3: {}
-
   execa@4.1.0:
     dependencies:
       cross-spawn: 7.0.6
@@ -5250,10 +5114,6 @@ snapshots:
 
   fast-deep-equal@3.1.3: {}
 
-  fast-diff@1.1.2: {}
-
-  fast-diff@1.2.0: {}
-
   fast-diff@1.3.0: {}
 
   fast-glob@3.3.3:
@@ -5338,8 +5198,6 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  functions-have-names@1.2.3: {}
-
   geojson-vt@3.2.1: {}
 
   geojson@0.5.0: {}
@@ -5428,16 +5286,8 @@ snapshots:
 
   has-flag@4.0.0: {}
 
-  has-property-descriptors@1.0.2:
-    dependencies:
-      es-define-property: 1.0.1
-
   has-symbols@1.1.0: {}
 
-  has-tostringtag@1.0.2:
-    dependencies:
-      has-symbols: 1.1.0
-
   hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
@@ -5490,11 +5340,6 @@ snapshots:
 
   internmap@2.0.3: {}
 
-  is-arguments@1.2.0:
-    dependencies:
-      call-bound: 1.0.3
-      has-tostringtag: 1.0.2
-
   is-arrayish@0.2.1: {}
 
   is-binary-path@2.1.0:
@@ -5505,11 +5350,6 @@ snapshots:
     dependencies:
       hasown: 2.0.2
 
-  is-date-object@1.1.0:
-    dependencies:
-      call-bound: 1.0.3
-      has-tostringtag: 1.0.2
-
   is-extglob@2.1.1: {}
 
   is-fullwidth-code-point@3.0.0: {}
@@ -5527,13 +5367,6 @@ snapshots:
 
   is-path-inside@3.0.3: {}
 
-  is-regex@1.2.1:
-    dependencies:
-      call-bound: 1.0.3
-      gopd: 1.2.0
-      has-tostringtag: 1.0.2
-      hasown: 2.0.2
-
   is-stream@2.0.1: {}
 
   is-typedarray@1.0.0: {}
@@ -5647,10 +5480,6 @@ snapshots:
 
   lodash.castarray@4.4.0: {}
 
-  lodash.clonedeep@4.5.0: {}
-
-  lodash.isequal@4.5.0: {}
-
   lodash.isplainobject@4.0.6: {}
 
   lodash.merge@4.6.2: {}
@@ -5795,13 +5624,6 @@ snapshots:
 
   object-inspect@1.13.3: {}
 
-  object-is@1.1.6:
-    dependencies:
-      call-bind: 1.0.8
-      define-properties: 1.2.1
-
-  object-keys@1.1.1: {}
-
   once@1.4.0:
     dependencies:
       wrappy: 1.0.2
@@ -5837,8 +5659,6 @@ snapshots:
 
   package-json-from-dist@1.0.1: {}
 
-  parchment@1.1.4: {}
-
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
@@ -6088,27 +5908,6 @@ snapshots:
 
   quickselect@2.0.0: {}
 
-  quill-delta@3.6.3:
-    dependencies:
-      deep-equal: 1.1.2
-      extend: 3.0.2
-      fast-diff: 1.1.2
-
-  quill-delta@4.2.2:
-    dependencies:
-      fast-diff: 1.2.0
-      lodash.clonedeep: 4.5.0
-      lodash.isequal: 4.5.0
-
-  quill@1.3.7:
-    dependencies:
-      clone: 2.1.2
-      deep-equal: 1.1.2
-      eventemitter3: 2.0.3
-      extend: 3.0.2
-      parchment: 1.1.4
-      quill-delta: 3.6.3
-
   radix-vue@1.9.12(vue@3.5.13(typescript@5.7.3)):
     dependencies:
       '@floating-ui/dom': 1.6.13
@@ -6138,15 +5937,6 @@ snapshots:
 
   regenerator-runtime@0.14.1: {}
 
-  regexp.prototype.flags@1.5.4:
-    dependencies:
-      call-bind: 1.0.8
-      define-properties: 1.2.1
-      es-errors: 1.3.0
-      get-proto: 1.0.1
-      gopd: 1.2.0
-      set-function-name: 2.0.2
-
   request-progress@3.0.0:
     dependencies:
       throttleit: 1.0.1
@@ -6232,22 +6022,6 @@ snapshots:
 
   semver@7.6.3: {}
 
-  set-function-length@1.2.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.7
-      gopd: 1.2.0
-      has-property-descriptors: 1.0.2
-
-  set-function-name@2.0.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.2
-
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0

frontend/src/App.vue

@@ -46,6 +46,7 @@
         @create-view="openCreateViewForm = true"
         @edit-view="editView"
         @delete-view="deleteView"
+        @create-conversation="() => openCreateConversationDialog = true"
       >
         <div class="flex flex-col h-screen">
           <!-- Show app update only in admin routes -->
@@ -64,6 +65,9 @@
 
   <!-- Command box -->
   <Command />
+
+  <!-- Create conversation dialog -->
+  <CreateConversation v-model="openCreateConversationDialog" />
 </template>
 
 <script setup>
@@ -89,6 +93,7 @@ import api from '@/api'
 import { toast as sooner } from 'vue-sonner'
 import Sidebar from '@/components/sidebar/Sidebar.vue'
 import Command from '@/features/command/CommandBox.vue'
+import CreateConversation from '@/features/conversation/CreateConversation.vue'
 import { Inbox, Shield, FileLineChart } from 'lucide-vue-next'
 import { useRoute } from 'vue-router'
 import {
@@ -117,6 +122,7 @@ const tagStore = useTagStore()
 const userViews = ref([])
 const view = ref({})
 const openCreateViewForm = ref(false)
+const openCreateConversationDialog = ref(false)
 
 initWS()
 useIdleDetection()

frontend/src/api/index.js

@@ -35,6 +35,7 @@ http.interceptors.request.use((request) => {
 
 const searchConversations = (params) => http.get('/api/v1/conversations/search', { params })
 const searchMessages = (params) => http.get('/api/v1/messages/search', { params })
+const searchContacts = (params) => http.get('/api/v1/contacts/search', { params })
 const resetPassword = (data) => http.post('/api/v1/users/reset-password', data)
 const setPassword = (data) => http.post('/api/v1/users/set-password', data)
 const deleteUser = (id) => http.delete(`/api/v1/users/${id}`)
@@ -174,6 +175,7 @@ const getTags = () => http.get('/api/v1/tags')
 const upsertTags = (uuid, data) => http.post(`/api/v1/conversations/${uuid}/tags`, data)
 const updateAssignee = (uuid, assignee_type, data) => http.put(`/api/v1/conversations/${uuid}/assignee/${assignee_type}`, data)
 const removeAssignee = (uuid, assignee_type) => http.put(`/api/v1/conversations/${uuid}/assignee/${assignee_type}/remove`)
+const createConversation = (data) => http.post('/api/v1/conversations', data)
 const updateConversationStatus = (uuid, data) => http.put(`/api/v1/conversations/${uuid}/status`, data)
 const updateConversationPriority = (uuid, data) => http.put(`/api/v1/conversations/${uuid}/priority`, data)
 const updateAssigneeLastSeen = (uuid) => http.put(`/api/v1/conversations/${uuid}/last-seen`)
@@ -265,6 +267,7 @@ const updateView = (id, data) =>
 const deleteView = (id) => http.delete(`/api/v1/views/me/${id}`)
 const getAiPrompts = () => http.get('/api/v1/ai/prompts')
 const aiCompletion = (data) => http.post('/api/v1/ai/completion', data)
+const updateAIProvider = (data) => http.put('/api/v1/ai/provider', data)
 
 export default {
   login,
@@ -328,9 +331,11 @@ export default {
   updateAutomationRule,
   updateAutomationRuleWeights,
   updateAutomationRulesExecutionMode,
+  updateAIProvider,
   createAutomationRule,
   toggleAutomationRule,
   deleteAutomationRule,
+  createConversation,
   sendMessage,
   retryMessage,
   createUser,
@@ -375,5 +380,6 @@ export default {
   aiCompletion,
   searchConversations,
   searchMessages,
+  searchContacts,
   removeAssignee,
 }

frontend/src/assets/styles/main.scss

@@ -18,6 +18,49 @@
       overflow-x: auto;
     }
   }
+
+  .native-html {
+    p {
+      margin-bottom: 0.5rem;
+    }
+
+    ul {
+      list-style-type: disc;
+      margin-left: 1.5rem;
+      margin-top: 0.5rem;
+      margin-bottom: 0.5rem;
+    }
+
+    ol {
+      list-style-type: decimal;
+      margin-left: 1.5rem;
+      margin-top: 0.5rem;
+      margin-bottom: 0.5rem;
+    }
+
+    li {
+      padding-left: 0.25rem;
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+      font-size: 1.25rem;
+      font-weight: 700;
+    }
+
+    a {
+      color: #0066cc;
+      cursor: pointer;
+
+      &:hover {
+        color: #003d7a;
+      }
+    }
+  }
 }
 
 // Theme.

frontend/src/components/sidebar/Sidebar.vue

@@ -18,6 +18,7 @@ import {
   SidebarProvider,
   SidebarRail
 } from '@/components/ui/sidebar'
+import { useAppSettingsStore } from '@/stores/appSettings'
 import {
   ChevronRight,
   EllipsisVertical,
@@ -43,8 +44,9 @@ defineProps({
   userViews: { type: Array, default: () => [] }
 })
 const userStore = useUserStore()
+const settingsStore = useAppSettingsStore()
 const route = useRoute()
-const emit = defineEmits(['createView', 'editView', 'deleteView'])
+const emit = defineEmits(['createView', 'editView', 'deleteView', 'createConversation'])
 
 const openCreateViewDialog = () => {
   emit('createView')
@@ -70,6 +72,8 @@ const isInboxRoute = (path) => {
 }
 
 const sidebarOpen = useStorage('mainSidebarOpen', true)
+const teamInboxOpen = useStorage('teamInboxOpen', true)
+const viewInboxOpen = useStorage('viewInboxOpen', true)
 </script>
 
 <template>
@@ -122,9 +126,13 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
           <SidebarMenu>
             <SidebarMenuItem>
               <SidebarMenuButton :isActive="isActiveParent('/admin')" asChild>
-                <div>
+                <div class="flex items-center justify-between w-full">
                   <span class="font-semibold text-xl">Admin</span>
                 </div>
+                <!-- App version -->
+                <div class="text-xs text-muted-foreground ml-2">
+                  ({{ settingsStore.settings['app.version'] }})
+                </div>
               </SidebarMenuButton>
             </SidebarMenuItem>
           </SidebarMenu>
@@ -222,15 +230,27 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
                 <div class="flex items-center justify-between w-full">
                   <div class="font-semibold text-xl">Inbox</div>
                   <div class="ml-auto">
-                    <router-link :to="{ name: 'search' }">
-                      <div class="flex items-center bg-accent p-2 rounded-full">
-                        <Search
-                          class="transition-transform duration-200 hover:scale-110 cursor-pointer"
+                    <div class="flex items-center space-x-2">
+                      <div
+                        class="flex items-center bg-accent p-2 rounded-full cursor-pointer"
+                        @click="emit('createConversation')"
+                      >
+                        <Plus
+                          class="transition-transform duration-200 hover:scale-110"
                           size="15"
                           stroke-width="2.5"
                         />
                       </div>
-                    </router-link>
+                      <router-link :to="{ name: 'search' }">
+                        <div class="flex items-center bg-accent p-2 rounded-full">
+                          <Search
+                            class="transition-transform duration-200 hover:scale-110 cursor-pointer"
+                            size="15"
+                            stroke-width="2.5"
+                          />
+                        </div>
+                      </router-link>
+                    </div>
                   </div>
                 </div>
               </SidebarMenuButton>
@@ -269,7 +289,12 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
               </SidebarMenuItem>
 
               <!-- Team Inboxes -->
-              <Collapsible defaultOpen class="group/collapsible" v-if="userTeams.length">
+              <Collapsible
+                defaultOpen
+                class="group/collapsible"
+                v-if="userTeams.length"
+                v-model:open="teamInboxOpen"
+              >
                 <SidebarMenuItem>
                   <CollapsibleTrigger as-child>
                     <SidebarMenuButton asChild>
@@ -301,7 +326,7 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
               </Collapsible>
 
               <!-- Views -->
-              <Collapsible class="group/collapsible" defaultOpen>
+              <Collapsible class="group/collapsible" defaultOpen v-model:open="viewInboxOpen">
                 <SidebarMenuItem>
                   <CollapsibleTrigger as-child>
                     <SidebarMenuButton asChild>
@@ -315,17 +340,14 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
                             class="rounded-lg cursor-pointer opacity-0 transition-all duration-200 group-hover:opacity-100 hover:bg-gray-200 hover:shadow-sm text-gray-600 hover:text-gray-800 transform hover:scale-105 active:scale-100 p-1"
                           />
                         </div>
+                        <ChevronRight
+                          class="ml-auto transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
+                          v-if="userViews.length"
+                        />
                       </router-link>
                     </SidebarMenuButton>
                   </CollapsibleTrigger>
 
-                  <SidebarMenuAction>
-                    <ChevronRight
-                      class="transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90"
-                      v-if="userViews.length"
-                    />
-                  </SidebarMenuAction>
-
                   <CollapsibleContent>
                     <SidebarMenuSub v-for="view in userViews" :key="view.id">
                       <SidebarMenuSubItem>
@@ -335,25 +357,24 @@ const sidebarOpen = useStorage('mainSidebarOpen', true)
                           asChild
                         >
                           <router-link :to="{ name: 'view-inbox', params: { viewID: view.id } }">
-                            <span class="break-all w-24">{{ view.name }}</span>
+                            <span class="break-words w-32 truncate">{{ view.name }}</span>
+                            <SidebarMenuAction :showOnHover="true" class="mr-3">
+                              <DropdownMenu>
+                                <DropdownMenuTrigger asChild>
+                                  <EllipsisVertical />
+                                </DropdownMenuTrigger>
+                                <DropdownMenuContent>
+                                  <DropdownMenuItem @click="() => editView(view)">
+                                    <span>Edit</span>
+                                  </DropdownMenuItem>
+                                  <DropdownMenuItem @click="() => deleteView(view)">
+                                    <span>Delete</span>
+                                  </DropdownMenuItem>
+                                </DropdownMenuContent>
+                              </DropdownMenu>
+                            </SidebarMenuAction>
                           </router-link>
                         </SidebarMenuButton>
-
-                        <SidebarMenuAction>
-                          <DropdownMenu>
-                            <DropdownMenuTrigger asChild>
-                              <EllipsisVertical />
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent>
-                              <DropdownMenuItem @click="() => editView(view)">
-                                <span>Edit</span>
-                              </DropdownMenuItem>
-                              <DropdownMenuItem @click="() => deleteView(view)">
-                                <span>Delete</span>
-                              </DropdownMenuItem>
-                            </DropdownMenuContent>
-                          </DropdownMenu>
-                        </SidebarMenuAction>
                       </SidebarMenuSubItem>
                     </SidebarMenuSub>
                   </CollapsibleContent>

frontend/src/components/sidebar/SidebarNavUser.vue

@@ -6,7 +6,7 @@
         class="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground p-0"
       >
         <Avatar class="h-8 w-8 rounded-lg relative overflow-visible">
-          <AvatarImage :src="userStore.avatar" alt="" class="rounded-lg"/>
+          <AvatarImage :src="userStore.avatar" alt="" class="rounded-lg" />
           <AvatarFallback class="rounded-lg">
             {{ userStore.getInitials }}
           </AvatarFallback>
@@ -14,7 +14,9 @@
             class="absolute bottom-0 right-0 h-2.5 w-2.5 rounded-full border border-background"
             :class="{
               'bg-green-500': userStore.user.availability_status === 'online',
-              'bg-amber-500': userStore.user.availability_status === 'away' || userStore.user.availability_status === 'away_manual',
+              'bg-amber-500':
+                userStore.user.availability_status === 'away' ||
+                userStore.user.availability_status === 'away_manual',
               'bg-gray-400': userStore.user.availability_status === 'offline'
             }"
           ></div>
@@ -47,18 +49,19 @@
         <div class="flex items-center gap-2 px-1 py-1.5 text-left text-sm justify-between">
           <span class="text-muted-foreground">Away</span>
           <Switch
-            :checked="userStore.user.availability_status === 'away' || userStore.user.availability_status === 'away_manual'"
+            :checked="
+              userStore.user.availability_status === 'away' ||
+              userStore.user.availability_status === 'away_manual'
+            "
             @update:checked="(val) => userStore.updateUserAvailability(val ? 'away' : 'online')"
           />
         </div>
       </DropdownMenuLabel>
       <DropdownMenuSeparator />
       <DropdownMenuGroup>
-        <DropdownMenuItem>
-          <router-link to="/account" class="flex items-center">
-            <CircleUserRound size="18" class="mr-2" />
-            Account
-          </router-link>
+        <DropdownMenuItem @click.prevent="router.push({ name: 'account' })">
+          <CircleUserRound size="18" class="mr-2" />
+          Account
         </DropdownMenuItem>
       </DropdownMenuGroup>
       <DropdownMenuSeparator />
@@ -85,7 +88,10 @@ import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
 import { Switch } from '@/components/ui/switch'
 import { ChevronsUpDown, CircleUserRound, LogOut } from 'lucide-vue-next'
 import { useUserStore } from '@/stores/user'
+import { useRouter } from 'vue-router'
+
 const userStore = useUserStore()
+const router = useRouter()
 
 const logout = () => {
   window.location.href = '/logout'

frontend/src/composables/useIdleDetection.js

@@ -1,6 +1,7 @@
-import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { ref, onMounted, onBeforeUnmount, watch } from 'vue'
 import { useUserStore } from '@/stores/user'
 import { debounce } from '@/utils/debounce'
+import { useStorage } from '@vueuse/core'
 
 export function useIdleDetection () {
     const userStore = useUserStore()
@@ -8,14 +9,19 @@ export function useIdleDetection () {
     const AWAY_THRESHOLD = 4 * 60 * 1000
     // 1 minute
     const CHECK_INTERVAL = 60 * 1000
-    const lastActivity = ref(Date.now())
+
+    // Store last activity time in localStorage to sync across tabs
+    const lastActivity = useStorage('last_active', Date.now())
     const timer = ref(null)
 
     function resetTimer () {
         if (userStore.user.availability_status === 'away' || userStore.user.availability_status === 'offline') {
             userStore.updateUserAvailability('online', false)
         }
-        lastActivity.value = Date.now()
+        const now = Date.now()
+        if (lastActivity.value < now) {
+            lastActivity.value = now
+        }
     }
 
     const debouncedResetTimer = debounce(resetTimer, 200)
@@ -38,6 +44,16 @@ export function useIdleDetection () {
         window.removeEventListener('mousemove', debouncedResetTimer)
         window.removeEventListener('keypress', debouncedResetTimer)
         window.removeEventListener('click', debouncedResetTimer)
-        clearInterval(timer.value)
+        if (timer.value) {
+            clearInterval(timer.value)
+            timer.value = null
+        }
     })
-}
+
+    // Watch for lastActivity changes in localStorage to handle multi-tab sync
+    watch(lastActivity, (newVal, oldVal) => {
+        if (newVal > oldVal) {
+            resetTimer()
+        }
+    })
+}

frontend/src/composables/useSla.js

@@ -18,5 +18,5 @@ export function useSla (dueAt, actualAt) {
             clearInterval(intervalId)
         })
     })
-    return { sla, updateSla }
+    return sla
 }

frontend/src/features/admin/automation/ActionBox.vue

@@ -10,7 +10,6 @@
           <div class="flex items-center justify-between">
             <div class="flex gap-5">
               <div class="w-48">
-
                 <!-- Type -->
                 <Select
                   v-model="action.type"
@@ -109,15 +108,13 @@
           </div>
 
           <div
+            class="box p-2 h-96 min-h-96"
             v-if="action.type && conversationActions[action.type]?.type === 'richtext'"
-            class="pl-0 shadow"
           >
-            <QuillEditor
-              theme="snow"
-              v-model:content="action.value[0]"
-              contentType="html"
-              @update:content="(value) => handleValueChange(value, index)"
-              class="h-32 mb-12"
+            <Editor
+              v-model:htmlContent="action.value[0]"
+              @update:htmlContent="(value) => handleEditorChange(value, index)"
+              :placeholder="'Shift + Enter to add new line'"
             />
           </div>
         </div>
@@ -142,12 +139,12 @@ import {
   SelectTrigger,
   SelectValue
 } from '@/components/ui/select'
-import { QuillEditor } from '@vueup/vue-quill'
-import '@vueup/vue-quill/dist/vue-quill.snow.css'
 import ComboBox from '@/components/ui/combobox/ComboBox.vue'
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
 import { SelectTag } from '@/components/ui/select'
 import { useConversationFilters } from '@/composables/useConversationFilters'
+import { getTextFromHTML } from '@/utils/strings.js'
+import Editor from '@/features/conversation/ConversationTextEditor.vue'
 
 const props = defineProps({
   actions: {
@@ -175,6 +172,16 @@ const handleValueChange = (value, index) => {
   emitUpdate(index)
 }
 
+const handleEditorChange = (value, index) => {
+  // If text is empty, set HTML to empty string
+  const textContent = getTextFromHTML(value)
+  if (textContent.length === 0) {
+    value = ''
+  }
+  actions.value[index].value = [value]
+  emitUpdate(index)
+}
+
 const removeAction = (index) => {
   emit('remove-action', index)
 }

frontend/src/features/admin/automation/RuleTab.vue

@@ -31,7 +31,7 @@
           </template>
         </draggable>
       </div>
-      <div v-else>
+      <div v-else class="space-y-5">
         <RuleList
           v-for="rule in rules"
           :key="rule.id"

frontend/src/features/admin/macros/ActionBuilder.vue

@@ -108,19 +108,6 @@
               placeholder="Select tag"
             />
           </div>
-
-          <div
-            v-if="action.type && config.actions[action.type]?.type === 'richtext'"
-            class="pl-0 shadow"
-          >
-            <QuillEditor
-              v-model:content="action.value[0]"
-              theme="snow"
-              contentType="html"
-              @update:content="(value) => updateValue(value, index)"
-              class="h-32 mb-12"
-            />
-          </div>
         </div>
       </div>
     </div>
@@ -139,14 +126,12 @@ import {
   SelectTrigger,
   SelectValue
 } from '@/components/ui/select'
-import { QuillEditor } from '@vueup/vue-quill'
-import '@vueup/vue-quill/dist/vue-quill.snow.css'
 import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar'
 import { SelectTag } from '@/components/ui/select'
 import { useTagStore } from '@/stores/tag'
 import ComboBox from '@/components/ui/combobox/ComboBox.vue'
 
-const model = defineModel({
+const model = defineModel("actions", {
   type: Array,
   required: true,
   default: () => []

frontend/src/features/admin/macros/MacroForm.vue

@@ -13,16 +13,25 @@
 
     <FormField v-slot="{ componentField }" name="message_content">
       <FormItem>
-        <FormLabel>Response to be sent when macro is used</FormLabel>
+        <FormLabel>Response to be sent when macro is used (optional)</FormLabel>
         <FormControl>
-          <QuillEditor
-            v-model:content="componentField.modelValue"
-            placeholder="Add a response (optional)"
-            theme="snow"
-            contentType="html"
-            class="h-32 mb-12"
-            @update:content="(value) => componentField.onChange(value)"
-          />
+          <div class="box p-2 h-96 min-h-96">
+            <Editor
+              v-model:htmlContent="componentField.modelValue"
+              @update:htmlContent="(value) => componentField.onChange(value)"
+              :placeholder="'Shift + Enter to add new line'"
+            />
+          </div>
+        </FormControl>
+        <FormMessage />
+      </FormItem>
+    </FormField>
+
+    <FormField v-slot="{ componentField }" name="actions">
+      <FormItem>
+        <FormLabel> Actions (optional)</FormLabel>
+        <FormControl>
+          <ActionBuilder v-model:actions="componentField.modelValue" :config="actionConfig" @update:actions="(value) => componentField.onChange(value)" />
         </FormControl>
         <FormMessage />
       </FormItem>
@@ -106,16 +115,6 @@
         <FormMessage />
       </FormItem>
     </FormField>
-
-    <FormField v-slot="{ componentField }" name="actions">
-      <FormItem>
-        <FormLabel> Actions </FormLabel>
-        <FormControl>
-          <ActionBuilder v-bind="componentField" :config="actionConfig" />
-        </FormControl>
-        <FormMessage />
-      </FormItem>
-    </FormField>
     <Button type="submit" :isLoading="isLoading">{{ submitLabel }}</Button>
   </form>
 </template>
@@ -133,9 +132,8 @@ import ActionBuilder from '@/features/admin/macros/ActionBuilder.vue'
 import { useConversationFilters } from '@/composables/useConversationFilters'
 import { useUsersStore } from '@/stores/users'
 import { useTeamStore } from '@/stores/team'
+import { getTextFromHTML } from '@/utils/strings.js'
 import { formSchema } from './formSchema.js'
-import { QuillEditor } from '@vueup/vue-quill'
-import '@vueup/vue-quill/dist/vue-quill.snow.css'
 import {
   Select,
   SelectContent,
@@ -145,6 +143,7 @@ import {
   SelectValue
 } from '@/components/ui/select'
 import ComboBox from '@/components/ui/combobox/ComboBox.vue'
+import Editor from '@/features/conversation/ConversationTextEditor.vue'
 
 const { macroActions } = useConversationFilters()
 const formLoading = ref(false)
@@ -181,6 +180,11 @@ const actionConfig = ref({
 })
 
 const onSubmit = form.handleSubmit(async (values) => {
+  // If the text of HTML is empty then set the HTML to empty string
+  const textContent = getTextFromHTML(values.message_content)
+  if (textContent.length === 0) {
+    values.message_content = ''
+  }
   props.submitForm(values)
 })
 

frontend/src/features/admin/macros/formSchema.js

@@ -1,4 +1,5 @@
 import * as z from 'zod'
+import { getTextFromHTML } from '@/utils/strings.js'
 
 const actionSchema = z.array(
   z.object({
@@ -10,8 +11,42 @@ const actionSchema = z.array(
 export const formSchema = z.object({
   name: z.string().min(1, 'Macro name is required'),
   message_content: z.string().optional(),
-  actions: actionSchema,
+  actions: actionSchema.optional().default([]), // Default to empty array if not provided
   visibility: z.enum(['all', 'team', 'user']),
   team_id: z.string().nullable().optional(),
   user_id: z.string().nullable().optional(),
-})
+})
+  .refine(
+    (data) => {
+      // Check if message_content has non-empty text after stripping HTML
+      const hasMessageContent = getTextFromHTML(data.message_content || '').trim().length > 0
+      // Check if actions has at least one valid action
+      const hasValidActions = data.actions && data.actions.length > 0
+      // Either message content or actions must be valid
+      return hasMessageContent || hasValidActions
+    },
+    {
+      message: 'Either message content or actions are required',
+      // Field path to highlight
+      path: ['message_content'],
+    }
+  )
+  .refine(
+    (data) => {
+      // If visibility is 'team', team_id is required
+      if (data.visibility === 'team' && !data.team_id) {
+        return false
+      }
+      // If visibility is 'user', user_id is required
+      if (data.visibility === 'user' && !data.user_id) {
+        return false
+      }
+      // Otherwise, validation passes
+      return true
+    },
+    {
+      message: 'team is required when visibility is "team", and user is required when visibility is "user"',
+      // Field path to highlight
+      path: ['visibility'],
+    }
+  )

frontend/src/features/admin/notification/NotificationSettingForm.vue

@@ -65,6 +65,7 @@
           <Input type="number" placeholder="2" v-bind="componentField" />
         </FormControl>
         <FormMessage />
+        <FormDescription> Maximum concurrent connections to the server. </FormDescription>
       </FormItem>
     </FormField>
 
@@ -76,6 +77,10 @@
           <Input type="text" placeholder="15s" v-bind="componentField" />
         </FormControl>
         <FormMessage />
+        <FormDescription>
+          Time to wait for new activity on a connection before closing it and removing it from the
+          pool (s for second, m for minute)
+        </FormDescription>
       </FormItem>
     </FormField>
 
@@ -87,6 +92,10 @@
           <Input type="text" placeholder="5s" v-bind="componentField" />
         </FormControl>
         <FormMessage />
+        <FormDescription>
+          Time to wait for new activity on a connection before closing it and removing it from the
+          pool (s for second, m for minute, h for hour).
+        </FormDescription>
       </FormItem>
     </FormField>
 
@@ -139,6 +148,7 @@
           <Input type="number" placeholder="2" v-bind="componentField" />
         </FormControl>
         <FormMessage />
+        <FormDescription> Number of times to retry when a message fails. </FormDescription>
       </FormItem>
     </FormField>
 

frontend/src/features/admin/notification/formSchema.js

@@ -51,8 +51,8 @@ export const smtpConfigSchema = z.object({
     auth_protocol: z
         .enum(['plain', 'login', 'cram', 'none'])
         .describe('Authentication protocol'),
-    email_address: z.string().describe('Email address').email().nonempty({
-        message: "Email address is required"
+    email_address: z.string().describe('From email address with name (e.g., "Name <email@example.com>")').nonempty({
+        message: "From email address is required"
     }),
     max_msg_retries: z
         .number({

frontend/src/features/admin/roles/RoleForm.vue

@@ -13,7 +13,11 @@
       <FormItem>
         <FormLabel>Description</FormLabel>
         <FormControl>
-          <Input type="text" placeholder="This role is for all support agents" v-bind="componentField" />
+          <Input
+            type="text"
+            placeholder="This role is for all support agents"
+            v-bind="componentField"
+          />
         </FormControl>
         <FormMessage />
       </FormItem>
@@ -24,13 +28,19 @@
     <div v-for="entity in permissions" :key="entity.name" class="box p-4">
       <p class="text-lg mb-5">{{ entity.name }}</p>
       <div class="space-y-4">
-        <FormField v-for="permission in entity.permissions" :key="permission.name" type="checkbox"
-          :name="permission.name">
+        <FormField
+          v-for="permission in entity.permissions"
+          :key="permission.name"
+          type="checkbox"
+          :name="permission.name"
+        >
           <FormItem class="flex flex-col gap-y-5 space-y-0 rounded-lg">
             <div class="flex space-x-3">
               <FormControl>
-                <Checkbox :checked="selectedPermissions.includes(permission.name)"
-                  @update:checked="(newValue) => handleChange(newValue, permission.name)" />
+                <Checkbox
+                  :checked="selectedPermissions.includes(permission.name)"
+                  @update:checked="(newValue) => handleChange(newValue, permission.name)"
+                />
                 <FormLabel>{{ permission.label }}</FormLabel>
               </FormControl>
             </div>
@@ -69,7 +79,7 @@ const props = defineProps({
   },
   isLoading: {
     type: Boolean,
-    required: false,
+    required: false
   }
 })
 
@@ -77,7 +87,8 @@ const permissions = ref([
   {
     name: 'Conversation',
     permissions: [
-      { name: 'conversations:read', label: 'View conversations' },
+      { name: 'conversations:read', label: 'View conversation' },
+      { name: 'conversations:write', label: 'Create conversation' },
       { name: 'conversations:read_assigned', label: 'View conversations assigned to me' },
       { name: 'conversations:read_all', label: 'View all conversations' },
       { name: 'conversations:read_unassigned', label: 'View all unassigned conversations' },
@@ -89,7 +100,7 @@ const permissions = ref([
       { name: 'conversations:update_tags', label: 'Add or remove conversation tags' },
       { name: 'messages:read', label: 'View conversation messages' },
       { name: 'messages:write', label: 'Send messages in conversations' },
-      { name: 'view:manage', label: 'Create and manage conversation views' },
+      { name: 'view:manage', label: 'Create and manage conversation views' }
     ]
   },
   {
@@ -110,8 +121,9 @@ const permissions = ref([
       { name: 'reports:manage', label: 'Manage Reports' },
       { name: 'business_hours:manage', label: 'Manage Business Hours' },
       { name: 'sla:manage', label: 'Manage SLA Policies' },
+      { name: 'ai:manage', label: 'Manage AI Features' }
     ]
-  },
+  }
 ])
 
 const selectedPermissions = ref([])

frontend/src/features/command/CommandBox.vue

@@ -1,7 +1,11 @@
 <template>
-  <CommandDialog :open="open" @update:open="handleOpenChange" class="z-[51]">
+  <CommandDialog
+    :open="open"
+    @update:open="handleOpenChange"
+    class="z-[51] !min-w-[50vw] !min-h-[60vh]"
+  >
     <CommandInput placeholder="Type a command or search..." @keydown="onInputKeydown" />
-    <CommandList class="!min-h-[400px]">
+    <CommandList class="!min-h-[60vh] !min-w-[50vw]">
       <CommandEmpty>
         <p class="text-muted-foreground">No command available</p>
       </CommandEmpty>
@@ -32,12 +36,12 @@
       </CommandGroup>
 
       <!-- Macros -->
-      <!-- TODO move to a separate component -->
       <div v-if="nestedCommand === 'apply-macro'" class="bg-background">
         <CommandGroup heading="Apply macro" class="pb-2">
           <div class="min-h-[400px] overflow-auto">
             <div class="grid grid-cols-12 gap-3">
-              <div class="col-span-4 border-r border-border/30 pr-2">
+              <!-- Left Column: Macro List (30%) -->
+              <div class="col-span-4 pr-2 border-r">
                 <CommandItem
                   v-for="(macro, index) in macroStore.macroOptions"
                   :key="macro.value"
@@ -46,23 +50,28 @@
                   @select="handleApplyMacro(macro)"
                   class="px-3 py-2 rounded-md cursor-pointer transition-all duration-200 hover:bg-primary/10 hover:text-primary"
                 >
-                  <div class="flex items-center space-x-2 justify-start">
-                    <Zap :size="14" class="text-primary" />
-                    <span class="text-sm overflow">{{ macro.label }}</span>
+                  <div class="flex items-center gap-2">
+                    <Zap size="14" class="text-primary shrink-0" />
+                    <span class="text-sm truncate w-full break-words whitespace-normal">{{
+                      macro.label
+                    }}</span>
                   </div>
                 </CommandItem>
               </div>
 
+              <!-- Right Column: Macro Details (70%) -->
               <div class="col-span-8 pl-2">
                 <div class="space-y-3 text-xs">
+                  <!-- Reply Preview -->
                   <div v-if="replyContent" class="space-y-1">
                     <p class="text-xs font-semibold text-primary">Reply Preview</p>
                     <div
-                      class="w-full min-h-200 p-2 bg-muted/50 rounded-md overflow-auto shadow-sm prose-sm"
-                      v-html="replyContent"
+                      class="w-full min-h-200 p-2 bg-muted/50 rounded-md overflow-auto shadow-sm native-html"
+                      v-dompurify-html="replyContent"
                     />
                   </div>
 
+                  <!-- Actions -->
                   <div v-if="otherActions.length > 0" class="space-y-1">
                     <p class="text-xs font-semibold text-primary">Actions</p>
                     <div class="space-y-1.5 max-w-sm">
@@ -104,6 +113,8 @@
                       </div>
                     </div>
                   </div>
+
+                  <!-- Empty State -->
                   <div
                     v-if="!replyContent && otherActions.length === 0"
                     class="flex items-center justify-center h-20"
@@ -121,7 +132,6 @@
     </CommandList>
 
     <!-- Navigation -->
-    <!-- TODO: Move to a separate component -->
     <div class="mt-2 px-4 py-2 text-xs text-gray-500 flex space-x-4">
       <span><kbd>Enter</kbd> select</span>
       <span><kbd>↑</kbd>/<kbd>↓</kbd> navigate</span>
@@ -131,7 +141,6 @@
   </CommandDialog>
 
   <!-- Date Picker for Custom Snooze -->
-  <!-- TODO: Move to a separate component -->
   <Dialog :open="showDatePicker" @update:open="closeDatePicker">
     <DialogContent class="sm:max-w-[425px]">
       <DialogHeader>

frontend/src/features/conversation/Conversation.vue

@@ -38,7 +38,7 @@
     <div class="flex flex-col flex-grow overflow-hidden">
       <MessageList class="flex-1 overflow-y-auto" />
       <div class="sticky bottom-0">
-        <ReplyBox class="h-full" />
+        <ReplyBox />
       </div>
     </div>
   </div>

frontend/src/features/conversation/ConversationTextEditor.vue

@@ -7,7 +7,7 @@
       class="bg-white p-1 box will-change-transform"
     >
       <div class="flex space-x-1 items-center">
-        <DropdownMenu>
+        <DropdownMenu v-if="aiPrompts.length > 0">
           <DropdownMenuTrigger>
             <Button size="sm" variant="ghost" class="flex items-center justify-center">
               <span class="flex items-center">
@@ -30,7 +30,7 @@
         <Button
           size="sm"
           variant="ghost"
-          @click="isBold = !isBold"
+          @click.prevent="isBold = !isBold"
           :active="isBold"
           :class="{ 'bg-gray-200': isBold }"
         >
@@ -39,22 +39,39 @@
         <Button
           size="sm"
           variant="ghost"
-          @click="isItalic = !isItalic"
+          @click.prevent="isItalic = !isItalic"
           :active="isItalic"
           :class="{ 'bg-gray-200': isItalic }"
         >
           <Italic size="14" />
         </Button>
+        <Button
+          size="sm"
+          variant="ghost"
+          @click.prevent="toggleBulletList"
+          :class="{ 'bg-gray-200': editor?.isActive('bulletList') }"
+        >
+          <List size="14" />
+        </Button>
+
+        <Button
+          size="sm"
+          variant="ghost"
+          @click.prevent="toggleOrderedList"
+          :class="{ 'bg-gray-200': editor?.isActive('orderedList') }"
+        >
+          <ListOrdered size="14" />
+        </Button>
       </div>
     </BubbleMenu>
-    <EditorContent :editor="editor" />
+    <EditorContent :editor="editor" class="native-html" />
   </div>
 </template>
 
 <script setup>
 import { ref, watch, watchEffect, onUnmounted } from 'vue'
 import { useEditor, EditorContent, BubbleMenu } from '@tiptap/vue-3'
-import { ChevronDown, Bold, Italic, Bot } from 'lucide-vue-next'
+import { ChevronDown, Bold, Italic, Bot, List, ListOrdered } from 'lucide-vue-next'
 import { Button } from '@/components/ui/button'
 import {
   DropdownMenu,
@@ -95,28 +112,7 @@ const getSelectionText = (from, to, doc) => doc.textBetween(from, to)
 const editorConfig = {
   extensions: [
     // Lists are unstyled in tailwind, so need to add classes to them.
-    StarterKit.configure({
-      bulletList: {
-        HTMLAttributes: {
-          class: 'list-disc ml-6 my-2'
-        }
-      },
-      orderedList: {
-        HTMLAttributes: {
-          class: 'list-decimal ml-6 my-2'
-        }
-      },
-      listItem: {
-        HTMLAttributes: {
-          class: 'pl-1'
-        }
-      },
-      heading: {
-        HTMLAttributes: {
-          class: 'text-xl font-bold mt-4 mb-2'
-        }
-      }
-    }),
+    StarterKit.configure(),
     Image.configure({ HTMLAttributes: { class: 'inline-image' } }),
     Placeholder.configure({ placeholder: () => props.placeholder }),
     Link
@@ -238,6 +234,18 @@ watch(
 onUnmounted(() => {
   editor.value?.destroy()
 })
+
+const toggleBulletList = () => {
+  if (editor.value) {
+    editor.value.chain().focus().toggleBulletList().run()
+  }
+}
+
+const toggleOrderedList = () => {
+  if (editor.value) {
+    editor.value.chain().focus().toggleOrderedList().run()
+  }
+}
 </script>
 
 <style lang="scss">

frontend/src/features/conversation/CreateConversation.vue

@@ -0,0 +1,345 @@
+<template>
+  <Dialog :open="dialogOpen" @update:open="dialogOpen = false">
+    <DialogContent class="max-w-5xl w-full h-[90vh] flex flex-col">
+      <DialogHeader>
+        <DialogTitle>New Conversation</DialogTitle>
+      </DialogHeader>
+      <form @submit="createConversation" class="flex flex-col flex-1 overflow-hidden">
+        <div class="flex-1 space-y-4 pr-1 overflow-y-auto pb-2">
+          <FormField name="contact_email">
+            <FormItem class="relative">
+              <FormLabel>Email</FormLabel>
+              <FormControl>
+                <Input
+                  type="email"
+                  placeholder="Search contact by email or type new email"
+                  v-model="emailQuery"
+                  @input="handleSearchContacts"
+                  autocomplete="off"
+                />
+              </FormControl>
+              <FormMessage />
+
+              <ul
+                v-if="searchResults.length"
+                class="border rounded p-2 max-h-60 overflow-y-auto absolute bg-white w-full z-50 shadow-lg"
+              >
+                <li
+                  v-for="contact in searchResults"
+                  :key="contact.email"
+                  @click="selectContact(contact)"
+                  class="cursor-pointer p-2 hover:bg-gray-100 rounded"
+                >
+                  {{ contact.first_name }} {{ contact.last_name }} ({{ contact.email }})
+                </li>
+              </ul>
+            </FormItem>
+          </FormField>
+
+          <FormField v-slot="{ componentField }" name="first_name">
+            <FormItem>
+              <FormLabel>First Name</FormLabel>
+              <FormControl>
+                <Input type="text" placeholder="First Name" v-bind="componentField" required />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <FormField v-slot="{ componentField }" name="last_name">
+            <FormItem>
+              <FormLabel>Last Name</FormLabel>
+              <FormControl>
+                <Input type="text" placeholder="Last Name" v-bind="componentField" required />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <FormField v-slot="{ componentField }" name="subject">
+            <FormItem>
+              <FormLabel>Subject</FormLabel>
+              <FormControl>
+                <Input type="text" placeholder="Subject" v-bind="componentField" required />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <FormField v-slot="{ componentField }" name="inbox_id">
+            <FormItem>
+              <FormLabel>Inbox</FormLabel>
+              <FormControl>
+                <Select v-bind="componentField">
+                  <SelectTrigger>
+                    <SelectValue placeholder="Select an inbox" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectGroup>
+                      <SelectItem
+                        v-for="option in inboxStore.options"
+                        :key="option.value"
+                        :value="option.value"
+                      >
+                        {{ option.label }}
+                      </SelectItem>
+                    </SelectGroup>
+                  </SelectContent>
+                </Select>
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <!-- Set assigned team -->
+          <FormField v-slot="{ componentField }" name="team_id">
+            <FormItem>
+              <FormLabel>Assign team (optional)</FormLabel>
+              <FormControl>
+                <ComboBox
+                  v-bind="componentField"
+                  :items="[{ value: 'none', label: 'None' }, ...teamStore.options]"
+                  placeholder="Search team"
+                  defaultLabel="Assign team"
+                >
+                  <template #item="{ item }">
+                    <div class="flex items-center gap-3 py-2">
+                      <div class="w-7 h-7 flex items-center justify-center">
+                        <span v-if="item.emoji">{{ item.emoji }}</span>
+                        <div
+                          v-else
+                          class="text-primary bg-muted rounded-full w-7 h-7 flex items-center justify-center"
+                        >
+                          <Users size="14" />
+                        </div>
+                      </div>
+                      <span class="text-sm">{{ item.label }}</span>
+                    </div>
+                  </template>
+
+                  <template #selected="{ selected }">
+                    <div class="flex items-center gap-3" v-if="selected">
+                      <div class="w-7 h-7 flex items-center justify-center">
+                        {{ selected?.emoji }}
+                      </div>
+                      <span class="text-sm">{{ selected?.label || 'Select team' }}</span>
+                    </div>
+                  </template>
+                </ComboBox>
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <!-- Set assigned agent -->
+          <FormField v-slot="{ componentField }" name="agent_id">
+            <FormItem>
+              <FormLabel>Assign agent (optional)</FormLabel>
+              <FormControl>
+                <ComboBox
+                  v-bind="componentField"
+                  :items="[{ value: 'none', label: 'None' }, ...uStore.options]"
+                  placeholder="Search agent"
+                  defaultLabel="Assign agent"
+                >
+                  <template #item="{ item }">
+                    <div class="flex items-center gap-3 py-2">
+                      <Avatar class="w-8 h-8">
+                        <AvatarImage
+                          :src="item.value === 'none' ? '/default-avatar.png' : item.avatar_url"
+                          :alt="item.value === 'none' ? 'N' : item.label.slice(0, 2)"
+                        />
+                        <AvatarFallback>
+                          {{ item.value === 'none' ? 'N' : item.label.slice(0, 2).toUpperCase() }}
+                        </AvatarFallback>
+                      </Avatar>
+                      <span class="text-sm">{{ item.label }}</span>
+                    </div>
+                  </template>
+
+                  <template #selected="{ selected }">
+                    <div class="flex items-center gap-3">
+                      <Avatar class="w-7 h-7" v-if="selected">
+                        <AvatarImage
+                          :src="
+                            selected?.value === 'none'
+                              ? '/default-avatar.png'
+                              : selected?.avatar_url
+                          "
+                          :alt="selected?.value === 'none' ? 'N' : selected?.label?.slice(0, 2)"
+                        />
+                        <AvatarFallback>
+                          {{
+                            selected?.value === 'none'
+                              ? 'N'
+                              : selected?.label?.slice(0, 2)?.toUpperCase()
+                          }}
+                        </AvatarFallback>
+                      </Avatar>
+                      <span class="text-sm">{{ selected?.label || 'Assign agent' }}</span>
+                    </div>
+                  </template>
+                </ComboBox>
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+
+          <FormField
+            v-slot="{ componentField }"
+            name="content"
+            class="flex-1 min-h-0 flex flex-col"
+          >
+            <FormItem class="flex flex-col flex-1">
+              <FormLabel>Message</FormLabel>
+              <FormControl class="flex-1 min-h-0 flex flex-col">
+                <div class="flex-1 min-h-0 flex flex-col">
+                  <Editor
+                    v-model:htmlContent="componentField.modelValue"
+                    @update:htmlContent="(value) => componentField.onChange(value)"
+                    :placeholder="'Shift + Enter to add new line'"
+                    class="w-full flex-1 overflow-y-auto p-2 min-h-[200px] box"
+                  />
+                </div>
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+        </div>
+
+        <DialogFooter class="mt-4 pt-2 border-t shrink-0">
+          <Button type="submit" :disabled="loading" :isLoading="loading"> Submit </Button>
+        </DialogFooter>
+      </form>
+    </DialogContent>
+  </Dialog>
+</template>
+
+<script setup>
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogFooter
+} from '@/components/ui/dialog'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
+import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
+import { z } from 'zod'
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
+import { ref, defineModel, watch } from 'vue'
+import { EMITTER_EVENTS } from '@/constants/emitterEvents.js'
+import { useEmitter } from '@/composables/useEmitter'
+import ComboBox from '@/components/ui/combobox/ComboBox.vue'
+import { handleHTTPError } from '@/utils/http'
+import { useInboxStore } from '@/stores/inbox'
+import { useUsersStore } from '@/stores/users'
+import { useTeamStore } from '@/stores/team'
+import {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select'
+import Editor from '@/features/conversation/ConversationTextEditor.vue'
+import api from '@/api'
+
+const dialogOpen = defineModel({
+  required: false,
+  default: () => false
+})
+
+const inboxStore = useInboxStore()
+const uStore = useUsersStore()
+const teamStore = useTeamStore()
+const emitter = useEmitter()
+const loading = ref(false)
+const searchResults = ref([])
+const emailQuery = ref('')
+let timeoutId = null
+
+const formSchema = z.object({
+  subject: z.string().min(3, 'Subject must be at least 3 characters'),
+  content: z.string().min(1, 'Message cannot be empty'),
+  inbox_id: z.any().refine((val) => inboxStore.options.some((option) => option.value === val), {
+    message: 'Inbox is required'
+  }),
+  team_id: z.any().optional(),
+  agent_id: z.any().optional(),
+  contact_email: z.string().email('Invalid email address'),
+  first_name: z.string().min(1, 'First name is required'),
+  last_name: z.string().min(1, 'Last name is required')
+})
+
+const form = useForm({
+  validationSchema: toTypedSchema(formSchema),
+  initialValues: {
+    inbox_id: null,
+    team_id: null,
+    agent_id: null,
+    subject: '',
+    content: '',
+    contact_email: '',
+    first_name: '',
+    last_name: ''
+  }
+})
+
+watch(emailQuery, (newVal) => {
+  form.setFieldValue('contact_email', newVal)
+})
+
+const handleSearchContacts = async () => {
+  clearTimeout(timeoutId)
+  timeoutId = setTimeout(async () => {
+    const query = emailQuery.value.trim()
+
+    if (query.length < 3) {
+      searchResults.value.splice(0)
+      return
+    }
+
+    try {
+      const resp = await api.searchContacts({ query })
+      searchResults.value = [...resp.data.data]
+    } catch (error) {
+      emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
+        title: 'Error',
+        variant: 'destructive',
+        description: handleHTTPError(error).message
+      })
+      searchResults.value.splice(0)
+    }
+  }, 300)
+}
+
+const selectContact = (contact) => {
+  emailQuery.value = contact.email
+  form.setFieldValue('first_name', contact.first_name)
+  form.setFieldValue('last_name', contact.last_name || '')
+  searchResults.value.splice(0)
+}
+
+const createConversation = form.handleSubmit(async (values) => {
+  loading.value = true
+  try {
+    await api.createConversation(values)
+    dialogOpen.value = false
+    form.resetForm()
+    emailQuery.value = ''
+  } catch (error) {
+    emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
+      title: 'Error',
+      variant: 'destructive',
+      description: handleHTTPError(error).message
+    })
+  } finally {
+    loading.value = false
+  }
+})
+</script>

frontend/src/features/conversation/MacroActionsPreview.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="flex flex-wrap">
-    <div class="flex flex-wrap">
+    <div class="flex flex-wrap gap-2">
       <div
         v-for="action in actions"
         :key="action.type"
         class="flex items-center bg-white border border-gray-200 rounded shadow-sm transition-all duration-300 ease-in-out hover:shadow-md group gap-2 py-1"
       >
-        <div class="flex items-center space-x-2 px-2 ">
+        <div class="flex items-center space-x-2 px-2">
           <component
             :is="getIcon(action.type)"
             size="16"

frontend/src/features/conversation/ReplyBox.vue

@@ -1,4 +1,38 @@
 <template>
+  <Dialog :open="openAIKeyPrompt" @update:open="openAIKeyPrompt = false">
+    <DialogContent class="sm:max-w-lg">
+      <DialogHeader class="space-y-2">
+        <DialogTitle>Enter OpenAI API Key</DialogTitle>
+        <DialogDescription>
+          OpenAI API key is not set or invalid. Please enter a valid API key to use AI features.
+        </DialogDescription>
+      </DialogHeader>
+      <Form v-slot="{ handleSubmit }" as="" keep-values :validation-schema="formSchema">
+        <form id="apiKeyForm" @submit="handleSubmit($event, updateProvider)">
+          <FormField v-slot="{ componentField }" name="apiKey">
+            <FormItem>
+              <FormLabel>API Key</FormLabel>
+              <FormControl>
+                <Input type="text" placeholder="Enter your API key" v-bind="componentField" />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          </FormField>
+        </form>
+        <DialogFooter>
+          <Button
+            type="submit"
+            form="apiKeyForm"
+            :is-loading="isOpenAIKeyUpdating"
+            :disabled="isOpenAIKeyUpdating"
+          >
+            Save
+          </Button>
+        </DialogFooter>
+      </Form>
+    </DialogContent>
+  </Dialog>
+
   <div class="text-foreground bg-background">
     <!-- Fullscreen editor -->
     <Dialog :open="isEditorFullscreen" @update:open="isEditorFullscreen = false">
@@ -98,15 +132,44 @@ import { ref, onMounted, nextTick, watch, computed } from 'vue'
 import { transformImageSrcToCID } from '@/utils/strings'
 import { handleHTTPError } from '@/utils/http'
 import { EMITTER_EVENTS } from '@/constants/emitterEvents.js'
+import { useUserStore } from '@/stores/user'
 import api from '@/api'
 
 import { useConversationStore } from '@/stores/conversation'
-import { Dialog, DialogContent } from '@/components/ui/dialog'
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
 import { useEmitter } from '@/composables/useEmitter'
 import ReplyBoxContent from '@/features/conversation/ReplyBoxContent.vue'
+import {
+  Form,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormMessage
+} from '@/components/ui/form'
+import { toTypedSchema } from '@vee-validate/zod'
+import * as z from 'zod'
+
+const formSchema = toTypedSchema(
+  z.object({
+    apiKey: z.string().min(1, 'API key is required')
+  })
+)
 
 const conversationStore = useConversationStore()
 const emitter = useEmitter()
+const userStore = useUserStore()
+const openAIKeyPrompt = ref(false)
+const isOpenAIKeyUpdating = ref(false)
 
 // Shared state between the two editor components.
 const clearEditorContent = ref(false)
@@ -164,6 +227,10 @@ const handleAiPromptSelected = async (key) => {
       timestamp: Date.now()
     })
   } catch (error) {
+    // Check if user needs to enter OpenAI API key and has permission to do so.
+    if (error.response?.status === 400 && userStore.can('ai:manage')) {
+      openAIKeyPrompt.value = true
+    }
     emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
       title: 'Error',
       variant: 'destructive',
@@ -172,6 +239,30 @@ const handleAiPromptSelected = async (key) => {
   }
 }
 
+/**
+ * updateProvider updates the OpenAI API key.
+ * @param {Object} values - The form values containing the API key
+ */
+const updateProvider = async (values) => {
+  try {
+    isOpenAIKeyUpdating.value = true
+    await api.updateAIProvider({ api_key: values.apiKey, provider: 'openai' })
+    openAIKeyPrompt.value = false
+    emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
+      title: 'Success',
+      description: 'API key saved successfully.'
+    })
+  } catch (error) {
+    emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
+      title: 'Error',
+      variant: 'destructive',
+      description: handleHTTPError(error).message
+    })
+  } finally {
+    isOpenAIKeyUpdating.value = false
+  }
+}
+
 /**
  * Handles the file upload process when files are selected.
  * Uploads each file to the server and adds them to the conversation's mediaFiles.
@@ -242,6 +333,7 @@ const hasTextContent = computed(() => {
  * Processes the send action.
  */
 const processSend = async () => {
+  let hasAPIErrored = false
   isEditorFullscreen.value = false
   try {
     isSending.value = true
@@ -267,7 +359,7 @@ const processSend = async () => {
       )
 
       await api.sendMessage(conversationStore.current.uuid, {
-        private: messageType.value === 'private',
+        private: messageType.value === 'private_note',
         message: message,
         attachments: conversationStore.conversation.mediaFiles.map((file) => file.id),
         // Convert email addresses to array and remove empty strings.
@@ -284,30 +376,51 @@ const processSend = async () => {
       })
     }
 
-    // Apply macro if it exists.
+    // Apply macro actions if any.
+    // For macros errors just show toast and clear the editor, as most likely it's the permission error.
     if (conversationStore.conversation?.macro?.actions?.length > 0) {
-      await api.applyMacro(
-        conversationStore.current.uuid,
-        conversationStore.conversation.macro.id,
-        conversationStore.conversation.macro.actions
-      )
+      try {
+        await api.applyMacro(
+          conversationStore.current.uuid,
+          conversationStore.conversation.macro.id,
+          conversationStore.conversation.macro.actions
+        )
+      } catch (error) {
+        emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
+          title: 'Error',
+          variant: 'destructive',
+          description: handleHTTPError(error).message
+        })
+      }
     }
+
   } catch (error) {
+    hasAPIErrored = true
     emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
       title: 'Error',
       variant: 'destructive',
       description: handleHTTPError(error).message
     })
   } finally {
+    // If API has NOT errored clear state.
+    if (hasAPIErrored === false) {
+      // Clear editor.
+      clearEditorContent.value = true
+
+      // Clear macro.
+      conversationStore.resetMacro()
+
+      // Clear media files.
+      conversationStore.resetMediaFiles()
+
+      // Clear any email errors.
+      emailErrors.value = []
+
+      nextTick(() => {
+        clearEditorContent.value = false
+      })
+    }
     isSending.value = false
-    clearEditorContent.value = true
-    // Reset media and macro in conversation store.
-    conversationStore.resetMacro()
-    conversationStore.resetMediaFiles()
-    emailErrors.value = []
-    nextTick(() => {
-      clearEditorContent.value = false
-    })
   }
   // Update assignee last seen timestamp.
   api.updateAssigneeLastSeen(conversationStore.current.uuid)
@@ -325,25 +438,16 @@ const handleOnFileDelete = (uuid) => {
 }
 
 /**
- * Watches for changes in the conversation's macro and updates the editor content with the macro content.
+ * Watches for changes in the conversation's macro id and update message content.
  */
 watch(
-  () => conversationStore.conversation.macro,
+  () => conversationStore.conversation.macro.id,
   () => {
-    // hack: Quill editor adds <p><br></p> replace with <p></p>
-    // Maybe use some other editor that doesn't add this?
-    if (conversationStore.conversation?.macro?.message_content) {
-      const contentToRender = conversationStore.conversation.macro.message_content.replace(
-        /<p><br><\/p>/g,
-        '<p></p>'
-      )
-      // Add timestamp to ensure the watcher detects the change even for identical content,
-      // As user can send the same macro multiple times.
-      contentToSet.value = JSON.stringify({
-        content: contentToRender,
-        timestamp: Date.now()
-      })
-    }
+    // Setting timestamp, so the same macro can be set again.
+    contentToSet.value = JSON.stringify({
+      content: conversationStore.conversation.macro.message_content,
+      timestamp: Date.now()
+    })
   },
   { deep: true }
 )

frontend/src/features/conversation/ReplyBoxContent.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="flex flex-col h-full max-h-[600px]">
+  <!-- Set fixed width only when not in fullscreen. -->
+  <div class="flex flex-col h-full" :class="{ 'max-h-[600px]': !isFullscreen }">
     <!-- Message type toggle -->
     <div
       class="flex justify-between items-center"
@@ -200,7 +201,8 @@ const emitter = useEmitter()
 
 const insertContent = ref(null)
 const setInlineImage = ref(null)
-const editorPlaceholder = 'Press Enter to add a new line; Press Ctrl + Enter to send.'
+const editorPlaceholder =
+  'Shift + Enter to add a new line. Cmd + Enter to send. Cmd + K to open command bar.'
 
 const toggleBcc = async () => {
   showBcc.value = !showBcc.value

frontend/src/features/conversation/list/ConversationList.vue

@@ -8,7 +8,8 @@
 
     <!-- Filters -->
     <div class="bg-white p-2 flex justify-between items-center">
-      <DropdownMenu>
+      <!-- Status dropdown-menu, hidden when a view is selected as views are pre-filtered -->
+      <DropdownMenu v-if="!route.params.viewID">
         <DropdownMenuTrigger asChild>
           <Button variant="ghost" class="w-30">
             <div>
@@ -28,6 +29,9 @@
           </DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
+      <div v-else></div>
+
+      <!-- Sort dropdown-menu -->
       <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button variant="ghost" class="w-30">
@@ -124,7 +128,10 @@
           <Loader2 v-if="isLoading" class="mr-2 h-4 w-4 animate-spin" />
           {{ isLoading ? 'Loading...' : 'Load more' }}
         </Button>
-        <p class="text-sm text-gray-500" v-else-if="conversationStore.conversationsList.length > 10">
+        <p
+          class="text-sm text-gray-500"
+          v-else-if="conversationStore.conversationsList.length > 10"
+        >
           All conversations loaded
         </p>
       </div>

frontend/src/features/conversation/list/ConversationListItem.vue

@@ -57,16 +57,18 @@
 
         <div class="flex items-center mt-2 space-x-2">
           <SlaBadge
+            v-if="conversation.first_response_due_at"
             :dueAt="conversation.first_response_due_at"
             :actualAt="conversation.first_reply_at"
             :label="'FRD'"
-            :showSLAMet="false"
+            :showExtra="false"
           />
           <SlaBadge
+            v-if="conversation.resolution_due_at"
             :dueAt="conversation.resolution_due_at"
             :actualAt="conversation.resolved_at"
             :label="'RD'"
-            :showSLAMet="false"
+            :showExtra="false"
           />
         </div>
       </div>

frontend/src/features/conversation/message/AgentMessageBubble.vue

@@ -21,7 +21,7 @@
         <!-- Message Content -->
         <div
           v-dompurify-html="messageContent"
-          class="whitespace-pre-wrap break-words overflow-wrap-anywhere"
+          class="whitespace-pre-wrap break-words overflow-wrap-anywhere native-html" 
           :class="{ 'mb-3': message.attachments.length > 0 }"
         />
 

frontend/src/features/conversation/message/ContactMessageBubble.vue

@@ -29,7 +29,7 @@
         <Letter
           :html="sanitizedMessageContent"
           :allowedSchemas="['cid', 'https', 'http']"
-          class="mb-1"
+          class="mb-1 native-html"
           :class="{ 'mb-3': message.attachments.length > 0 }"
         />
 

frontend/src/features/conversation/message/MessageList.vue

@@ -22,16 +22,14 @@
 
         <MessagesSkeleton :count="10" v-if="conversationStore.messages.loading" />
 
-        <TransitionGroup
-          v-else
-          enter-active-class="animate-slide-in"
-          tag="div"
-          class="space-y-4"
-        >
+        <TransitionGroup v-else enter-active-class="animate-slide-in" tag="div" class="space-y-4">
           <div
-            v-for="message in conversationStore.conversationMessages"
+            v-for="(message, index) in conversationStore.conversationMessages"
             :key="message.uuid"
-            :class="message.type === 'activity' ? 'my-2' : 'my-4'"
+            :class="{
+              'my-2': message.type === 'activity',
+              'pt-4': index === 0
+            }"
           >
             <div v-if="!message.private">
               <ContactMessageBubble :message="message" v-if="message.type === 'incoming'" />

frontend/src/features/conversation/sidebar/ConversationInfo.vue

@@ -27,8 +27,10 @@
     <div class="flex justify-start items-center space-x-2">
       <p class="font-medium">First reply at</p>
       <SlaBadge
+        v-if="conversation.first_response_due_at"
         :dueAt="conversation.first_response_due_at"
         :actualAt="conversation.first_reply_at"
+        :key="conversation.uuid"
       />
     </div>
     <Skeleton v-if="conversationStore.conversation.loading" class="w-32 h-4" />
@@ -43,7 +45,12 @@
   <div class="flex flex-col gap-1 mb-5">
     <div class="flex justify-start items-center space-x-2">
       <p class="font-medium">Resolved at</p>
-      <SlaBadge :dueAt="conversation.resolution_due_at" :actualAt="conversation.resolved_at" />
+      <SlaBadge 
+        v-if="conversation.resolution_due_at"
+        :dueAt="conversation.resolution_due_at"
+        :actualAt="conversation.resolved_at"
+        :key="conversation.uuid"
+      />
     </div>
     <Skeleton v-if="conversationStore.conversation.loading" class="w-32 h-4" />
     <div v-else>

frontend/src/features/sla/SlaBadge.vue

@@ -1,32 +1,33 @@
 <template>
   <div v-if="dueAt" class="flex justify-start items-center space-x-2">
-    <TransitionGroup name="fade">
-      <!-- Overdue-->
-      <span v-if="sla?.status === 'overdue'" key="overdue" class="sla-badge box sla-overdue">
-        <AlertCircle size="10" class="text-red-800" />
-        <span class="text-xs text-red-800">{{ label }} Overdue</span>
+    <!-- Overdue-->
+    <span v-if="sla?.status === 'overdue'" key="overdue" class="sla-badge box sla-overdue">
+      <AlertCircle size="12" class="text-red-800" />
+      <span class="sla-text text-red-800"
+        >{{ label }} Overdue
+        <span v-if="showExtra">by {{ sla.value }}</span>
       </span>
+    </span>
 
-      <!-- SLA Hit -->
-      <span
-        v-else-if="sla?.status === 'hit' && showSLAMet"
-        key="sla-hit"
-        class="sla-badge box sla-hit"
-      >
-        <CheckCircle size="10" />
-        <span class="sla-text">{{ label }} SLA met</span>
-      </span>
+    <!-- SLA Hit -->
+    <span
+      v-else-if="sla?.status === 'hit' && showExtra"
+      key="sla-hit"
+      class="sla-badge box sla-hit"
+    >
+      <CheckCircle size="12" />
+      <span class="sla-text">{{ label }} SLA met</span>
+    </span>
 
-      <!-- Remaining -->
-      <span
-        v-else-if="sla?.status === 'remaining'"
-        key="remaining"
-        class="sla-badge box sla-remaining"
-      >
-        <Clock size="10" />
-        <span class="sla-text">{{ label }} {{ sla.value }}</span>
-      </span>
-    </TransitionGroup>
+    <!-- Remaining -->
+    <span
+      v-else-if="sla?.status === 'remaining'"
+      key="remaining"
+      class="sla-badge box sla-remaining"
+    >
+      <Clock size="12" />
+      <span class="sla-text">{{ label }} {{ sla.value }}</span>
+    </span>
   </div>
 </template>
 
@@ -38,12 +39,16 @@ const props = defineProps({
   dueAt: String,
   actualAt: String,
   label: String,
-  showSLAMet: {
+  showExtra: {
     type: Boolean,
     default: true
   }
 })
-const { sla } = useSla(ref(props.dueAt), ref(props.actualAt))
+
+let sla = null
+if (props.dueAt) {
+  sla = useSla(ref(props.dueAt), ref(props.actualAt))
+}
 </script>
 
 <style scoped>
@@ -62,4 +67,8 @@ const { sla } = useSla(ref(props.dueAt), ref(props.actualAt))
 .sla-remaining {
   @apply bg-yellow-100 text-yellow-800;
 }
+
+.sla-text {
+  @apply text-[0.65rem];
+}
 </style>

frontend/src/features/view/FilterBuilder.vue

@@ -65,6 +65,7 @@
               </template>
 
               <template #selected="{ selected }">
+                <div v-if="!selected">Select value</div>
                 <div v-if="modelFilter.field === 'assigned_user_id'">
                   <div class="flex items-center gap-2">
                     <div v-if="selected" class="flex items-center gap-1">
@@ -76,7 +77,6 @@
                       </Avatar>
                       <span>{{ selected.label }}</span>
                     </div>
-                    <span v-else>Select user</span>
                   </div>
                 </div>
                 <div v-else-if="modelFilter.field === 'assigned_team_id'">
@@ -85,7 +85,6 @@
                       {{ selected.emoji }}
                       <span>{{ selected.label }}</span>
                     </span>
-                    <span v-else>Select team</span>
                   </div>
                 </div>
                 <div v-else-if="selected">
@@ -114,7 +113,7 @@
     </div>
 
     <div class="flex items-center justify-between pt-3">
-      <Button variant="ghost" size="sm" @click.prevent="addFilter" class="text-slate-600">
+      <Button variant="ghost" size="sm" @click="addFilter" class="text-slate-600">
         <Plus class="w-3 h-3 mr-1" /> Add filter
       </Button>
       <div class="flex gap-2" v-if="showButtons">
@@ -159,7 +158,7 @@ const createFilter = () => ({ field: '', operator: '', value: '' })
 
 onMounted(() => {
   if (modelValue.value.length === 0) {
-    modelValue.value.push(createFilter())
+    modelValue.value = [createFilter()]
   }
 })
 
@@ -171,6 +170,8 @@ const getModel = (field) => {
   const fieldConfig = props.fields.find((f) => f.field === field)
   return fieldConfig?.model || ''
 }
+
+// Set model for each filter
 watch(
   () => modelValue.value,
   (filters) => {
@@ -183,8 +184,25 @@ watch(
   { deep: true }
 )
 
-const addFilter = () => modelValue.value.push(createFilter())
-const removeFilter = (index) => modelValue.value.splice(index, 1)
+// Reset operator and value when field changes for a filter at a given index
+watch(
+  () => modelValue.value.map((f) => f.field),
+  (newFields, oldFields) => {
+    newFields.forEach((field, index) => {
+      if (field !== oldFields[index]) {
+        modelValue.value[index].operator = ''
+        modelValue.value[index].value = ''
+      }
+    })
+  }
+)
+
+const addFilter = () => {
+  modelValue.value = [...modelValue.value, createFilter()]
+}
+const removeFilter = (index) => {
+  modelValue.value = modelValue.value.filter((_, i) => i !== index)
+}
 const applyFilters = () => emit('apply', validFilters.value)
 const clearFilters = () => {
   modelValue.value = []

frontend/src/features/view/ViewForm.vue

@@ -1,9 +1,11 @@
 <template>
   <Dialog :open="openDialog" @update:open="openDialog = false">
-    <DialogContent>
+    <DialogContent class="min-w-[40%] min-h-[30%]">
       <DialogHeader class="space-y-1">
         <DialogTitle>{{ view?.id ? 'Edit' : 'Create' }} view</DialogTitle>
-        <DialogDescription> Views let you create filters and save them. </DialogDescription>
+        <DialogDescription>
+          Create and save custom filter views for quick access to your conversations.
+        </DialogDescription>
       </DialogHeader>
       <form @submit.prevent="onSubmit">
         <div class="grid gap-4 py-4">
@@ -11,7 +13,13 @@
             <FormItem>
               <FormLabel>Name</FormLabel>
               <FormControl>
-                <Input id="name" class="col-span-3" placeholder="Name" v-bind="componentField" />
+                <Input
+                  id="name"
+                  class="col-span-3"
+                  placeholder="Name"
+                  v-bind="componentField"
+                  @keydown.enter.prevent="onSubmit"
+                />
               </FormControl>
               <FormDescription>Enter an unique name for your view.</FormDescription>
               <FormMessage />
@@ -21,9 +29,13 @@
             <FormItem>
               <FormLabel>Filters</FormLabel>
               <FormControl>
-                <FilterBuilder :fields="filterFields" :showButtons="false" v-bind="componentField" />
+                <FilterBuilder
+                  :fields="filterFields"
+                  :showButtons="false"
+                  v-bind="componentField"
+                />
               </FormControl>
-              <FormDescription>Add multiple filters to customize view.</FormDescription>
+              <FormDescription> Set one or more filters to customize view.</FormDescription>
               <FormMessage />
             </FormItem>
           </FormField>
@@ -65,6 +77,7 @@ import { toTypedSchema } from '@vee-validate/zod'
 import { EMITTER_EVENTS } from '@/constants/emitterEvents.js'
 import { useEmitter } from '@/composables/useEmitter'
 import { handleHTTPError } from '@/utils/http'
+import { OPERATOR } from '@/constants/filterConfig.js'
 import { z } from 'zod'
 import api from '@/api'
 
@@ -91,27 +104,53 @@ const formSchema = toTypedSchema(
     name: z
       .string()
       .min(2, { message: 'Name must be at least 2 characters.' })
-      .max(250, { message: 'Name cannot exceed 250 characters.' }),
+      .max(30, { message: 'Name cannot exceed 30 characters.' }),
     filters: z
       .array(
         z.object({
           model: z.string({ required_error: 'Filter required' }),
           field: z.string({ required_error: 'Filter required' }),
           operator: z.string({ required_error: 'Filter required' }),
-          value: z.union([z.string(), z.number(), z.boolean()])
+          value: z.union([z.string(), z.number(), z.boolean()]).optional()
         })
       )
       .default([])
+      .refine(
+        (filters) => filters.length > 0,
+        { message: 'Please add at least one filter.' }
+      )
+      .refine(
+        (filters) =>
+          filters.every(
+            (f) =>
+              f.model &&
+              f.field &&
+              f.operator &&
+              ([OPERATOR.SET, OPERATOR.NOT_SET].includes(f.operator) || f.value)
+          ),
+        {
+          message: "Please make sure you've filled the filter fields correctly."
+        }
+      )
   })
 )
 
-const form = useForm({ validationSchema: formSchema })
+const form = useForm({
+  validationSchema: formSchema,
+  validateOnMount: false,
+  validateOnInput: false,
+  validateOnBlur: false
+})
+
+const onSubmit = async () => {
+  const validationResult = await form.validate()
+  if (!validationResult.valid) return
 
-const onSubmit = form.handleSubmit(async (values) => {
   if (isSubmitting.value) return
-
   isSubmitting.value = true
+
   try {
+    const values = form.values
     if (values.id) {
       await api.updateView(values.id, values)
     } else {
@@ -129,8 +168,9 @@ const onSubmit = form.handleSubmit(async (values) => {
   } finally {
     isSubmitting.value = false
   }
-})
+}
 
+// Set form values when view prop changes
 watch(
   () => view.value,
   (newVal) => {

frontend/src/stores/conversation.js

@@ -8,8 +8,8 @@ import MessageCache from '@/utils/conversation-message-cache'
 import api from '@/api'
 
 export const useConversationStore = defineStore('conversation', () => {
-  const CONV_LIST_PAGE_SIZE = 100
-  const MESSAGE_LIST_PAGE_SIZE = 100
+  const CONV_LIST_PAGE_SIZE = 50
+  const MESSAGE_LIST_PAGE_SIZE = 30
   const priorities = ref([])
   const statuses = ref([])
 

frontend/src/stores/user.js

@@ -1,4 +1,4 @@
-import { ref, computed } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { defineStore } from 'pinia'
 import { handleHTTPError } from '@/utils/http'
 import { useEmitter } from '@/composables/useEmitter'
@@ -6,6 +6,7 @@ import { EMITTER_EVENTS } from '@/constants/emitterEvents'
 import { adminNavItems, reportsNavItems } from '@/constants/navigation'
 import { filterNavItems } from '@/utils/nav-permissions'
 import api from '@/api'
+import { useStorage } from '@vueuse/core'
 
 export const useUserStore = defineStore('user', () => {
   const user = ref({
@@ -88,11 +89,18 @@ export const useUserStore = defineStore('user', () => {
     user.value.avatar_url = ''
   }
 
+  // Set and watch user availability status in localStorage to sync across tabs
+  const availabilityStatusStorage = useStorage('user_availability_status', user.value.availability_status)
+  watch(availabilityStatusStorage, (newVal) => {
+    user.value.availability_status = newVal
+  })
+
   const updateUserAvailability = async (status, isManual = true) => {
     try {
       const apiStatus = status === 'away' && isManual ? 'away_manual' : status
       await api.updateCurrentUserAvailability({ status: apiStatus })
       user.value.availability_status = apiStatus
+      availabilityStatusStorage.value = apiStatus
     } catch (error) {
       if (error?.response?.status === 401) window.location.href = '/'
     }

frontend/src/utils/strings.js

@@ -48,8 +48,13 @@ export const isGoHourMinuteDuration = (value) => {
 
 const template = document.createElement('template')
 export function getTextFromHTML(htmlString) {
-    template.innerHTML = htmlString
-    const text = template.content.textContent || template.content.innerText || ''
-    template.innerHTML = ''
-    return text;
+    try {
+        template.innerHTML = htmlString
+        const text = template.content.textContent || template.content.innerText || ''
+        template.innerHTML = ''
+        return text.trim()
+    } catch (error) {
+        console.error('Error converting HTML to text:', error)
+        return ''
+    }
 }

frontend/src/views/admin/automations/CreateOrEditRule.vue

@@ -155,6 +155,7 @@ import { EMITTER_EVENTS } from '@/constants/emitterEvents.js'
 import { useEmitter } from '@/composables/useEmitter'
 import { handleHTTPError } from '@/utils/http'
 import { SelectTag } from '@/components/ui/select'
+import { OPERATOR } from '@/constants/filterConfig'
 import {
   Select,
   SelectContent,
@@ -315,7 +316,8 @@ const handleSave = async (values) => {
     emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {
       title: 'Invalid rules',
       variant: 'destructive',
-      description: 'Make sure you have atleast one action and one rule.'
+      description:
+        'Make sure you have atleast one action and one rule and their values are not empty.'
     })
     return
   }
@@ -347,27 +349,53 @@ const handleSave = async (values) => {
   }
 }
 
-// TODO: Add some vee-validate validations.
+// TODO: Maybe we can do some vee validate magic here.
 const areRulesValid = () => {
+  // Must have groups.
+  if (rule.value.rules[0].groups.length == 0) {
+    return false
+  }
+
+  // At least one group should have at least one rule
+  const group1HasRules = rule.value.rules[0].groups[0].rules.length > 0
+  const group2HasRules = rule.value.rules[0].groups[1].rules.length > 0
+  if (!group1HasRules && !group2HasRules) {
+    return false
+  }
+
+  // For both groups, each rule should have value, operator and field.
+  for (const group of rule.value.rules[0].groups) {
+    for (const rule of group.rules) {
+      if (!rule.field || !rule.operator) {
+        return false
+      }
+      // For 'set' and `not set` operator, value is not required.
+      if (rule.operator !== OPERATOR.SET && rule.operator !== OPERATOR.NOT_SET && !rule.value) {
+        return false
+      }
+    }
+  }
+
   // Must have atleast one action.
   if (rule.value.rules[0].actions.length == 0) {
     return false
   }
 
-  // Must have atleast 1 group.
-  if (rule.value.rules[0].groups.length == 0) {
-    return false
-  }
+  // Make sure each action has value.
+  for (const action of rule.value.rules[0].actions) {
+    // CSAT action does not require value, set dummy value.
+    if (action.type === 'send_csat') {
+      action.value = ['0']
+    }
 
-  // Group should have atleast one rule.
-  if (rule.value.rules[0].groups[0].rules.length == 0) {
-    return false
-  }
+    // Empty array, no value selected.
+    if (action.value.length === 0) {
+      return false
+    }
 
-  // Make sure each rule has all the required fields.
-  for (const group of rule.value.rules[0].groups) {
-    for (const rule of group.rules) {
-      if (!rule.value || !rule.operator || !rule.field) {
+    // Check if all values are present.
+    for (const key in action.value) {
+      if (!action.value[key]) {
         return false
       }
     }

frontend/src/views/admin/oidc/CreateEditOIDC.vue

@@ -62,9 +62,9 @@ const submitForm = async (values) => {
       }
       await api.updateOIDC(props.id, values)
       toastDescription = 'Provider updated successfully'
-      router.push({ name: 'sso-list' })
     } else {
       await api.createOIDC(values)
+      router.push({ name: 'sso-list' })
       toastDescription = 'Provider created successfully'
     }
     emitter.emit(EMITTER_EVENTS.SHOW_TOAST, {

internal/ai/ai.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"embed"
 	"encoding/json"
+	"errors"
 
 	"github.com/abhinavxd/libredesk/internal/ai/models"
 	"github.com/abhinavxd/libredesk/internal/dbutil"
@@ -16,6 +17,9 @@ import (
 var (
 	//go:embed queries.sql
 	efs embed.FS
+
+	ErrInvalidAPIKey = errors.New("invalid API Key")
+	ErrApiKeyNotSet  = errors.New("api Key not set")
 )
 
 // Manager manages LLM providers.
@@ -35,6 +39,7 @@ type queries struct {
 	GetDefaultProvider *sqlx.Stmt `query:"get-default-provider"`
 	GetPrompt          *sqlx.Stmt `query:"get-prompt"`
 	GetPrompts         *sqlx.Stmt `query:"get-prompts"`
+	SetOpenAIKey       *sqlx.Stmt `query:"set-openai-key"`
 }
 
 // New creates and returns a new instance of the Manager.
@@ -69,6 +74,14 @@ func (m *Manager) Completion(k string, prompt string) (string, error) {
 
 	response, err := client.SendPrompt(payload)
 	if err != nil {
+		if errors.Is(err, ErrInvalidAPIKey) {
+			m.lo.Error("error invalid API key", "error", err)
+			return "", envelope.NewError(envelope.InputError, "OpenAI API Key is invalid, Please ask your administrator to set it up", nil)
+		}
+		if errors.Is(err, ErrApiKeyNotSet) {
+			m.lo.Error("error API key not set", "error", err)
+			return "", envelope.NewError(envelope.InputError, "OpenAI API Key is not set, Please ask your administrator to set it up", nil)
+		}
 		m.lo.Error("error sending prompt to provider", "error", err)
 		return "", envelope.NewError(envelope.GeneralError, err.Error(), nil)
 	}
@@ -86,6 +99,26 @@ func (m *Manager) GetPrompts() ([]models.Prompt, error) {
 	return prompts, nil
 }
 
+// UpdateProvider updates a provider.
+func (m *Manager) UpdateProvider(provider, apiKey string) error {
+	switch ProviderType(provider) {
+	case ProviderOpenAI:
+		return m.setOpenAIAPIKey(apiKey)
+	default:
+		m.lo.Error("unsupported provider type", "provider", provider)
+		return envelope.NewError(envelope.GeneralError, "Unsupported provider type", nil)
+	}
+}
+
+// setOpenAIAPIKey sets the OpenAI API key in the database.
+func (m *Manager) setOpenAIAPIKey(apiKey string) error {
+	if _, err := m.q.SetOpenAIKey.Exec(apiKey); err != nil {
+		m.lo.Error("error setting OpenAI API key", "error", err)
+		return envelope.NewError(envelope.GeneralError, "Error setting OpenAI API key", nil)
+	}
+	return nil
+}
+
 // getPrompt returns a prompt from the database.
 func (m *Manager) getPrompt(k string) (string, error) {
 	var p models.Prompt

internal/ai/openai.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/valyala/fasthttp"
 	"github.com/zerodha/logf"
 )
 
@@ -28,7 +29,7 @@ func NewOpenAIClient(apiKey string, lo *logf.Logger) *OpenAIClient {
 // SendPrompt sends a prompt to the OpenAI API and returns the response text.
 func (o *OpenAIClient) SendPrompt(payload PromptPayload) (string, error) {
 	if o.apikey == "" {
-		return "", fmt.Errorf("OpenAI API key is not set, Please ask your administrator to set the key")
+		return "", ErrApiKeyNotSet
 	}
 
 	apiURL := "https://api.openai.com/v1/chat/completions"
@@ -48,7 +49,7 @@ func (o *OpenAIClient) SendPrompt(payload PromptPayload) (string, error) {
 		return "", fmt.Errorf("marshalling request body: %w", err)
 	}
 
-	req, err := http.NewRequest("POST", apiURL, bytes.NewBuffer(bodyBytes))
+	req, err := http.NewRequest(fasthttp.MethodPost, apiURL, bytes.NewBuffer(bodyBytes))
 	if err != nil {
 		o.lo.Error("error creating request", "error", err)
 		return "", fmt.Errorf("error creating request: %w", err)
@@ -65,11 +66,12 @@ func (o *OpenAIClient) SendPrompt(payload PromptPayload) (string, error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode == http.StatusUnauthorized {
-		return "", fmt.Errorf("OpenAI API key is invalid, Please ask your administrator to update the key")
+		return "", ErrInvalidAPIKey
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		body, _ := io.ReadAll(resp.Body)
+		o.lo.Error("non-ok response received from openai API", "status", resp.Status, "code", resp.StatusCode, "response_text", body)
 		return "", fmt.Errorf("API error: %s, body: %s", resp.Status, body)
 	}
 

internal/ai/queries.sql

@@ -5,4 +5,13 @@ SELECT id, name, provider, config, is_default FROM ai_providers where is_default
 SELECT id, key, title, content FROM ai_prompts where key = $1;
 
 -- name: get-prompts
-SELECT id, key, title FROM ai_prompts order by title;
+SELECT id, key, title FROM ai_prompts order by title;
+
+-- name: set-openai-key
+UPDATE ai_providers 
+SET config = jsonb_set(
+    COALESCE(config, '{}'::jsonb),
+    '{api_key}', 
+    to_jsonb($1::text)
+) 
+WHERE provider = 'openai';

internal/auth/auth.go

@@ -90,9 +90,10 @@ func New(cfg Config, rd *redis.Client, logger *logf.Logger) (*Auth, error) {
 		EnableAutoCreate: true,
 		SessionIDLength:  64,
 		Cookie: simplesessions.CookieOptions{
+			Name:       "libredesk_session",
 			IsHTTPOnly: true,
 			IsSecure:   true,
-			Expires:    time.Now().Add(time.Hour * 48),
+			MaxAge:     time.Hour * 9,
 		},
 	})
 
@@ -388,6 +389,7 @@ func simpleSessGetCookieCB(name string, r interface{}) (*http.Cookie, error) {
 		Path:     string(c.Path()),
 		Domain:   string(c.Domain()),
 		Expires:  c.Expire(),
+		MaxAge:   c.MaxAge(),
 		Secure:   c.Secure(),
 		HttpOnly: c.HTTPOnly(),
 		SameSite: http.SameSite(c.SameSite()),
@@ -410,6 +412,7 @@ func simpleSessSetCookieCB(c *http.Cookie, w interface{}) error {
 	fc.SetPath(c.Path)
 	fc.SetDomain(c.Domain)
 	fc.SetExpire(c.Expires)
+	fc.SetMaxAge(int(c.MaxAge))
 	fc.SetSecure(c.Secure)
 	fc.SetHTTPOnly(c.HttpOnly)
 	fc.SetSameSite(fasthttp.CookieSameSite(c.SameSite))

internal/authz/models/models.go

@@ -12,6 +12,7 @@ const (
 	PermConversationsUpdatePriority     = "conversations:update_priority"
 	PermConversationsUpdateStatus       = "conversations:update_status"
 	PermConversationsUpdateTags         = "conversations:update_tags"
+	PermConversationWrite               = "conversations:write"
 	PermMessagesRead                    = "messages:read"
 	PermMessagesWrite                   = "messages:write"
 
@@ -62,6 +63,9 @@ const (
 
 	// OpenID Connect SSO
 	PermOIDCManage = "oidc:manage"
+
+	// AI
+	PermAIManage = "ai:manage"
 )
 
 var validPermissions = map[string]struct{}{
@@ -75,6 +79,7 @@ var validPermissions = map[string]struct{}{
 	PermConversationsUpdatePriority:     {},
 	PermConversationsUpdateStatus:       {},
 	PermConversationsUpdateTags:         {},
+	PermConversationWrite:               {},
 	PermMessagesRead:                    {},
 	PermMessagesWrite:                   {},
 	PermViewManage:                      {},
@@ -93,6 +98,7 @@ var validPermissions = map[string]struct{}{
 	PermGeneralSettingsManage:           {},
 	PermNotificationSettingsManage:      {},
 	PermOIDCManage:                      {},
+	PermAIManage:                        {},
 }
 
 // IsValidPermission returns true if it's a valid permission.

internal/conversation/conversation.go

@@ -24,6 +24,7 @@ import (
 	"github.com/abhinavxd/libredesk/internal/dbutil"
 	"github.com/abhinavxd/libredesk/internal/envelope"
 	"github.com/abhinavxd/libredesk/internal/inbox"
+	imodels "github.com/abhinavxd/libredesk/internal/inbox/models"
 	mmodels "github.com/abhinavxd/libredesk/internal/media/models"
 	notifier "github.com/abhinavxd/libredesk/internal/notification"
 	slaModels "github.com/abhinavxd/libredesk/internal/sla/models"
@@ -96,7 +97,7 @@ type teamStore interface {
 }
 
 type userStore interface {
-	Get(int) (umodels.User, error)
+	GetAgent(int) (umodels.User, error)
 	GetSystemUser() (umodels.User, error)
 	CreateContact(user *umodels.User) error
 }
@@ -112,6 +113,7 @@ type mediaStore interface {
 
 type inboxStore interface {
 	Get(int) (inbox.Inbox, error)
+	GetDBRecord(int) (imodels.Inbox, error)
 }
 
 type settingsStore interface {
@@ -182,7 +184,6 @@ func New(
 
 type queries struct {
 	// Conversation queries.
-	GetLatestReceivedMessageSourceID   *sqlx.Stmt `query:"get-latest-received-message-source-id"`
 	GetToAddress                       *sqlx.Stmt `query:"get-to-address"`
 	GetConversationUUID                *sqlx.Stmt `query:"get-conversation-uuid"`
 	GetConversation                    *sqlx.Stmt `query:"get-conversation"`
@@ -207,6 +208,7 @@ type queries struct {
 	UnassignOpenConversations          *sqlx.Stmt `query:"unassign-open-conversations"`
 	ReOpenConversation                 *sqlx.Stmt `query:"re-open-conversation"`
 	UnsnoozeAll                        *sqlx.Stmt `query:"unsnooze-all"`
+	DeleteConversation                 *sqlx.Stmt `query:"delete-conversation"`
 
 	// Dashboard queries.
 	GetDashboardCharts string `query:"get-dashboard-charts"`
@@ -216,6 +218,7 @@ type queries struct {
 	GetMessage                         *sqlx.Stmt `query:"get-message"`
 	GetMessages                        string     `query:"get-messages"`
 	GetPendingMessages                 *sqlx.Stmt `query:"get-pending-messages"`
+	GetMessageSourceIDs                *sqlx.Stmt `query:"get-message-source-ids"`
 	GetConversationUUIDFromMessageUUID *sqlx.Stmt `query:"get-conversation-uuid-from-message-uuid"`
 	InsertMessage                      *sqlx.Stmt `query:"insert-message"`
 	UpdateMessageStatus                *sqlx.Stmt `query:"update-message-status"`
@@ -224,13 +227,13 @@ type queries struct {
 }
 
 // CreateConversation creates a new conversation and returns its ID and UUID.
-func (c *Manager) CreateConversation(contactID, contactChannelID, inboxID int, lastMessage string, lastMessageAt time.Time, subject string) (int, string, error) {
+func (c *Manager) CreateConversation(contactID, contactChannelID, inboxID int, lastMessage string, lastMessageAt time.Time, subject string, appendRefNumToSubject bool) (int, string, error) {
 	var (
 		id     int
 		uuid   string
 		prefix string
 	)
-	if err := c.q.InsertConversation.QueryRow(contactID, contactChannelID, models.StatusOpen, inboxID, lastMessage, lastMessageAt, subject, prefix).Scan(&id, &uuid); err != nil {
+	if err := c.q.InsertConversation.QueryRow(contactID, contactChannelID, models.StatusOpen, inboxID, lastMessage, lastMessageAt, subject, prefix, appendRefNumToSubject).Scan(&id, &uuid); err != nil {
 		c.lo.Error("error inserting new conversation into the DB", "error", err)
 		return id, uuid, err
 	}
@@ -738,26 +741,28 @@ func (m *Manager) GetToAddress(conversationID int) ([]string, error) {
 	return addr, nil
 }
 
-// GetLatestReceivedMessageSourceID returns the last received message source ID.
-func (m *Manager) GetLatestReceivedMessageSourceID(conversationID int) (string, error) {
-	var out string
-	if err := m.q.GetLatestReceivedMessageSourceID.Get(&out, conversationID); err != nil {
-		m.lo.Error("error fetching message source id", "error", err, "conversation_id", conversationID)
-		return out, err
+// GetMessageSourceIDs retrieves source IDs for messages in a conversation in descending order.
+// So the oldest message will be the last in the list.
+func (m *Manager) GetMessageSourceIDs(conversationID, limit int) ([]string, error) {
+	var refs []string
+	if err := m.q.GetMessageSourceIDs.Select(&refs, conversationID, limit); err != nil {
+		m.lo.Error("error fetching message source IDs", "conversation_id", conversationID, "error", err)
+		return refs, err
 	}
-	return out, nil
+	return refs, nil
 }
 
 // SendAssignedConversationEmail sends a email for an assigned conversation to the passed user ids.
 func (m *Manager) SendAssignedConversationEmail(userIDs []int, conversation models.Conversation) error {
-	agent, err := m.userStore.Get(userIDs[0])
+	agent, err := m.userStore.GetAgent(userIDs[0])
 	if err != nil {
 		m.lo.Error("error fetching agent", "user_id", userIDs[0], "error", err)
 		return fmt.Errorf("fetching agent: %w", err)
 	}
 
-	content, subject, err := m.template.RenderNamedTemplate(template.TmplConversationAssigned,
-		map[string]interface{}{
+	content, subject, err := m.template.RenderStoredEmailTemplate(template.TmplConversationAssigned,
+		map[string]any{
+			// Kept these lower case keys for backward compatibility.
 			"conversation": map[string]string{
 				"subject":          conversation.Subject.String,
 				"uuid":             conversation.UUID,
@@ -767,6 +772,31 @@ func (m *Manager) SendAssignedConversationEmail(userIDs []int, conversation mode
 			"agent": map[string]string{
 				"full_name": agent.FullName(),
 			},
+			// Following the new structure.
+			"Conversation": map[string]any{
+				"ReferenceNumber": conversation.ReferenceNumber,
+				"Subject":         conversation.Subject.String,
+				"Priority":        conversation.Priority.String,
+				"UUID":            conversation.UUID,
+			},
+			"Agent": map[string]any{
+				"FirstName": agent.FirstName,
+				"LastName":  agent.LastName,
+				"FullName":  agent.FullName(),
+				"Email":     agent.Email,
+			},
+			"Contact": map[string]any{
+				"FirstName": conversation.Contact.FirstName,
+				"LastName":  conversation.Contact.LastName,
+				"FullName":  conversation.Contact.FullName(),
+				"Email":     conversation.Contact.Email,
+			},
+			"Recipient": map[string]any{
+				"FirstName": agent.FirstName,
+				"LastName":  agent.LastName,
+				"FullName":  agent.FullName(),
+				"Email":     agent.Email,
+			},
 		})
 	if err != nil {
 		m.lo.Error("error rendering template", "template", template.TmplConversationAssigned, "conversation_uuid", conversation.UUID, "error", err)
@@ -849,7 +879,7 @@ func (m *Manager) ApplyAction(action amodels.RuleAction, conv models.Conversatio
 	case amodels.ActionSendPrivateNote:
 		return m.SendPrivateNote([]mmodels.Media{}, user.ID, conv.UUID, action.Value[0])
 	case amodels.ActionReply:
-		return m.SendReply([]mmodels.Media{}, user.ID, conv.UUID, action.Value[0], nil, nil, nil)
+		return m.SendReply([]mmodels.Media{}, conv.InboxID, user.ID, conv.UUID, action.Value[0], nil, nil, nil)
 	case amodels.ActionSetSLA:
 		slaID, _ := strconv.Atoi(action.Value[0])
 		return m.ApplySLA(conv, slaID, user)
@@ -887,7 +917,16 @@ func (m *Manager) SendCSATReply(actorUserID int, conversation models.Conversatio
 	meta := map[string]interface{}{
 		"is_csat": true,
 	}
-	return m.SendReply([]mmodels.Media{}, actorUserID, conversation.UUID, message, nil, nil, meta)
+	return m.SendReply([]mmodels.Media{}, conversation.InboxID, actorUserID, conversation.UUID, message, nil, nil, meta)
+}
+
+// DeleteConversation deletes a conversation.
+func (m *Manager) DeleteConversation(uuid string) error {
+	if _, err := m.q.DeleteConversation.Exec(uuid); err != nil {
+		m.lo.Error("error deleting conversation", "error", err)
+		return envelope.NewError(envelope.GeneralError, "Error deleting conversation", nil)
+	}
+	return nil
 }
 
 // addConversationParticipant adds a user as participant to a conversation.

internal/conversation/message.go

@@ -50,7 +50,7 @@ const (
 	ContentTypeHTML = "html"
 
 	maxLastMessageLen  = 45
-	maxMessagesPerPage = 30
+	maxMessagesPerPage = 100
 )
 
 // Run starts a pool of worker goroutines to handle message dispatching via inbox's channel and processes incoming messages. It scans for
@@ -178,10 +178,29 @@ func (m *Manager) sendOutgoingMessage(message models.Message) {
 		return
 	}
 
-	// Set message sender and receiver
+	// Set from and to addresses
 	message.From = inbox.FromAddress()
-	message.To, _ = m.GetToAddress(message.ConversationID)
-	message.InReplyTo, _ = m.GetLatestReceivedMessageSourceID(message.ConversationID)
+	message.To, err = m.GetToAddress(message.ConversationID)
+	if handleError(err, "error fetching `to` address") {
+		return
+	}
+
+	// Set "In-Reply-To" and "References" headers, logging any errors but continuing to send the message.
+	// Include only the last 20 messages as references to avoid exceeding header size limits.
+	message.References, err = m.GetMessageSourceIDs(message.ConversationID, 20)
+	if err != nil {
+		m.lo.Error("Error fetching conversation source IDs", "error", err)
+	}
+
+	// References is sorted in DESC i.e newest message first, so reverse it to keep the references in order.
+	stringutil.ReverseSlice(message.References)
+
+	// Remove the current message ID from the references.
+	message.References = stringutil.RemoveItemByValue(message.References, message.SourceID.String)
+
+	if len(message.References) > 0 {
+		message.InReplyTo = message.References[len(message.References)-1]
+	}
 
 	// Send message
 	err = inbox.Send(message)
@@ -203,7 +222,27 @@ func (m *Manager) RenderContentInTemplate(channel string, message *models.Messag
 			m.lo.Error("error fetching conversation", "uuid", message.ConversationUUID, "error", err)
 			return fmt.Errorf("fetching conversation: %w", err)
 		}
-		message.Content, err = m.template.RenderWithBaseTemplate(conversation, message.Content)
+		// Pass conversation and contact data to the template for rendering any placeholders.
+		message.Content, err = m.template.RenderEmailWithTemplate(map[string]any{
+			"Conversation": map[string]any{
+				"ReferenceNumber": conversation.ReferenceNumber,
+				"Subject":         conversation.Subject.String,
+				"Priority":        conversation.Priority.String,
+				"UUID":            conversation.UUID,
+			},
+			"Contact": map[string]any{
+				"FirstName": conversation.Contact.FirstName,
+				"LastName":  conversation.Contact.LastName,
+				"FullName":  conversation.Contact.FullName(),
+				"Email":     conversation.Contact.Email,
+			},
+			"Recipient": map[string]any{
+				"FirstName": conversation.Contact.FirstName,
+				"LastName":  conversation.Contact.LastName,
+				"FullName":  conversation.Contact.FullName(),
+				"Email":     conversation.Contact.Email,
+			},
+		}, message.Content)
 		if err != nil {
 			m.lo.Error("could not render email content using template", "id", message.ID, "error", err)
 			return fmt.Errorf("could not render email content using template: %w", err)
@@ -293,11 +332,10 @@ func (m *Manager) SendPrivateNote(media []mmodels.Media, senderID int, conversat
 }
 
 // SendReply inserts a reply message in a conversation.
-func (m *Manager) SendReply(media []mmodels.Media, senderID int, conversationUUID, content string, cc, bcc []string, meta map[string]interface{}) error {
+func (m *Manager) SendReply(media []mmodels.Media, inboxID, senderID int, conversationUUID, content string, cc, bcc []string, meta map[string]interface{}) error {
+	// Save cc and bcc as JSON in meta.
 	cc = stringutil.RemoveEmpty(cc)
 	bcc = stringutil.RemoveEmpty(bcc)
-
-	// Save cc and bcc as JSON in meta.
 	if len(cc) > 0 {
 		meta["cc"] = cc
 	}
@@ -308,6 +346,19 @@ func (m *Manager) SendReply(media []mmodels.Media, senderID int, conversationUUI
 	if err != nil {
 		return envelope.NewError(envelope.GeneralError, "Error marshalling message meta", nil)
 	}
+
+	// Generage unique source ID i.e. message-id for email.
+	inbox, err := m.inboxStore.GetDBRecord(inboxID)
+	if err != nil {
+		return err
+	}
+	sourceID, err := stringutil.GenerateEmailMessageID(conversationUUID, inbox.From)
+	if err != nil {
+		m.lo.Error("error generating source message id", "error", err)
+		return envelope.NewError(envelope.GeneralError, "Error generating source message id", nil)
+	}
+
+	// Insert Message.
 	message := models.Message{
 		ConversationUUID: conversationUUID,
 		SenderID:         senderID,
@@ -319,6 +370,7 @@ func (m *Manager) SendReply(media []mmodels.Media, senderID int, conversationUUI
 		Private:          false,
 		Media:            media,
 		Meta:             string(metaJSON),
+		SourceID:         null.StringFrom(sourceID),
 	}
 	return m.InsertMessage(&message)
 }
@@ -355,8 +407,14 @@ func (m *Manager) InsertMessage(message *models.Message) error {
 		return err
 	}
 
-	// Update conversation last message details in conversation metadata.
-	m.UpdateConversationLastMessage(message.ConversationID, message.ConversationUUID, message.TextContent, message.SenderType, message.CreatedAt)
+	// Hide CSAT message content as it contains a public link to the survey.
+	lastMessage := message.TextContent
+	if message.HasCSAT() {
+		lastMessage = "Please rate your experience with us"
+	}
+
+	// Update conversation last message details in conversation.
+	m.UpdateConversationLastMessage(message.ConversationID, message.ConversationUUID, lastMessage, message.SenderType, message.CreatedAt)
 
 	// Broadcast new message.
 	m.BroadcastNewMessage(message)
@@ -371,7 +429,7 @@ func (m *Manager) RecordAssigneeUserChange(conversationUUID string, assigneeID i
 	}
 
 	// Assignment to another user.
-	assignee, err := m.userStore.Get(assigneeID)
+	assignee, err := m.userStore.GetAgent(assigneeID)
 	if err != nil {
 		return err
 	}
@@ -655,11 +713,8 @@ func (m *Manager) findOrCreateConversation(in *models.Message, inboxID, contactC
 		conversationUUID string
 	)
 
-	// Search for existing conversation.
-	sourceIDs := in.References
-	if in.InReplyTo != "" {
-		sourceIDs = append(sourceIDs, in.InReplyTo)
-	}
+	// Search for existing conversation using the in-reply-to and references.
+	sourceIDs := append([]string{in.InReplyTo}, in.References...)
 	conversationID, err = m.findConversationID(sourceIDs)
 	if err != nil && err != errConversationNotFound {
 		return new, err
@@ -670,7 +725,7 @@ func (m *Manager) findOrCreateConversation(in *models.Message, inboxID, contactC
 		new = true
 		lastMessage := stringutil.HTML2Text(in.Content)
 		lastMessageAt := time.Now()
-		conversationID, conversationUUID, err = m.CreateConversation(contactID, contactChannelID, inboxID, lastMessage, lastMessageAt, in.Subject)
+		conversationID, conversationUUID, err = m.CreateConversation(contactID, contactChannelID, inboxID, lastMessage, lastMessageAt, in.Subject, false /**append reference number to subject**/)
 		if err != nil || conversationID == 0 {
 			return new, err
 		}

internal/conversation/models/models.go

@@ -119,6 +119,7 @@ type Message struct {
 	InReplyTo        string                 `json:"-"`
 	Headers          textproto.MIMEHeader   `json:"-"`
 	Media            []mmodels.Media        `db:"-" json:"-"`
+	IsCSAT           bool                   `db:"-" json:"-"`
 	Total            int                    `db:"total" json:"-"`
 }
 
@@ -134,6 +135,16 @@ func (m *Message) CensorCSATContent() {
 	}
 }
 
+// HasCSAT returns true if the message is a CSAT message.
+func (m *Message) HasCSAT() bool {
+	var meta map[string]interface{}
+	if err := json.Unmarshal([]byte(m.Meta), &meta); err != nil {
+		return false
+	}
+	isCsat, _ := meta["is_csat"].(bool)
+	return isCsat
+}
+
 // IncomingMessage links a message with the contact information and inbox id.
 type IncomingMessage struct {
 	Message Message

internal/conversation/queries.sql

@@ -9,7 +9,7 @@ status_id AS (
    SELECT id FROM conversation_statuses WHERE name = $3
 ),
 reference_number AS (
-   SELECT generate_reference_number($8) as reference_number
+   SELECT generate_reference_number($8) AS reference_number
 )
 INSERT INTO conversations
 (contact_id, contact_channel_id, status_id, inbox_id, last_message, last_message_at, subject, reference_number)
@@ -20,7 +20,10 @@ VALUES(
    $4, 
    $5, 
    $6, 
-   $7, 
+   CASE 
+      WHEN $9 = TRUE THEN CONCAT($7::text, ' [', (SELECT reference_number FROM reference_number), ']')
+      ELSE $7::text
+   END, 
    (SELECT reference_number FROM reference_number)
 )
 RETURNING id, uuid;
@@ -362,13 +365,16 @@ SET assigned_user_id = NULL,
     updated_at = now()
 WHERE assigned_user_id = $1 AND status_id in (SELECT id FROM conversation_statuses WHERE name NOT IN ('Resolved', 'Closed'));
 
+
 -- MESSAGE queries.
--- name: get-latest-received-message-source-id
-SELECT source_id
+-- name: get-message-source-ids
+SELECT 
+    source_id
 FROM conversation_messages
-WHERE conversation_id = $1 and status = 'received'
+WHERE conversation_id = $1
+AND type in ('incoming', 'outgoing')
 ORDER BY id DESC
-LIMIT 1;
+LIMIT $2;
 
 -- name: get-pending-messages
 SELECT
@@ -520,4 +526,7 @@ SET status_id = (SELECT id FROM conversation_statuses WHERE name = 'Open'), snoo
     updated_at = now()
 WHERE uuid = $1 and status_id in (
     SELECT id FROM conversation_statuses WHERE name IN ('Snoozed', 'Closed', 'Resolved')
-)
+)
+
+-- name: delete-conversation
+DELETE FROM conversations WHERE uuid = $1;

internal/inbox/channel/email/smtp.go

@@ -112,12 +112,17 @@ func (e *Email) Send(m models.Message) error {
 		email.Headers.Set(key, value[0])
 	}
 
-	// Set In-Reply-To and References headers
+	// Set In-Reply-To header
 	if m.InReplyTo != "" {
 		email.Headers.Set(headerInReplyTo, "<"+m.InReplyTo+">")
 	}
 
-	// Set references message ids
+	// Set message id header
+	if m.SourceID.String != "" {
+		email.Headers.Set(headerMessageID, fmt.Sprintf("<%s>", m.SourceID.String))
+	}
+
+	// Set references header
 	var references string
 	for _, ref := range m.References {
 		references += "<" + ref + "> "

internal/migrations/v0.4.0.go

@@ -0,0 +1,36 @@
+package migrations
+
+import (
+	"github.com/jmoiron/sqlx"
+	"github.com/knadh/koanf/v2"
+	"github.com/knadh/stuffbin"
+)
+
+// V0_4_0 updates the database schema to v0.4.0.
+func V0_4_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf) error {
+	// Admin role gets new permissions.
+	_, err := db.Exec(`
+		UPDATE roles 
+		SET permissions = array_append(permissions, 'ai:manage')
+		WHERE name = 'Admin' AND NOT ('ai:manage' = ANY(permissions));
+	`)
+	if err != nil {
+		return err
+	}
+
+	_, err = db.Exec(`
+		UPDATE roles 
+		SET permissions = array_append(permissions, 'conversations:write')
+		WHERE name = 'Admin' AND NOT ('conversations:write' = ANY(permissions));
+	`)
+	if err != nil {
+		return err
+	}
+
+	// Create trigram index on users.email if it doesn't exist.
+	_, err = db.Exec(`
+		CREATE INDEX IF NOT EXISTS index_tgrm_users_on_email 
+		ON users USING GIN (email gin_trgm_ops);
+	`)
+	return err
+}

internal/oidc/queries.sql

@@ -1,8 +1,8 @@
 -- name: get-all-oidc
-SELECT id, created_at, updated_at, name, provider, provider_url, client_id, client_secret, enabled FROM oidc order by updated_at desc;
+SELECT id, created_at, updated_at, name, provider, client_id, client_secret, provider_url, enabled FROM oidc order by updated_at desc;
 
 -- name: get-all-enabled
-SELECT id, name, enabled, provider, updated_at FROM oidc WHERE enabled = true order by updated_at desc;
+SELECT id, name, enabled, provider, client_id, updated_at FROM oidc WHERE enabled = true order by updated_at desc;
 
 -- name: get-oidc
 SELECT * FROM oidc WHERE id = $1;

internal/search/models/models.go

@@ -16,3 +16,10 @@ type Message struct {
 	ConversationUUID            string    `db:"conversation_uuid" json:"conversation_uuid"`
 	ConversationReferenceNumber string    `db:"conversation_reference_number" json:"conversation_reference_number"`
 }
+
+type Contact struct {
+	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	FirstName string    `db:"first_name" json:"first_name"`
+	LastName  string    `db:"last_name" json:"last_name"`
+	Email     string    `db:"email" json:"email"`
+}

internal/search/queries.sql

@@ -15,4 +15,17 @@ SELECT
     m.text_content
 FROM conversation_messages m
     JOIN conversations c ON m.conversation_id = c.id
-WHERE m.type != 'activity' and m.text_content ILIKE '%' || $1 || '%';
+WHERE m.type != 'activity' and m.text_content ILIKE '%' || $1 || '%';
+
+-- name: search-contacts
+SELECT 
+    id,
+    created_at,
+    first_name,
+    last_name,
+    email
+FROM users
+WHERE type = 'contact'
+AND deleted_at IS NULL
+AND email ILIKE '%' || $1 || '%'
+LIMIT 15;

internal/search/search.go

@@ -32,6 +32,7 @@ type Opts struct {
 type queries struct {
 	SearchConversations *sqlx.Stmt `query:"search-conversations"`
 	SearchMessages      *sqlx.Stmt `query:"search-messages"`
+	SearchContacts      *sqlx.Stmt `query:"search-contacts"`
 }
 
 // New creates a new search manager
@@ -62,3 +63,13 @@ func (s *Manager) Messages(query string) ([]models.Message, error) {
 	}
 	return results, nil
 }
+
+// Contacts searches contacts based on the query
+func (s *Manager) Contacts(query string) ([]models.Contact, error) {
+	var results = make([]models.Contact, 0)
+	if err := s.q.SearchContacts.Select(&results, query); err != nil {
+		s.lo.Error("error searching contacts", "error", err)
+		return nil, envelope.NewError(envelope.GeneralError, "Error searching contacts", nil)
+	}
+	return results, nil
+}

internal/setting/setting.go

@@ -75,6 +75,7 @@ func (m *Manager) GetAll() (models.Settings, error) {
 func (m *Manager) GetAllJSON() (types.JSONText, error) {
 	var b types.JSONText
 	if err := m.q.GetAll.Get(&b); err != nil {
+		m.lo.Error("error fetching settings", "error", err)
 		return b, err
 	}
 	return b, nil
@@ -85,10 +86,12 @@ func (m *Manager) Update(s interface{}) error {
 	// Marshal settings.
 	b, err := json.Marshal(s)
 	if err != nil {
+		m.lo.Error("error marshalling settings", "error", err)
 		return envelope.NewError(envelope.GeneralError, "Error updating settings", nil)
 	}
 	// Update the settings in the DB.
 	if _, err := m.q.Update.Exec(b); err != nil {
+		m.lo.Error("error updating settings", "error", err)
 		return envelope.NewError(envelope.GeneralError, "Error updating settings", nil)
 	}
 	return nil

internal/stringutil/stringutil.go

@@ -3,10 +3,14 @@ package stringutil
 
 import (
 	"crypto/rand"
+	"encoding/base64"
+	"fmt"
+	"net/mail"
 	"net/url"
 	"path/filepath"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/k3a/html2text"
 )
@@ -94,3 +98,65 @@ func RemoveEmpty(s []string) []string {
 	}
 	return r
 }
+
+// GenerateEmailMessageID generates a RFC-compliant Message-ID for an email, does not include the angle brackets.
+// The client is expected to wrap the returned string in angle brackets.
+func GenerateEmailMessageID(messageID string, fromAddress string) (string, error) {
+	if messageID == "" {
+		return "", fmt.Errorf("messageID cannot be empty")
+	}
+
+	// Parse from address
+	addr, err := mail.ParseAddress(fromAddress)
+	if err != nil {
+		return "", fmt.Errorf("invalid from address: %w", err)
+	}
+
+	// Extract domain with validation
+	parts := strings.Split(addr.Address, "@")
+	if len(parts) != 2 || parts[1] == "" {
+		return "", fmt.Errorf("invalid domain in from address")
+	}
+	domain := parts[1]
+
+	// Generate cryptographic random component
+	random := make([]byte, 8)
+	if _, err := rand.Read(random); err != nil {
+		return "", fmt.Errorf("failed to generate random bytes: %w", err)
+	}
+
+	// Sanitize messageID for email Message-ID
+	cleaner := regexp.MustCompile(`[^\w.-]`) // Allow only alphanum, ., -, _
+	cleanmessageID := cleaner.ReplaceAllString(messageID, "_")
+
+	// Ensure cleaned messageID isn't empty
+	if cleanmessageID == "" {
+		return "", fmt.Errorf("messageID became empty after sanitization")
+	}
+
+	// Build RFC-compliant Message-ID
+	return fmt.Sprintf("%s-%d-%s@%s",
+		cleanmessageID,
+		time.Now().UnixNano(), // Nanosecond precision
+		strings.TrimRight(base64.URLEncoding.EncodeToString(random), "="), // URL-safe base64 without padding
+		domain,
+	), nil
+}
+
+// ReverseSlice reverses a slice of strings in place.
+func ReverseSlice(source []string) {
+	for i, j := 0, len(source)-1; i < j; i, j = i+1, j-1 {
+		source[i], source[j] = source[j], source[i]
+	}
+}
+
+// RemoveItemByValue removes all instances of a value from a slice of strings.
+func RemoveItemByValue(slice []string, value string) []string {
+	result := []string{}
+	for _, v := range slice {
+		if v != value {
+			result = append(result, v)
+		}
+	}
+	return result
+}

internal/template/render.go

@@ -22,17 +22,19 @@ const (
 	TmplContent = "content"
 )
 
-// RenderWithBaseTemplate merges the given content with the default outgoing email template, if available.
-func (m *Manager) RenderWithBaseTemplate(data any, content string) (string, error) {
+// RenderEmailWithTemplate renders content inside the default outgoing email template.
+func (m *Manager) RenderEmailWithTemplate(data any, content string) (string, error) {
 	m.mutex.RLock()
 	defer m.mutex.RUnlock()
+
 	defaultTmpl, err := m.getDefaultOutgoingEmailTemplate()
 	if err != nil {
 		if err == ErrTemplateNotFound {
-			m.lo.Warn("default outgoing email template not found, rendering content any template")
+			m.lo.Warn("default outgoing email template not found, rendering content without any template")
 			return content, nil
 		}
-		return "", err
+		m.lo.Error("error fetching default outgoing email template", "error", err)
+		return "", fmt.Errorf("fetching default outgoing email template: %w", err)
 	}
 
 	baseTemplate, err := template.New(TmplBase).Funcs(m.funcMap).Parse(defaultTmpl.Body)
@@ -58,8 +60,8 @@ func (m *Manager) RenderWithBaseTemplate(data any, content string) (string, erro
 	return rendered.String(), nil
 }
 
-// RenderNamedTemplate fetches a named template from DB and merges it with the default base template, if available.
-func (m *Manager) RenderNamedTemplate(name string, data any) (string, string, error) {
+// RenderStoredEmailTemplate fetches and renders an email template from the database, including subject and body and returns the rendered content.
+func (m *Manager) RenderStoredEmailTemplate(name string, data any) (string, string, error) {
 	tmpl, err := m.getByName(name)
 	if err != nil {
 		if err == ErrTemplateNotFound {
@@ -137,8 +139,9 @@ func (m *Manager) RenderNamedTemplate(name string, data any) (string, string, er
 	return rendered.String(), subject, nil
 }
 
-// RenderTemplate executes a named in-memory template with the provided data.
-func (m *Manager) RenderTemplate(name string, data interface{}) (string, error) {
+// RenderInMemoryTemplate executes an in-memory template with data and returns the rendered content.
+// This is for system emails like reset password and welcome email etc.
+func (m *Manager) RenderInMemoryTemplate(name string, data interface{}) (string, error) {
 	m.mutex.RLock()
 	defer m.mutex.RUnlock()
 	var buf bytes.Buffer

internal/user/queries.sql

@@ -45,7 +45,7 @@ FROM users u
 LEFT JOIN user_roles ur ON ur.user_id = u.id
 LEFT JOIN roles r ON r.id = ur.role_id,
      unnest(r.permissions) p
-WHERE (u.id = $1 OR u.email = $2) AND u.deleted_at IS NULL AND u.type = 'agent'
+WHERE (u.id = $1 OR u.email = $2) AND u.type = $3 AND u.deleted_at IS NULL
 GROUP BY u.id;
 
 -- name: set-user-password
@@ -97,7 +97,10 @@ WHERE id = $1;
 -- name: update-inactive-offline
 UPDATE users
 SET availability_status = 'offline'
-WHERE last_active_at < now() - interval '5 minutes' and availability_status != 'offline';
+WHERE 
+type = 'agent' 
+AND (last_active_at IS NULL OR last_active_at < NOW() - INTERVAL '5 minutes')
+AND availability_status != 'offline';
 
 -- name: get-permissions
 SELECT DISTINCT unnest(r.permissions)

internal/user/user.go

@@ -95,7 +95,7 @@ func New(i18n *i18n.I18n, opts Opts) (*Manager, error) {
 // VerifyPassword authenticates an user by email and password.
 func (u *Manager) VerifyPassword(email string, password []byte) (models.User, error) {
 	var user models.User
-	if err := u.q.GetUser.Get(&user, 0, email); err != nil {
+	if err := u.q.GetUser.Get(&user, 0, email, UserTypeAgent); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return user, envelope.NewError(envelope.InputError, u.i18n.T("user.invalidEmailPassword"), nil)
 		}
@@ -154,10 +154,25 @@ func (u *Manager) CreateAgent(user *models.User) error {
 	return nil
 }
 
+// GetAgent retrieves an agent by ID.
+func (u *Manager) GetAgent(id int) (models.User, error) {
+	return u.Get(id, UserTypeAgent)
+}
+
+// GetAgentByEmail retrieves an agent by email.
+func (u *Manager) GetAgentByEmail(email string) (models.User, error) {
+	return u.GetByEmail(email, UserTypeAgent)
+}
+
+// GetContact retrieves a contact by ID.
+func (u *Manager) GetContact(id int) (models.User, error) {
+	return u.Get(id, UserTypeContact)
+}
+
 // Get retrieves an user by ID.
-func (u *Manager) Get(id int) (models.User, error) {
+func (u *Manager) Get(id int, type_ string) (models.User, error) {
 	var user models.User
-	if err := u.q.GetUser.Get(&user, id, ""); err != nil {
+	if err := u.q.GetUser.Get(&user, id, "", type_); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			u.lo.Error("user not found", "id", id, "error", err)
 			return user, envelope.NewError(envelope.GeneralError, "User not found", nil)
@@ -169,9 +184,9 @@ func (u *Manager) Get(id int) (models.User, error) {
 }
 
 // GetByEmail retrieves an user by email
-func (u *Manager) GetByEmail(email string) (models.User, error) {
+func (u *Manager) GetByEmail(email, type_ string) (models.User, error) {
 	var user models.User
-	if err := u.q.GetUser.Get(&user, 0, email); err != nil {
+	if err := u.q.GetUser.Get(&user, 0, email, type_); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return user, envelope.NewError(envelope.GeneralError, "User not found", nil)
 		}
@@ -183,7 +198,7 @@ func (u *Manager) GetByEmail(email string) (models.User, error) {
 
 // GetSystemUser retrieves the system user.
 func (u *Manager) GetSystemUser() (models.User, error) {
-	return u.GetByEmail(systemUserEmail)
+	return u.GetByEmail(systemUserEmail, UserTypeAgent)
 }
 
 // UpdateAvatar updates the user avatar.
@@ -332,7 +347,6 @@ func (u *Manager) MonitorAgentAvailability(ctx context.Context) {
 
 // markInactiveAgentsOffline sets agents offline if they have been inactive for more than 5 minutes.
 func (u *Manager) markInactiveAgentsOffline() {
-	u.lo.Debug("marking inactive agents offline")
 	if res, err := u.q.UpdateInactiveOffline.Exec(); err != nil {
 		u.lo.Error("error setting users offline", "error", err)
 	} else {
@@ -341,7 +355,6 @@ func (u *Manager) markInactiveAgentsOffline() {
 			u.lo.Info("set inactive users offline", "count", rows)
 		}
 	}
-	u.lo.Debug("marked inactive agents offline")
 }
 
 // verifyPassword compares the provided password with the stored password hash.

schema.sql

@@ -129,6 +129,7 @@ CREATE TABLE users (
 );
 CREATE UNIQUE INDEX index_unique_users_on_email_and_type_when_deleted_at_is_null ON users (email, type) 
 WHERE deleted_at IS NULL;
+CREATE INDEX index_tgrm_users_on_email ON users USING GIN (email gin_trgm_ops);
 
 DROP TABLE IF EXISTS user_roles CASCADE;
 CREATE TABLE user_roles (
@@ -536,28 +537,30 @@ VALUES
 	(
 		'Admin',
 		'Role for users who have complete access to everything.',
-		'{general_settings:manage,notification_settings:manage,oidc:manage,conversations:read_all,conversations:read_unassigned,conversations:read_assigned,conversations:read_team_inbox,conversations:read,conversations:update_user_assignee,conversations:update_team_assignee,conversations:update_priority,conversations:update_status,conversations:update_tags,messages:read,messages:write,view:manage,status:manage,tags:manage,macros:manage,users:manage,teams:manage,automations:manage,inboxes:manage,roles:manage,reports:manage,templates:manage,business_hours:manage,sla:manage}'
+		'{conversations:write,ai:manage,general_settings:manage,notification_settings:manage,oidc:manage,conversations:read_all,conversations:read_unassigned,conversations:read_assigned,conversations:read_team_inbox,conversations:read,conversations:update_user_assignee,conversations:update_team_assignee,conversations:update_priority,conversations:update_status,conversations:update_tags,messages:read,messages:write,view:manage,status:manage,tags:manage,macros:manage,users:manage,teams:manage,automations:manage,inboxes:manage,roles:manage,reports:manage,templates:manage,business_hours:manage,sla:manage}'
 	);
 
 
 -- Email notification templates
-INSERT INTO public.templates
+INSERT INTO templates
 ("type", body, is_default, "name", subject, is_builtin)
-VALUES('email_notification'::public."template_type", '<p>Hello {{ .agent.full_name }},</p>
+VALUES('email_notification'::template_type, '
+<p>Hi {{ .Agent.FirstName }},</p>
 
 <p>A new conversation has been assigned to you:</p>
 
 <div>
-    Reference number: {{.conversation.reference_number }} <br>
-    Priority: {{.conversation.priority }}<br>
-    Subject: {{.conversation.subject }}
+    Reference number: {{ .Conversation.ReferenceNumber }} <br>
+    Subject: {{ .Conversation.Subject }}
 </div>
 
 <p>
-<a href="{{ RootURL }}/inboxes/assigned/conversation/{{ .conversation.uuid }}">View Conversation</a>
+    <a href="{{ RootURL }}/inboxes/assigned/conversation/{{ .Conversation.UUID }}">View Conversation</a>
 </p>
 
-<div >
+<div>
     Best regards,<br>
     Libredesk
-</div>', false, 'Conversation assigned', 'New conversation assigned to you', true);
+</div>
+
+', false, 'Conversation assigned', 'New conversation assigned to you', true);

static/email-templates/base.html

@@ -100,7 +100,7 @@
     <div class="wrap">
         <div class="header">
             {{ if ne LogoURL "" }}
-                <img src="{{ LogoURL }}" alt="" />
+                <img src="{{ LogoURL }}" alt="{{ SiteName }}" style="max-width: 150px;">
             {{ end }}
         </div>
 {{ end }}
@@ -108,6 +108,7 @@
 {{ define "footer" }}
     </div>
     <div class="footer">
+        <span style="opacity: 0.6;">Powered by <a href="https://libredesk.io/" target="_blank">Libredesk</a></span>
     </div>
     <div class="gutter">&nbsp;</div>
 </body>

static/email-templates/welcome.html

@@ -1,23 +1,29 @@
 {{ define "welcome" }}
 {{ template "header" . }}
 
-{{ if ne SiteName "" }}
-<p>Welcome to {{ SiteName }}!</p>
-{{ else }}
-<p>Welcome!</p>
-{{ end }}
+<h1 style="text-align: center; margin-top: 0; color: #1f2937;">
+    {{ if ne SiteName "" }}
+    Welcome to {{ SiteName }}
+    {{ else }}
+    Welcome
+    {{ end }}
+</h1>
 
-<p>A new account has been created for you.</p>
+<p>A new account has been created for you with <strong>{{ .Email }}</strong></p>
 
-<p>Your login email is <strong>{{ .Email }}</strong></p>
+<p>To set your password, click the button below:</p>
 
-<p>To set your password, click the link below:</p>
+<p style="color: #ef4444; font-size: 14px; margin-bottom: 16px;">This link will expire in 24 hours.</p>
 
-<p>{{ RootURL }}/set-password?token={{ .ResetToken }}</p>
+<div style="text-align: center; margin: 24px 0;">
+    <a href="{{ RootURL }}/set-password?token={{ .ResetToken }}" class="button">
+        Set Your Password
+    </a>
+</div>
 
-<p>This link will expire in 24 hours.</p>
-
-<p>Once you've set your password, you can log in <a href="{{ RootURL }}">here.</a></p>
+<div style="text-align: center; margin-top: 24px;">
+    <p>After setting your password, <a href="{{ RootURL }}">log in here</a></p>
+</div>
 
 {{ template "footer" . }}
 {{ end }}