This is a test email from your Chat Switchboard instance.
+If you received this, your SMTP configuration is working correctly.
+` + textBody := instanceName + " — Test Email\n\nThis is a test email. Your SMTP configuration is working correctly." + + if err := transport.Send(c.Request.Context(), user.Email, subject, htmlBody, textBody); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "send failed: " + err.Error()}) + return + } + + c.JSON(http.StatusOK, gin.H{"ok": true, "sent_to": user.Email}) +} diff --git a/server/handlers/channel_models.go b/server/handlers/channel_models.go new file mode 100644 index 0000000..e9ccb67 --- /dev/null +++ b/server/handlers/channel_models.go @@ -0,0 +1,237 @@ +package handlers + +import ( + "database/sql" + "net/http" + + "github.com/gin-gonic/gin" + + "git.gobha.me/xcaliber/chat-switchboard/models" + "git.gobha.me/xcaliber/chat-switchboard/store" +) + +// ── Channel Models Handler ────────────────── +// Manages multi-model assignments per channel (v0.20.0 Phase 2). +// Routes: +// GET /channels/:id/models — list +// POST /channels/:id/models — add +// PATCH /channels/:id/models/:modelId — update (display_name, is_default, system_prompt) +// DELETE /channels/:id/models/:modelId — remove + +const maxModelsPerChannel = 5 + +type ChannelModelHandler struct { + stores store.Stores +} + +func NewChannelModelHandler(stores store.Stores) *ChannelModelHandler { + return &ChannelModelHandler{stores: stores} +} + +// ── List ───────────────────────────────────── + +func (h *ChannelModelHandler) List(c *gin.Context) { + channelID := c.Param("id") + userID := getUserID(c) + + if !userOwnsChannel(c, channelID, userID) { + return + } + + roster, err := h.stores.Channels.GetModels(c.Request.Context(), channelID) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to list models"}) + return + } + if roster == nil { + roster = []models.ChannelModel{} + } + c.JSON(http.StatusOK, roster) +} + +// ── Add ────────────────────────────────────── + +type addChannelModelRequest struct { + ModelID string `json:"model_id" binding:"required"` + ProviderConfigID string `json:"provider_config_id"` + DisplayName string `json:"display_name" binding:"required"` + SystemPrompt string `json:"system_prompt"` + IsDefault bool `json:"is_default"` +} + +func (h *ChannelModelHandler) Add(c *gin.Context) { + channelID := c.Param("id") + userID := getUserID(c) + + if !userOwnsChannel(c, channelID, userID) { + return + } + + var req addChannelModelRequest + if err := c.ShouldBindJSON(&req); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + // Check max models limit + existing, err := h.stores.Channels.GetModels(c.Request.Context(), channelID) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to check existing models"}) + return + } + if len(existing) >= maxModelsPerChannel { + c.JSON(http.StatusConflict, gin.H{"error": "maximum models per channel reached"}) + return + } + + // If this is the first model or marked as default, ensure only one default + isDefault := req.IsDefault || len(existing) == 0 + + cm := &models.ChannelModel{ + ChannelID: channelID, + ModelID: req.ModelID, + ProviderConfigID: req.ProviderConfigID, + DisplayName: req.DisplayName, + SystemPrompt: req.SystemPrompt, + IsDefault: isDefault, + } + + // SetModel handles INSERT ON CONFLICT (upsert by channel_id + model_id) + if err := h.stores.Channels.SetModel(c.Request.Context(), cm); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to add model"}) + return + } + + // If this is the new default, clear default on others + if isDefault { + h.clearOtherDefaults(c, channelID, req.ModelID) + } + + // Return the updated roster + roster, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + c.JSON(http.StatusCreated, gin.H{"models": roster}) +} + +// ── Update ─────────────────────────────────── + +type updateChannelModelRequest struct { + DisplayName *string `json:"display_name"` + SystemPrompt *string `json:"system_prompt"` + IsDefault *bool `json:"is_default"` +} + +func (h *ChannelModelHandler) Update(c *gin.Context) { + channelID := c.Param("id") + modelRecordID := c.Param("modelId") + userID := getUserID(c) + + if !userOwnsChannel(c, channelID, userID) { + return + } + + var req updateChannelModelRequest + if err := c.ShouldBindJSON(&req); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + // Verify model belongs to this channel + cm, err := h.stores.Channels.GetModelByID(c.Request.Context(), modelRecordID) + if err == sql.ErrNoRows { + c.JSON(http.StatusNotFound, gin.H{"error": "model not found"}) + return + } + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to look up model"}) + return + } + if cm.ChannelID != channelID { + c.JSON(http.StatusForbidden, gin.H{"error": "model does not belong to this channel"}) + return + } + + fields := make(map[string]interface{}) + if req.DisplayName != nil { + fields["display_name"] = *req.DisplayName + } + if req.SystemPrompt != nil { + fields["system_prompt"] = *req.SystemPrompt + } + if req.IsDefault != nil { + fields["is_default"] = *req.IsDefault + if *req.IsDefault { + h.clearOtherDefaults(c, channelID, cm.ModelID) + } + } + + if len(fields) == 0 { + c.JSON(http.StatusBadRequest, gin.H{"error": "no fields to update"}) + return + } + + if err := h.stores.Channels.UpdateModel(c.Request.Context(), modelRecordID, fields); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update model"}) + return + } + + roster, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + c.JSON(http.StatusOK, gin.H{"models": roster}) +} + +// ── Delete ─────────────────────────────────── + +func (h *ChannelModelHandler) Delete(c *gin.Context) { + channelID := c.Param("id") + modelRecordID := c.Param("modelId") + userID := getUserID(c) + + if !userOwnsChannel(c, channelID, userID) { + return + } + + // Verify model belongs to this channel + cm, err := h.stores.Channels.GetModelByID(c.Request.Context(), modelRecordID) + if err == sql.ErrNoRows { + c.JSON(http.StatusNotFound, gin.H{"error": "model not found"}) + return + } + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to look up model"}) + return + } + if cm.ChannelID != channelID { + c.JSON(http.StatusForbidden, gin.H{"error": "model does not belong to this channel"}) + return + } + + if err := h.stores.Channels.DeleteModel(c.Request.Context(), modelRecordID); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to delete model"}) + return + } + + // If deleted model was default, promote the first remaining model + if cm.IsDefault { + remaining, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + if len(remaining) > 0 { + h.stores.Channels.UpdateModel(c.Request.Context(), remaining[0].ID, + map[string]interface{}{"is_default": true}) + } + } + + roster, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + c.JSON(http.StatusOK, gin.H{"models": roster}) +} + +// ── Helpers ────────────────────────────────── + +// clearOtherDefaults sets is_default=false on all models in the channel +// except the one with the given modelID. +func (h *ChannelModelHandler) clearOtherDefaults(c *gin.Context, channelID, keepModelID string) { + roster, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + for _, m := range roster { + if m.ModelID != keepModelID && m.IsDefault { + h.stores.Channels.UpdateModel(c.Request.Context(), m.ID, + map[string]interface{}{"is_default": false}) + } + } +} diff --git a/server/handlers/completion.go b/server/handlers/completion.go index 80c67fd..cdd2a65 100644 --- a/server/handlers/completion.go +++ b/server/handlers/completion.go @@ -18,6 +18,7 @@ import ( "git.gobha.me/xcaliber/chat-switchboard/database" "git.gobha.me/xcaliber/chat-switchboard/events" "git.gobha.me/xcaliber/chat-switchboard/knowledge" + "git.gobha.me/xcaliber/chat-switchboard/mentions" "git.gobha.me/xcaliber/chat-switchboard/models" "git.gobha.me/xcaliber/chat-switchboard/providers" "git.gobha.me/xcaliber/chat-switchboard/storage" @@ -218,6 +219,19 @@ func (h *CompletionHandler) Complete(c *gin.Context) { } } + // ── Multi-model @mention routing (v0.20.0) ────────── + // Check if the message @mentions specific channel models. + // If multiple models are targeted, fan out sequentially. + roster, _ := h.stores.Channels.GetModels(c.Request.Context(), channelID) + if len(roster) > 1 { + parsed := mentions.Parse(req.Content, roster) + targets := mentions.ResolvedModels(parsed) + if len(targets) > 1 { + h.multiModelStream(c, targets, messages, channelID, userID, personaID, presetSystemPrompt, req) + return + } + } + // Build provider request provReq := providers.CompletionRequest{ Model: model, @@ -257,6 +271,122 @@ func (h *CompletionHandler) Complete(c *gin.Context) { } } +// ── Multi-Model Sequential Stream (v0.20.0) ── + +// multiModelStream handles the case where a message @mentions multiple +// channel models. It streams each model's response sequentially within +// a single SSE response, sending model_start/model_end delimiters. +func (h *CompletionHandler) multiModelStream( + c *gin.Context, + targets []models.ChannelModel, + messages []providers.Message, + channelID, userID, personaID, presetSystemPrompt string, + req completionRequest, +) { + // Set SSE headers once for the entire multi-model stream + c.Header("Content-Type", "text/event-stream") + c.Header("Cache-Control", "no-cache") + c.Header("Connection", "keep-alive") + c.Header("X-Accel-Buffering", "no") + c.Status(http.StatusOK) + flusher, _ := c.Writer.(http.Flusher) + flush := func() { + if flusher != nil { + flusher.Flush() + } + } + sendSSE := func(data string) { + fmt.Fprintf(c.Writer, "data: %s\n\n", data) + flush() + } + sendEvent := func(event, data string) { + fmt.Fprintf(c.Writer, "event: %s\ndata: %s\n\n", event, data) + flush() + } + + for _, target := range targets { + // Notify client which model is about to respond + startJSON, _ := json.Marshal(map[string]string{ + "model_id": target.ModelID, + "display_name": target.DisplayName, + }) + sendEvent("model_start", string(startJSON)) + + // Resolve config for this specific model + targetReq := req + targetReq.Model = target.ModelID + if target.ProviderConfigID != "" { + targetReq.APIConfigID = target.ProviderConfigID + } + + providerCfg, providerID, model, configID, providerScope, err := h.resolveConfig(userID, channelID, targetReq) + if err != nil { + sendSSE(fmt.Sprintf(`{"error":"failed to resolve config for %s: %s"}`, target.DisplayName, escapeJSON(err.Error()))) + sendEvent("model_end", string(startJSON)) + continue + } + + provider, err := providers.Get(providerID) + if err != nil { + sendSSE(fmt.Sprintf(`{"error":"provider unavailable for %s"}`, target.DisplayName)) + sendEvent("model_end", string(startJSON)) + continue + } + + // Build per-model messages (inject model-specific system prompt if set) + modelMessages := make([]providers.Message, len(messages)) + copy(modelMessages, messages) + if target.SystemPrompt != "" { + // Prepend model-specific system prompt + modelMessages = append([]providers.Message{{ + Role: "system", + Content: target.SystemPrompt, + }}, modelMessages...) + } + + caps := h.getModelCapabilities(c, model, configID) + + provReq := providers.CompletionRequest{ + Model: model, + Messages: modelMessages, + } + if targetReq.MaxTokens > 0 { + provReq.MaxTokens = targetReq.MaxTokens + } else { + provReq.MaxTokens = capspkg.ResolveMaxOutput(model, caps) + } + if targetReq.Temperature != nil { + provReq.Temperature = targetReq.Temperature + } + if targetReq.TopP != nil { + provReq.TopP = targetReq.TopP + } + hasBrowserTools := h.hub != nil && h.hub.IsConnected(userID) + if caps.ToolCalling && (tools.HasTools() || hasBrowserTools) { + provReq.Tools = h.buildToolDefs(c.Request.Context(), userID, hasBrowserTools, req.DisabledTools) + } + + // Stream this model's response using the shared streaming core + result := streamModelResponse(c, provider, providerCfg, &provReq, model, target.DisplayName, userID, channelID, personaID, h.hub) + + // Persist assistant message with model attribution + if result.Content != "" { + if _, err := h.persistMessage(channelID, userID, "assistant", result.Content, model, result.InputTokens, result.OutputTokens, nil, toolActivityJSON(result.ToolActivity)); err != nil { + log.Printf("Failed to persist multi-model assistant message: %v", err) + } + } + + // Log usage + h.logUsage(c, channelID, userID, configID, providerScope, model, + result.InputTokens, result.OutputTokens, + result.CacheCreationTokens, result.CacheReadTokens) + + sendEvent("model_end", string(startJSON)) + } + + sendSSE("[DONE]") +} + // buildToolDefs converts registered tools to provider-format tool definitions. // If includeBrowser is true, also fetches tool schemas from enabled browser extensions. // Tools whose names appear in disabledTools are excluded. diff --git a/server/handlers/groups.go b/server/handlers/groups.go index e9cc047..44e9207 100644 --- a/server/handlers/groups.go +++ b/server/handlers/groups.go @@ -8,6 +8,7 @@ import ( "git.gobha.me/xcaliber/chat-switchboard/database" "git.gobha.me/xcaliber/chat-switchboard/models" + "git.gobha.me/xcaliber/chat-switchboard/notifications" "git.gobha.me/xcaliber/chat-switchboard/store" ) @@ -202,16 +203,26 @@ func (h *GroupHandler) AddMember(c *gin.Context) { } // Verify group exists - if _, err := h.stores.Groups.GetByID(c.Request.Context(), groupID); err == sql.ErrNoRows { + group, err := h.stores.Groups.GetByID(c.Request.Context(), groupID) + if err == sql.ErrNoRows { c.JSON(http.StatusNotFound, gin.H{"error": "group not found"}) return } + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to look up group"}) + return + } if err := h.stores.Groups.AddMember(c.Request.Context(), groupID, req.UserID, actorID); err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to add member"}) return } + // Notify the added user (v0.20.0) + if svc := notifications.Default(); svc != nil { + notifications.NotifyGroupMemberAdded(svc, req.UserID, groupID, group.Name) + } + c.JSON(http.StatusOK, gin.H{"ok": true}) AuditLog(c, "group.member.add", "group", groupID, map[string]interface{}{ "user_id": req.UserID, @@ -224,6 +235,9 @@ func (h *GroupHandler) RemoveMember(c *gin.Context) { groupID := c.Param("id") userID := c.Param("userId") + // Fetch group name for notification before removal + group, _ := h.stores.Groups.GetByID(c.Request.Context(), groupID) + err := h.stores.Groups.RemoveMember(c.Request.Context(), groupID, userID) if err == sql.ErrNoRows { c.JSON(http.StatusNotFound, gin.H{"error": "member not found"}) @@ -234,6 +248,11 @@ func (h *GroupHandler) RemoveMember(c *gin.Context) { return } + // Notify the removed user (v0.20.0) + if svc := notifications.Default(); svc != nil && group != nil { + notifications.NotifyGroupMemberRemoved(svc, userID, groupID, group.Name) + } + c.JSON(http.StatusOK, gin.H{"ok": true}) AuditLog(c, "group.member.remove", "group", groupID, map[string]interface{}{ "user_id": userID, diff --git a/server/handlers/notifications.go b/server/handlers/notifications.go new file mode 100644 index 0000000..3597012 --- /dev/null +++ b/server/handlers/notifications.go @@ -0,0 +1,281 @@ +package handlers + +import ( + "database/sql" + "encoding/json" + "net/http" + "strconv" + "time" + + "github.com/gin-gonic/gin" + + "git.gobha.me/xcaliber/chat-switchboard/events" + "git.gobha.me/xcaliber/chat-switchboard/models" + "git.gobha.me/xcaliber/chat-switchboard/store" +) + +// ── Handler ───────────────────────────────── + +// NotificationHandler handles notification CRUD endpoints. +type NotificationHandler struct { + stores store.Stores + hub *events.Hub +} + +// NewNotificationHandler creates a new notification handler. +func NewNotificationHandler(s store.Stores, hub *events.Hub) *NotificationHandler { + return &NotificationHandler{stores: s, hub: hub} +} + +// ── GET /api/v1/notifications ─────────────── +// Returns paginated notifications for the authenticated user. +// Query params: ?limit=20&offset=0&unread_only=false + +func (h *NotificationHandler) List(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20")) + offset, _ := strconv.Atoi(c.DefaultQuery("offset", "0")) + unreadOnly := c.Query("unread_only") == "true" + + if limit <= 0 || limit > 100 { + limit = 20 + } + if offset < 0 { + offset = 0 + } + + items, total, err := h.stores.Notifications.ListByUser( + c.Request.Context(), userID, limit, offset, unreadOnly) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "query failed"}) + return + } + + c.JSON(http.StatusOK, gin.H{ + "data": items, + "total": total, + "limit": limit, + "offset": offset, + }) +} + +// ── GET /api/v1/notifications/unread-count ── + +func (h *NotificationHandler) UnreadCount(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + count, err := h.stores.Notifications.UnreadCount(c.Request.Context(), userID) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "query failed"}) + return + } + + c.JSON(http.StatusOK, gin.H{"count": count}) +} + +// ── PATCH /api/v1/notifications/:id/read ──── + +func (h *NotificationHandler) MarkRead(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + id := c.Param("id") + if id == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "notification id required"}) + return + } + + if err := h.stores.Notifications.MarkRead(c.Request.Context(), id, userID); err != nil { + if err == sql.ErrNoRows { + c.JSON(http.StatusNotFound, gin.H{"error": "notification not found"}) + return + } + c.JSON(http.StatusInternalServerError, gin.H{"error": "update failed"}) + return + } + + // Sync badge across tabs + if h.hub != nil { + payload, _ := json.Marshal(map[string]string{"id": id}) + h.hub.SendToUser(userID, events.Event{ + Label: "notification.read", + Payload: payload, + Ts: time.Now().UnixMilli(), + }) + } + + c.JSON(http.StatusOK, gin.H{"ok": true}) +} + +// ── POST /api/v1/notifications/mark-all-read ─ + +func (h *NotificationHandler) MarkAllRead(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + if err := h.stores.Notifications.MarkAllRead(c.Request.Context(), userID); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "update failed"}) + return + } + + // Sync badge across tabs + if h.hub != nil { + payload, _ := json.Marshal(map[string]string{"action": "mark_all_read"}) + h.hub.SendToUser(userID, events.Event{ + Label: "notification.read", + Payload: payload, + Ts: time.Now().UnixMilli(), + }) + } + + c.JSON(http.StatusOK, gin.H{"ok": true}) +} + +// ── DELETE /api/v1/notifications/:id ──────── + +func (h *NotificationHandler) Delete(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + id := c.Param("id") + if id == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "notification id required"}) + return + } + + if err := h.stores.Notifications.Delete(c.Request.Context(), id, userID); err != nil { + if err == sql.ErrNoRows { + c.JSON(http.StatusNotFound, gin.H{"error": "notification not found"}) + return + } + c.JSON(http.StatusInternalServerError, gin.H{"error": "delete failed"}) + return + } + + c.JSON(http.StatusOK, gin.H{"ok": true}) +} + +// ── Notification Preferences (v0.20.0 Phase 3) ── + +// GET /api/v1/notifications/preferences +func (h *NotificationHandler) ListPreferences(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + if h.stores.NotifPrefs == nil { + c.JSON(http.StatusOK, []models.NotificationPreference{}) + return + } + + prefs, err := h.stores.NotifPrefs.ListForUser(c.Request.Context(), userID) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "query failed"}) + return + } + if prefs == nil { + prefs = []models.NotificationPreference{} + } + c.JSON(http.StatusOK, prefs) +} + +// PUT /api/v1/notifications/preferences/:type +func (h *NotificationHandler) SetPreference(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + notifType := c.Param("type") + if notifType == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "type is required"}) + return + } + + var req struct { + InApp *bool `json:"in_app"` + Email *bool `json:"email"` + } + if err := c.ShouldBindJSON(&req); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + return + } + + if h.stores.NotifPrefs == nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": "preferences not available"}) + return + } + + // Load existing or create new + existing, _ := h.stores.NotifPrefs.Get(c.Request.Context(), userID, notifType) + pref := &models.NotificationPreference{ + UserID: userID, + Type: notifType, + InApp: true, // default + Email: false, // default + } + if existing != nil { + pref = existing + } + if req.InApp != nil { + pref.InApp = *req.InApp + } + if req.Email != nil { + pref.Email = *req.Email + } + + if err := h.stores.NotifPrefs.Upsert(c.Request.Context(), pref); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "save failed"}) + return + } + + c.JSON(http.StatusOK, pref) +} + +// DELETE /api/v1/notifications/preferences/:type +func (h *NotificationHandler) DeletePreference(c *gin.Context) { + userID := getUserID(c) + if userID == "" { + c.JSON(http.StatusUnauthorized, gin.H{"error": "authentication required"}) + return + } + + notifType := c.Param("type") + if notifType == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "type is required"}) + return + } + + if h.stores.NotifPrefs == nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": "preferences not available"}) + return + } + + if err := h.stores.NotifPrefs.Delete(c.Request.Context(), userID, notifType); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"error": "delete failed"}) + return + } + + c.JSON(http.StatusOK, gin.H{"ok": true}) +} diff --git a/server/handlers/stream_loop.go b/server/handlers/stream_loop.go index 31377c4..32bd875 100644 --- a/server/handlers/stream_loop.go +++ b/server/handlers/stream_loop.go @@ -240,6 +240,181 @@ func streamWithToolLoop( const browserToolTimeout = 30 * time.Second +// streamModelResponse is a variant of streamWithToolLoop used by multi-model +// fan-out (v0.20.0). It streams a single model's response within an already- +// established SSE connection — it does NOT set SSE headers or send [DONE]. +// +// SSE deltas include a "model_display" field so the frontend can attribute +// each response to the correct model. +func streamModelResponse( + c *gin.Context, + provider providers.Provider, + cfg providers.ProviderConfig, + req *providers.CompletionRequest, + model, displayName, userID, channelID, personaID string, + hub *events.Hub, +) streamResult { + flusher, _ := c.Writer.(http.Flusher) + flush := func() { + if flusher != nil { + flusher.Flush() + } + } + sendSSE := func(data string) { + fmt.Fprintf(c.Writer, "data: %s\n\n", data) + flush() + } + sendEvent := func(event, data string) { + fmt.Fprintf(c.Writer, "event: %s\ndata: %s\n\n", event, data) + flush() + } + + var result streamResult + + for iteration := 0; iteration < maxToolIterations; iteration++ { + ch, err := provider.StreamCompletion(c.Request.Context(), cfg, *req) + if err != nil { + sendSSE(fmt.Sprintf(`{"error":"%s"}`, escapeJSON(err.Error()))) + return result + } + + var iterContent string + var iterReasoning string + var toolCalls []providers.ToolCall + + for event := range ch { + if event.Error != nil { + sendSSE(fmt.Sprintf(`{"error":"%s"}`, escapeJSON(event.Error.Error()))) + return result + } + + if event.Reasoning != "" { + iterReasoning += event.Reasoning + sendSSE(fmt.Sprintf( + `{"choices":[{"delta":{"reasoning_content":%q},"finish_reason":null}],"model":%q,"model_display":%q}`, + event.Reasoning, model, displayName)) + } + + if event.Delta != "" { + iterContent += event.Delta + sendSSE(fmt.Sprintf( + `{"choices":[{"delta":{"content":%q},"finish_reason":null}],"model":%q,"model_display":%q}`, + event.Delta, model, displayName)) + } + + if event.Done { + if event.FinishReason == "tool_calls" && len(event.ToolCalls) > 0 { + toolCalls = event.ToolCalls + result.InputTokens += event.InputTokens + result.OutputTokens += event.OutputTokens + result.CacheCreationTokens += event.CacheCreationTokens + result.CacheReadTokens += event.CacheReadTokens + } else { + finishReason := event.FinishReason + if finishReason == "" { + finishReason = "stop" + } + if iterReasoning != "" { + result.Content += "{{.Body}}
{{end}} ++ This notification was sent by {{.InstanceName}}. You can adjust your notification preferences in Settings. +
+ +`)) + +// ── Plaintext Template ────────────────────── + +var textTmpl = template.Must(template.New("email_text").Parse(`{{.InstanceName}} — Notification + +{{.Title}} +{{if .Body}} +{{.Body}} +{{end}} +--- +Adjust your notification preferences in Settings. +`)) + +// ── Render Functions ──────────────────────── + +// RenderHTML renders an HTML email body for a notification. +func RenderHTML(n *models.Notification, instanceName string) string { + if instanceName == "" { + instanceName = "Chat Switchboard" + } + data := emailData{ + Title: n.Title, + Body: n.Body, + Type: n.Type, + ResourceType: n.ResourceType, + InstanceName: instanceName, + } + var buf bytes.Buffer + if err := htmlTmpl.Execute(&buf, data); err != nil { + return "" + template.HTMLEscapeString(n.Title) + "
" + } + return buf.String() +} + +// RenderText renders a plaintext email body for a notification. +func RenderText(n *models.Notification, instanceName string) string { + if instanceName == "" { + instanceName = "Chat Switchboard" + } + data := emailData{ + Title: n.Title, + Body: n.Body, + Type: n.Type, + ResourceType: n.ResourceType, + InstanceName: instanceName, + } + var buf bytes.Buffer + if err := textTmpl.Execute(&buf, data); err != nil { + return n.Title + } + return buf.String() +} + +// SubjectForNotification returns an email subject line. +func SubjectForNotification(n *models.Notification, instanceName string) string { + if instanceName == "" { + instanceName = "Chat Switchboard" + } + prefix := "[" + instanceName + "] " + switch { + case strings.HasPrefix(n.Type, "kb."): + return prefix + "Knowledge Base: " + n.Title + case strings.HasPrefix(n.Type, "role."): + return prefix + "Model Alert: " + n.Title + case strings.HasPrefix(n.Type, "grant."): + return prefix + "Access Change: " + n.Title + default: + return prefix + n.Title + } +} diff --git a/server/notifications/templates_test.go b/server/notifications/templates_test.go new file mode 100644 index 0000000..f75849e --- /dev/null +++ b/server/notifications/templates_test.go @@ -0,0 +1,69 @@ +package notifications + +import ( + "strings" + "testing" + + "git.gobha.me/xcaliber/chat-switchboard/models" +) + +func TestRenderHTML_Basic(t *testing.T) { + n := &models.Notification{ + Title: "KB Ready", + Body: "Your knowledge base has been processed.", + Type: "kb.ready", + } + html := RenderHTML(n, "TestInstance") + if !strings.Contains(html, "KB Ready") { + t.Error("expected title in HTML output") + } + if !strings.Contains(html, "TestInstance") { + t.Error("expected instance name in HTML output") + } + if !strings.Contains(html, "knowledge base") { + t.Error("expected body in HTML output") + } +} + +func TestRenderHTML_DefaultInstanceName(t *testing.T) { + n := &models.Notification{Title: "Test"} + html := RenderHTML(n, "") + if !strings.Contains(html, "Chat Switchboard") { + t.Error("expected default instance name") + } +} + +func TestRenderText_Basic(t *testing.T) { + n := &models.Notification{ + Title: "Model Fallback", + Body: "GPT-4 fell back to GPT-3.5.", + Type: "role.fallback", + } + text := RenderText(n, "MyInstance") + if !strings.Contains(text, "Model Fallback") { + t.Error("expected title in text output") + } + if !strings.Contains(text, "GPT-4 fell back") { + t.Error("expected body in text output") + } +} + +func TestSubjectForNotification(t *testing.T) { + tests := []struct { + notifType string + title string + want string + }{ + {"kb.ready", "KB Processed", "[Test] Knowledge Base: KB Processed"}, + {"role.fallback", "Fallback", "[Test] Model Alert: Fallback"}, + {"grant.changed", "Added to team", "[Test] Access Change: Added to team"}, + {"custom.type", "Hello", "[Test] Hello"}, + } + for _, tt := range tests { + n := &models.Notification{Type: tt.notifType, Title: tt.title} + got := SubjectForNotification(n, "Test") + if got != tt.want { + t.Errorf("SubjectForNotification(%q, %q) = %q, want %q", tt.notifType, tt.title, got, tt.want) + } + } +} diff --git a/server/store/interfaces.go b/server/store/interfaces.go index e8ea2b3..8ebec77 100644 --- a/server/store/interfaces.go +++ b/server/store/interfaces.go @@ -40,6 +40,8 @@ type Stores struct { ResourceGrants ResourceGrantStore Memories MemoryStore Projects ProjectStore + Notifications NotificationStore + NotifPrefs NotificationPreferenceStore } // ========================================= @@ -216,6 +218,9 @@ type ChannelStore interface { // Channel models SetModel(ctx context.Context, cm *models.ChannelModel) error GetModels(ctx context.Context, channelID string) ([]models.ChannelModel, error) + GetModelByID(ctx context.Context, id string) (*models.ChannelModel, error) + UpdateModel(ctx context.Context, id string, fields map[string]interface{}) error + DeleteModel(ctx context.Context, id string) error // Ownership check UserOwns(ctx context.Context, channelID, userID string) (bool, error) @@ -476,6 +481,35 @@ type ResourceGrantStore interface { UserHasGroupAccess(ctx context.Context, userID, resourceType, resourceID string) (bool, error) } +// ========================================= +// NOTIFICATION STORE (v0.20.0) +// ========================================= + +type NotificationStore interface { + Create(ctx context.Context, n *models.Notification) error + ListByUser(ctx context.Context, userID string, limit, offset int, unreadOnly bool) ([]models.Notification, int, error) + MarkRead(ctx context.Context, id, userID string) error + MarkAllRead(ctx context.Context, userID string) error + Delete(ctx context.Context, id, userID string) error + UnreadCount(ctx context.Context, userID string) (int, error) + DeleteOlderThan(ctx context.Context, before time.Time) (int64, error) +} + +// ========================================= +// NOTIFICATION PREFERENCES STORE (v0.20.0) +// ========================================= + +type NotificationPreferenceStore interface { + // Get returns the preference for a specific user + type. Returns nil if not set. + Get(ctx context.Context, userID, notifType string) (*models.NotificationPreference, error) + // ListForUser returns all preferences set by a user. + ListForUser(ctx context.Context, userID string) ([]models.NotificationPreference, error) + // Upsert creates or updates a preference row. + Upsert(ctx context.Context, pref *models.NotificationPreference) error + // Delete removes a preference (falls back to default). + Delete(ctx context.Context, userID, notifType string) error +} + // ========================================= // SHARED TYPES // ========================================= diff --git a/server/store/postgres/channel.go b/server/store/postgres/channel.go index 79b5b4c..597957f 100644 --- a/server/store/postgres/channel.go +++ b/server/store/postgres/channel.go @@ -4,6 +4,8 @@ import ( "context" "database/sql" "encoding/json" + "fmt" + "strings" "git.gobha.me/xcaliber/chat-switchboard/models" "git.gobha.me/xcaliber/chat-switchboard/store" @@ -212,6 +214,51 @@ func (s *ChannelStore) GetModels(ctx context.Context, channelID string) ([]model return result, rows.Err() } +func (s *ChannelStore) GetModelByID(ctx context.Context, id string) (*models.ChannelModel, error) { + var cm models.ChannelModel + err := DB.QueryRowContext(ctx, ` + SELECT id, channel_id, model_id, COALESCE(provider_config_id::text, ''), + COALESCE(display_name, ''), COALESCE(system_prompt, ''), is_default + FROM channel_models WHERE id = $1`, id).Scan( + &cm.ID, &cm.ChannelID, &cm.ModelID, &cm.ProviderConfigID, + &cm.DisplayName, &cm.SystemPrompt, &cm.IsDefault) + if err != nil { + return nil, err + } + return &cm, nil +} + +func (s *ChannelStore) UpdateModel(ctx context.Context, id string, fields map[string]interface{}) error { + if len(fields) == 0 { + return nil + } + // Build SET clause dynamically + sets := make([]string, 0, len(fields)) + args := make([]interface{}, 0, len(fields)+1) + i := 1 + for col, val := range fields { + sets = append(sets, col+" = $"+fmt.Sprintf("%d", i)) + args = append(args, val) + i++ + } + args = append(args, id) + query := "UPDATE channel_models SET " + strings.Join(sets, ", ") + " WHERE id = $" + fmt.Sprintf("%d", i) + _, err := DB.ExecContext(ctx, query, args...) + return err +} + +func (s *ChannelStore) DeleteModel(ctx context.Context, id string) error { + res, err := DB.ExecContext(ctx, `DELETE FROM channel_models WHERE id = $1`, id) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + func (s *ChannelStore) UserOwns(ctx context.Context, channelID, userID string) (bool, error) { var exists bool err := DB.QueryRowContext(ctx, diff --git a/server/store/postgres/notification.go b/server/store/postgres/notification.go new file mode 100644 index 0000000..6daa55b --- /dev/null +++ b/server/store/postgres/notification.go @@ -0,0 +1,133 @@ +package postgres + +import ( + "context" + "database/sql" + "time" + + "git.gobha.me/xcaliber/chat-switchboard/models" +) + +type NotificationStore struct{} + +func NewNotificationStore() *NotificationStore { return &NotificationStore{} } + +func (s *NotificationStore) Create(ctx context.Context, n *models.Notification) error { + return DB.QueryRowContext(ctx, ` + INSERT INTO notifications (user_id, type, title, body, resource_type, resource_id, is_read) + VALUES ($1, $2, $3, $4, $5, $6, $7) + RETURNING id, created_at`, + n.UserID, n.Type, n.Title, n.Body, + nullStr(n.ResourceType), nullStr(n.ResourceID), n.IsRead, + ).Scan(&n.ID, &n.CreatedAt) +} + +func (s *NotificationStore) ListByUser(ctx context.Context, userID string, limit, offset int, unreadOnly bool) ([]models.Notification, int, error) { + if limit <= 0 { + limit = 20 + } + + // Count + countQ := `SELECT COUNT(*) FROM notifications WHERE user_id = $1` + args := []interface{}{userID} + if unreadOnly { + countQ += ` AND is_read = false` + } + + var total int + if err := DB.QueryRowContext(ctx, countQ, args...).Scan(&total); err != nil { + return nil, 0, err + } + + // Fetch + q := `SELECT id, user_id, type, title, body, resource_type, resource_id, is_read, created_at + FROM notifications WHERE user_id = $1` + if unreadOnly { + q += ` AND is_read = false` + } + q += ` ORDER BY created_at DESC LIMIT $2 OFFSET $3` + + rows, err := DB.QueryContext(ctx, q, userID, limit, offset) + if err != nil { + return nil, 0, err + } + defer rows.Close() + + var items []models.Notification + for rows.Next() { + var n models.Notification + var resType, resID sql.NullString + if err := rows.Scan( + &n.ID, &n.UserID, &n.Type, &n.Title, &n.Body, + &resType, &resID, &n.IsRead, &n.CreatedAt, + ); err != nil { + return nil, 0, err + } + n.ResourceType = NullableString(resType) + n.ResourceID = NullableString(resID) + items = append(items, n) + } + if items == nil { + items = []models.Notification{} + } + return items, total, rows.Err() +} + +func (s *NotificationStore) MarkRead(ctx context.Context, id, userID string) error { + res, err := DB.ExecContext(ctx, + `UPDATE notifications SET is_read = true WHERE id = $1 AND user_id = $2`, + id, userID) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + +func (s *NotificationStore) MarkAllRead(ctx context.Context, userID string) error { + _, err := DB.ExecContext(ctx, + `UPDATE notifications SET is_read = true WHERE user_id = $1 AND is_read = false`, + userID) + return err +} + +func (s *NotificationStore) Delete(ctx context.Context, id, userID string) error { + res, err := DB.ExecContext(ctx, + `DELETE FROM notifications WHERE id = $1 AND user_id = $2`, id, userID) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + +func (s *NotificationStore) UnreadCount(ctx context.Context, userID string) (int, error) { + var count int + err := DB.QueryRowContext(ctx, + `SELECT COUNT(*) FROM notifications WHERE user_id = $1 AND is_read = false`, + userID).Scan(&count) + return count, err +} + +func (s *NotificationStore) DeleteOlderThan(ctx context.Context, before time.Time) (int64, error) { + res, err := DB.ExecContext(ctx, + `DELETE FROM notifications WHERE created_at < $1`, before) + if err != nil { + return 0, err + } + return res.RowsAffected() +} + +// nullStr returns sql.NullString for optional string fields. +func nullStr(s string) sql.NullString { + if s == "" { + return sql.NullString{} + } + return sql.NullString{String: s, Valid: true} +} diff --git a/server/store/postgres/notification_prefs.go b/server/store/postgres/notification_prefs.go new file mode 100644 index 0000000..5fae120 --- /dev/null +++ b/server/store/postgres/notification_prefs.go @@ -0,0 +1,69 @@ +package postgres + +import ( + "context" + "database/sql" + + "git.gobha.me/xcaliber/chat-switchboard/models" +) + +type NotificationPreferenceStore struct{} + +func NewNotificationPreferenceStore() *NotificationPreferenceStore { + return &NotificationPreferenceStore{} +} + +func (s *NotificationPreferenceStore) Get(ctx context.Context, userID, notifType string) (*models.NotificationPreference, error) { + var p models.NotificationPreference + err := DB.QueryRowContext(ctx, ` + SELECT id, user_id, type, in_app, email + FROM notification_preferences + WHERE user_id = $1 AND type = $2`, userID, notifType).Scan( + &p.ID, &p.UserID, &p.Type, &p.InApp, &p.Email) + if err == sql.ErrNoRows { + return nil, nil + } + if err != nil { + return nil, err + } + return &p, nil +} + +func (s *NotificationPreferenceStore) ListForUser(ctx context.Context, userID string) ([]models.NotificationPreference, error) { + rows, err := DB.QueryContext(ctx, ` + SELECT id, user_id, type, in_app, email + FROM notification_preferences + WHERE user_id = $1 + ORDER BY type`, userID) + if err != nil { + return nil, err + } + defer rows.Close() + + var result []models.NotificationPreference + for rows.Next() { + var p models.NotificationPreference + if err := rows.Scan(&p.ID, &p.UserID, &p.Type, &p.InApp, &p.Email); err != nil { + return nil, err + } + result = append(result, p) + } + return result, rows.Err() +} + +func (s *NotificationPreferenceStore) Upsert(ctx context.Context, pref *models.NotificationPreference) error { + _, err := DB.ExecContext(ctx, ` + INSERT INTO notification_preferences (user_id, type, in_app, email) + VALUES ($1, $2, $3, $4) + ON CONFLICT (user_id, type) DO UPDATE SET + in_app = $3, email = $4`, + pref.UserID, pref.Type, pref.InApp, pref.Email) + return err +} + +func (s *NotificationPreferenceStore) Delete(ctx context.Context, userID, notifType string) error { + _, err := DB.ExecContext(ctx, ` + DELETE FROM notification_preferences + WHERE user_id = $1 AND type = $2`, userID, notifType) + return err +} diff --git a/server/store/postgres/stores.go b/server/store/postgres/stores.go index f528aea..2154044 100644 --- a/server/store/postgres/stores.go +++ b/server/store/postgres/stores.go @@ -11,27 +11,29 @@ import ( func NewStores(db *sql.DB) store.Stores { SetDB(db) return store.Stores{ - Providers: NewProviderStore(), - Catalog: NewCatalogStore(), - Personas: NewPersonaStore(), - Policies: NewPolicyStore(), - UserSettings: NewUserModelSettingsStore(), - Users: NewUserStore(), - Teams: NewTeamStore(), - Channels: NewChannelStore(), - Messages: NewMessageStore(), - Audit: NewAuditStore(), - Notes: NewNoteStore(), - NoteLinks: NewNoteLinkStore(), - GlobalConfig: NewGlobalConfigStore(), - Usage: NewUsageStore(), - Pricing: NewPricingStore(), - Extensions: NewExtensionStore(), - Attachments: NewAttachmentStore(), + Providers: NewProviderStore(), + Catalog: NewCatalogStore(), + Personas: NewPersonaStore(), + Policies: NewPolicyStore(), + UserSettings: NewUserModelSettingsStore(), + Users: NewUserStore(), + Teams: NewTeamStore(), + Channels: NewChannelStore(), + Messages: NewMessageStore(), + Audit: NewAuditStore(), + Notes: NewNoteStore(), + NoteLinks: NewNoteLinkStore(), + GlobalConfig: NewGlobalConfigStore(), + Usage: NewUsageStore(), + Pricing: NewPricingStore(), + Extensions: NewExtensionStore(), + Attachments: NewAttachmentStore(), KnowledgeBases: NewKnowledgeBaseStore(), Groups: NewGroupStore(), ResourceGrants: NewResourceGrantStore(), Memories: NewMemoryStore(), Projects: NewProjectStore(), + Notifications: NewNotificationStore(), + NotifPrefs: NewNotificationPreferenceStore(), } } diff --git a/server/store/postgres/user_settings.go b/server/store/postgres/user_settings.go index 20ee71e..1457350 100644 --- a/server/store/postgres/user_settings.go +++ b/server/store/postgres/user_settings.go @@ -14,8 +14,8 @@ func NewUserModelSettingsStore() *UserModelSettingsStore { return &UserModelSett func (s *UserModelSettingsStore) GetForUser(ctx context.Context, userID string) ([]models.UserModelSetting, error) { rows, err := DB.QueryContext(ctx, ` - SELECT id, user_id, model_id, hidden, preferred_temperature, preferred_max_tokens, - sort_order, created_at, updated_at + SELECT id, user_id, model_id, COALESCE(hidden, false), preferred_temperature, preferred_max_tokens, + COALESCE(sort_order, 0), created_at, updated_at FROM user_model_settings WHERE user_id = $1 ORDER BY sort_order, model_id`, userID) if err != nil { return nil, err @@ -91,7 +91,7 @@ func (s *UserModelSettingsStore) Set(ctx context.Context, userID, modelID string // Build a custom upsert since the update builder doesn't handle INSERT ON CONFLICT _, err := DB.ExecContext(ctx, ` INSERT INTO user_model_settings (user_id, model_id, hidden, preferred_temperature, preferred_max_tokens, sort_order) - VALUES ($1, $2, $3, $4, $5, $6) + VALUES ($1, $2, COALESCE($3, false), $4, $5, COALESCE($6, 0)) ON CONFLICT (user_id, model_id) DO UPDATE SET hidden = COALESCE($3, user_model_settings.hidden), diff --git a/server/store/sqlite/channel.go b/server/store/sqlite/channel.go index 6c671e2..0cdae04 100644 --- a/server/store/sqlite/channel.go +++ b/server/store/sqlite/channel.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "encoding/json" + "strings" "time" "git.gobha.me/xcaliber/chat-switchboard/models" @@ -218,6 +219,48 @@ func (s *ChannelStore) GetModels(ctx context.Context, channelID string) ([]model return result, rows.Err() } +func (s *ChannelStore) GetModelByID(ctx context.Context, id string) (*models.ChannelModel, error) { + var cm models.ChannelModel + err := DB.QueryRowContext(ctx, ` + SELECT id, channel_id, model_id, COALESCE(provider_config_id, ''), + COALESCE(display_name, ''), COALESCE(system_prompt, ''), is_default + FROM channel_models WHERE id = ?`, id).Scan( + &cm.ID, &cm.ChannelID, &cm.ModelID, &cm.ProviderConfigID, + &cm.DisplayName, &cm.SystemPrompt, &cm.IsDefault) + if err != nil { + return nil, err + } + return &cm, nil +} + +func (s *ChannelStore) UpdateModel(ctx context.Context, id string, fields map[string]interface{}) error { + if len(fields) == 0 { + return nil + } + sets := make([]string, 0, len(fields)) + args := make([]interface{}, 0, len(fields)+1) + for col, val := range fields { + sets = append(sets, col+" = ?") + args = append(args, val) + } + args = append(args, id) + query := "UPDATE channel_models SET " + strings.Join(sets, ", ") + " WHERE id = ?" + _, err := DB.ExecContext(ctx, query, args...) + return err +} + +func (s *ChannelStore) DeleteModel(ctx context.Context, id string) error { + res, err := DB.ExecContext(ctx, `DELETE FROM channel_models WHERE id = ?`, id) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + func (s *ChannelStore) UserOwns(ctx context.Context, channelID, userID string) (bool, error) { var exists bool err := DB.QueryRowContext(ctx, diff --git a/server/store/sqlite/notification.go b/server/store/sqlite/notification.go new file mode 100644 index 0000000..c5d56d6 --- /dev/null +++ b/server/store/sqlite/notification.go @@ -0,0 +1,146 @@ +package sqlite + +import ( + "context" + "database/sql" + "time" + + "git.gobha.me/xcaliber/chat-switchboard/models" + "git.gobha.me/xcaliber/chat-switchboard/store" +) + +type NotificationStore struct{} + +func NewNotificationStore() *NotificationStore { return &NotificationStore{} } + +func (s *NotificationStore) Create(ctx context.Context, n *models.Notification) error { + if n.ID == "" { + n.ID = store.NewID() + } + now := time.Now().UTC().Format(timeFmt) + + _, err := DB.ExecContext(ctx, ` + INSERT INTO notifications (id, user_id, type, title, body, resource_type, resource_id, is_read, created_at) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, + n.ID, n.UserID, n.Type, n.Title, n.Body, + nullStr(n.ResourceType), nullStr(n.ResourceID), boolToInt(n.IsRead), now, + ) + if err != nil { + return err + } + n.CreatedAt, _ = time.Parse(timeFmt, now) + return nil +} + +func (s *NotificationStore) ListByUser(ctx context.Context, userID string, limit, offset int, unreadOnly bool) ([]models.Notification, int, error) { + if limit <= 0 { + limit = 20 + } + + // Count + countQ := `SELECT COUNT(*) FROM notifications WHERE user_id = ?` + countArgs := []interface{}{userID} + if unreadOnly { + countQ += ` AND is_read = 0` + } + + var total int + if err := DB.QueryRowContext(ctx, countQ, countArgs...).Scan(&total); err != nil { + return nil, 0, err + } + + // Fetch + q := `SELECT id, user_id, type, title, body, resource_type, resource_id, is_read, created_at + FROM notifications WHERE user_id = ?` + if unreadOnly { + q += ` AND is_read = 0` + } + q += ` ORDER BY created_at DESC LIMIT ? OFFSET ?` + + rows, err := DB.QueryContext(ctx, q, userID, limit, offset) + if err != nil { + return nil, 0, err + } + defer rows.Close() + + var items []models.Notification + for rows.Next() { + var n models.Notification + var resType, resID sql.NullString + var isRead int + if err := rows.Scan( + &n.ID, &n.UserID, &n.Type, &n.Title, &n.Body, + &resType, &resID, &isRead, st(&n.CreatedAt), + ); err != nil { + return nil, 0, err + } + n.ResourceType = NullableString(resType) + n.ResourceID = NullableString(resID) + n.IsRead = isRead != 0 + items = append(items, n) + } + if items == nil { + items = []models.Notification{} + } + return items, total, rows.Err() +} + +func (s *NotificationStore) MarkRead(ctx context.Context, id, userID string) error { + res, err := DB.ExecContext(ctx, + `UPDATE notifications SET is_read = 1 WHERE id = ? AND user_id = ?`, + id, userID) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + +func (s *NotificationStore) MarkAllRead(ctx context.Context, userID string) error { + _, err := DB.ExecContext(ctx, + `UPDATE notifications SET is_read = 1 WHERE user_id = ? AND is_read = 0`, + userID) + return err +} + +func (s *NotificationStore) Delete(ctx context.Context, id, userID string) error { + res, err := DB.ExecContext(ctx, + `DELETE FROM notifications WHERE id = ? AND user_id = ?`, id, userID) + if err != nil { + return err + } + n, _ := res.RowsAffected() + if n == 0 { + return sql.ErrNoRows + } + return nil +} + +func (s *NotificationStore) UnreadCount(ctx context.Context, userID string) (int, error) { + var count int + err := DB.QueryRowContext(ctx, + `SELECT COUNT(*) FROM notifications WHERE user_id = ? AND is_read = 0`, + userID).Scan(&count) + return count, err +} + +func (s *NotificationStore) DeleteOlderThan(ctx context.Context, before time.Time) (int64, error) { + res, err := DB.ExecContext(ctx, + `DELETE FROM notifications WHERE created_at < ?`, + before.UTC().Format(timeFmt)) + if err != nil { + return 0, err + } + return res.RowsAffected() +} + +// nullStr returns sql.NullString for optional string fields. +func nullStr(s string) sql.NullString { + if s == "" { + return sql.NullString{} + } + return sql.NullString{String: s, Valid: true} +} diff --git a/server/store/sqlite/notification_prefs.go b/server/store/sqlite/notification_prefs.go new file mode 100644 index 0000000..b139309 --- /dev/null +++ b/server/store/sqlite/notification_prefs.go @@ -0,0 +1,70 @@ +package sqlite + +import ( + "context" + "database/sql" + + "git.gobha.me/xcaliber/chat-switchboard/models" + "git.gobha.me/xcaliber/chat-switchboard/store" +) + +type NotificationPreferenceStore struct{} + +func NewNotificationPreferenceStore() *NotificationPreferenceStore { + return &NotificationPreferenceStore{} +} + +func (s *NotificationPreferenceStore) Get(ctx context.Context, userID, notifType string) (*models.NotificationPreference, error) { + var p models.NotificationPreference + err := DB.QueryRowContext(ctx, ` + SELECT id, user_id, type, in_app, email + FROM notification_preferences + WHERE user_id = ? AND type = ?`, userID, notifType).Scan( + &p.ID, &p.UserID, &p.Type, &p.InApp, &p.Email) + if err == sql.ErrNoRows { + return nil, nil + } + if err != nil { + return nil, err + } + return &p, nil +} + +func (s *NotificationPreferenceStore) ListForUser(ctx context.Context, userID string) ([]models.NotificationPreference, error) { + rows, err := DB.QueryContext(ctx, ` + SELECT id, user_id, type, in_app, email + FROM notification_preferences + WHERE user_id = ? + ORDER BY type`, userID) + if err != nil { + return nil, err + } + defer rows.Close() + + var result []models.NotificationPreference + for rows.Next() { + var p models.NotificationPreference + if err := rows.Scan(&p.ID, &p.UserID, &p.Type, &p.InApp, &p.Email); err != nil { + return nil, err + } + result = append(result, p) + } + return result, rows.Err() +} + +func (s *NotificationPreferenceStore) Upsert(ctx context.Context, pref *models.NotificationPreference) error { + _, err := DB.ExecContext(ctx, ` + INSERT INTO notification_preferences (id, user_id, type, in_app, email) + VALUES (?, ?, ?, ?, ?) + ON CONFLICT (user_id, type) DO UPDATE SET + in_app = excluded.in_app, email = excluded.email`, + store.NewID(), pref.UserID, pref.Type, pref.InApp, pref.Email) + return err +} + +func (s *NotificationPreferenceStore) Delete(ctx context.Context, userID, notifType string) error { + _, err := DB.ExecContext(ctx, ` + DELETE FROM notification_preferences + WHERE user_id = ? AND type = ?`, userID, notifType) + return err +} diff --git a/server/store/sqlite/stores.go b/server/store/sqlite/stores.go index 678ebe9..037c87c 100644 --- a/server/store/sqlite/stores.go +++ b/server/store/sqlite/stores.go @@ -33,5 +33,7 @@ func NewStores(db *sql.DB) store.Stores { ResourceGrants: NewResourceGrantStore(), Memories: NewMemoryStore(), Projects: NewProjectStore(), + Notifications: NewNotificationStore(), + NotifPrefs: NewNotificationPreferenceStore(), } } diff --git a/server/store/sqlite/user_settings.go b/server/store/sqlite/user_settings.go index 6baa7f8..6bfad12 100644 --- a/server/store/sqlite/user_settings.go +++ b/server/store/sqlite/user_settings.go @@ -15,8 +15,8 @@ func NewUserModelSettingsStore() *UserModelSettingsStore { return &UserModelSett func (s *UserModelSettingsStore) GetForUser(ctx context.Context, userID string) ([]models.UserModelSetting, error) { rows, err := DB.QueryContext(ctx, ` - SELECT id, user_id, model_id, hidden, preferred_temperature, preferred_max_tokens, - sort_order, created_at, updated_at + SELECT id, user_id, model_id, COALESCE(hidden, 0), preferred_temperature, preferred_max_tokens, + COALESCE(sort_order, 0), created_at, updated_at FROM user_model_settings WHERE user_id = ? ORDER BY sort_order, model_id`, userID) if err != nil { return nil, err @@ -92,7 +92,7 @@ func (s *UserModelSettingsStore) Set(ctx context.Context, userID, modelID string // Build a custom upsert since the update builder doesn't handle INSERT ON CONFLICT _, err := DB.ExecContext(ctx, ` INSERT INTO user_model_settings (id, user_id, model_id, hidden, preferred_temperature, preferred_max_tokens, sort_order) - VALUES (?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, COALESCE(?, 0), ?, ?, COALESCE(?, 0)) ON CONFLICT (user_id, model_id) DO UPDATE SET hidden = COALESCE(excluded.hidden, user_model_settings.hidden), diff --git a/src/css/channel-models.css b/src/css/channel-models.css new file mode 100644 index 0000000..64e98fa --- /dev/null +++ b/src/css/channel-models.css @@ -0,0 +1,210 @@ +/* ========================================== + Channel Models — v0.20.0 Phase 2 + Model pills, @mention autocomplete, add dialog + ========================================== */ + +/* ── Model Pills (chat header) ───────────── */ + +.ch-model-pills { + display: none; /* shown by JS when roster > 1 */ + align-items: center; + gap: 4px; + padding: 0 8px; + flex-shrink: 1; + overflow-x: auto; + scrollbar-width: none; +} +.ch-model-pills::-webkit-scrollbar { display: none; } + +.ch-model-pill { + display: inline-flex; + align-items: center; + gap: 2px; + padding: 2px 8px; + border-radius: 12px; + background: var(--bg-secondary, #f0f0f0); + border: 1px solid var(--border-color, #ddd); + font-size: 0.75rem; + white-space: nowrap; + cursor: default; + transition: background 0.15s; +} +.ch-model-pill.ch-model-default { + background: var(--accent-bg, #e8f0fe); + border-color: var(--accent-color, #4a8af4); +} +.ch-model-pill-name { + cursor: pointer; + user-select: none; +} +.ch-model-pill-name:hover { + text-decoration: underline; +} +.ch-model-pill-remove { + background: none; + border: none; + cursor: pointer; + font-size: 0.65rem; + color: var(--text-secondary, #888); + padding: 0 2px; + line-height: 1; + opacity: 0.6; + transition: opacity 0.15s; +} +.ch-model-pill-remove:hover { + opacity: 1; + color: var(--error-color, #d32f2f); +} + +.ch-model-add-btn { + background: none; + border: 1px dashed var(--border-color, #ccc); + border-radius: 12px; + padding: 2px 8px; + font-size: 0.75rem; + cursor: pointer; + color: var(--text-secondary, #888); + white-space: nowrap; + transition: color 0.15s, border-color 0.15s; +} +.ch-model-add-btn:hover { + color: var(--text-primary, #333); + border-color: var(--text-primary, #333); +} + +/* ── Add Model Dialog ────────────────────── */ + +.ch-model-add-dialog { + position: fixed; + inset: 0; + display: flex; + align-items: center; + justify-content: center; + background: rgba(0,0,0,0.4); + z-index: 1100; +} +.ch-model-add-inner { + background: var(--bg-primary, #fff); + border-radius: 12px; + padding: 24px; + min-width: 320px; + max-width: 420px; + box-shadow: 0 8px 32px rgba(0,0,0,0.2); +} +.ch-model-add-inner h3 { + margin: 0 0 16px; + font-size: 1rem; +} +.ch-model-add-inner label { + display: block; + margin-bottom: 12px; + font-size: 0.85rem; + color: var(--text-secondary, #666); +} +.ch-model-add-inner select, +.ch-model-add-inner input[type="text"] { + display: block; + width: 100%; + margin-top: 4px; + padding: 8px; + border: 1px solid var(--border-color, #ddd); + border-radius: 6px; + font-size: 0.9rem; + background: var(--bg-primary, #fff); + color: var(--text-primary, #333); + box-sizing: border-box; +} +.ch-model-add-actions { + display: flex; + gap: 8px; + justify-content: flex-end; + margin-top: 16px; +} + +/* ── @mention Autocomplete ───────────────── */ + +.mention-ac { + position: fixed; + z-index: 1050; + background: var(--bg-primary, #fff); + border: 1px solid var(--border-color, #ddd); + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0,0,0,0.15); + max-height: 200px; + overflow-y: auto; + padding: 4px 0; +} +.mention-ac-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 8px 12px; + cursor: pointer; + gap: 12px; + transition: background 0.1s; +} +.mention-ac-item:hover, +.mention-ac-item.mention-ac-active { + background: var(--bg-secondary, #f5f5f5); +} +.mention-ac-name { + font-weight: 500; + font-size: 0.85rem; +} +.mention-ac-model { + font-size: 0.75rem; + color: var(--text-secondary, #999); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 160px; +} + +/* ── Model Attribution (multi-model messages) ─ */ + +.msg-model-label { + display: inline-block; + font-size: 0.7rem; + font-weight: 600; + padding: 1px 6px; + border-radius: 4px; + background: var(--bg-secondary, #f0f0f0); + color: var(--text-secondary, #666); + margin-left: 6px; + vertical-align: middle; +} + +/* Model separator in multi-model stream */ +.model-stream-divider { + display: flex; + align-items: center; + gap: 8px; + padding: 12px 0 4px; + font-size: 0.8rem; + color: var(--text-secondary, #888); + font-weight: 500; +} +.model-stream-divider::before, +.model-stream-divider::after { + content: ''; + flex: 1; + height: 1px; + background: var(--border-color, #eee); +} + +/* ── Mobile ──────────────────────────────── */ + +@media (max-width: 768px) { + .ch-model-pills { + max-width: 50vw; + } + .ch-model-add-inner { + min-width: auto; + margin: 0 16px; + } + .mention-ac { + left: 8px !important; + right: 8px; + min-width: auto !important; + } +} diff --git a/src/css/notification-prefs.css b/src/css/notification-prefs.css new file mode 100644 index 0000000..e5a47c6 --- /dev/null +++ b/src/css/notification-prefs.css @@ -0,0 +1,64 @@ +/* ========================================== + Notification Preferences — v0.20.0 Phase 3 + ========================================== */ + +.notif-pref-table { + width: 100%; + border-collapse: collapse; + font-size: 0.9rem; +} +.notif-pref-table th { + text-align: left; + padding: 6px 8px; + border-bottom: 2px solid var(--border-color, #ddd); + font-size: 0.8rem; + color: var(--text-secondary, #888); + font-weight: 500; +} +.notif-pref-table th:nth-child(2), +.notif-pref-table th:nth-child(3) { + text-align: center; + width: 70px; +} +.notif-pref-table td { + padding: 8px; + border-bottom: 1px solid var(--border-color, #eee); +} +.notif-pref-toggle { + text-align: center; +} +.notif-pref-label { + font-size: 0.85rem; +} + +/* ── SMTP Config (Admin panel) ────────────── */ + +.smtp-config-grid { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 12px; +} +.smtp-config-grid .form-group { + margin-bottom: 0; +} +.smtp-config-grid .form-group.full-width { + grid-column: 1 / -1; +} +.smtp-test-row { + display: flex; + align-items: center; + gap: 12px; + margin-top: 12px; +} +.smtp-test-status { + font-size: 0.85rem; + color: var(--text-secondary, #888); +} +.smtp-test-status.success { color: var(--success-color, #2e7d32); } +.smtp-test-status.error { color: var(--error-color, #d32f2f); } + +@media (max-width: 600px) { + .smtp-config-grid { + grid-template-columns: 1fr; + } +} diff --git a/src/css/notifications.css b/src/css/notifications.css new file mode 100644 index 0000000..573e27b --- /dev/null +++ b/src/css/notifications.css @@ -0,0 +1,249 @@ +/* ========================================== + Notifications (v0.20.0) + ========================================== */ + +/* ── Bell + Badge ──────────────────────────── */ + +.notif-wrap { + position: relative; + display: flex; + align-items: center; + margin-left: auto; + margin-right: 8px; +} + +.notif-bell { + background: none; + border: none; + cursor: pointer; + padding: 4px 6px; + border-radius: 6px; + color: var(--text-secondary, #888); + display: flex; + align-items: center; + position: relative; + transition: background 0.15s; +} + +.notif-bell:hover { + background: var(--hover-bg, rgba(128, 128, 128, 0.1)); + color: var(--text-primary, #ddd); +} + +.notif-badge { + position: absolute; + top: 0; + right: 0; + min-width: 16px; + height: 16px; + line-height: 16px; + font-size: 10px; + font-weight: 700; + text-align: center; + border-radius: 8px; + background: var(--accent-red, #e55); + color: #fff; + padding: 0 4px; + pointer-events: none; +} + +/* ── Dropdown ──────────────────────────────── */ + +.notif-dropdown { + display: none; + position: absolute; + top: 100%; + right: 0; + width: 360px; + max-height: 480px; + background: var(--bg-surface, #1e1e1e); + border: 1px solid var(--border-color, #333); + border-radius: 8px; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3); + z-index: 1000; + overflow: hidden; +} + +.notif-dd-header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 14px; + border-bottom: 1px solid var(--border-color, #333); + font-weight: 600; + font-size: 13px; +} + +.notif-mark-all { + background: none; + border: none; + color: var(--accent, #5b9); + cursor: pointer; + font-size: 12px; + padding: 2px 6px; + border-radius: 4px; +} + +.notif-mark-all:hover { + background: var(--hover-bg, rgba(128, 128, 128, 0.1)); +} + +.notif-dd-list { + overflow-y: auto; + max-height: 380px; +} + +.notif-dd-footer { + padding: 8px 14px; + border-top: 1px solid var(--border-color, #333); + text-align: center; +} + +.notif-view-all { + background: none; + border: none; + color: var(--accent, #5b9); + cursor: pointer; + font-size: 12px; +} + +.notif-view-all:hover { + text-decoration: underline; +} + +/* ── Notification Item ─────────────────────── */ + +.notif-item, +.notif-panel-item { + display: flex; + align-items: flex-start; + padding: 10px 14px; + cursor: pointer; + transition: background 0.15s; + border-bottom: 1px solid var(--border-color, #222); +} + +.notif-item:hover, +.notif-panel-item:hover { + background: var(--hover-bg, rgba(128, 128, 128, 0.08)); +} + +.notif-item.notif-unread, +.notif-panel-item.notif-unread { + background: var(--notif-unread-bg, rgba(91, 187, 153, 0.06)); +} + +.notif-dot { + flex-shrink: 0; + width: 18px; + font-size: 10px; + margin-top: 3px; + color: var(--accent, #5b9); +} + +.notif-item:not(.notif-unread) .notif-dot, +.notif-panel-item:not(.notif-unread) .notif-dot { + color: var(--text-tertiary, #555); +} + +.notif-body { + flex: 1; + min-width: 0; +} + +.notif-title { + font-size: 13px; + line-height: 1.4; + color: var(--text-primary, #ddd); +} + +.notif-detail { + font-size: 12px; + color: var(--text-secondary, #888); + margin-top: 2px; + line-height: 1.3; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.notif-time { + font-size: 11px; + color: var(--text-tertiary, #666); + margin-top: 3px; +} + +.notif-empty { + padding: 32px 14px; + text-align: center; + color: var(--text-secondary, #888); + font-size: 13px; +} + +/* ── Panel ─────────────────────────────────── */ + +.notif-panel { + height: 100%; + display: flex; + flex-direction: column; +} + +.notif-panel-toolbar { + display: flex; + gap: 6px; + padding: 8px 12px; + border-bottom: 1px solid var(--border-color, #333); +} + +.notif-panel-list { + flex: 1; + overflow-y: auto; + min-height: 0; +} + +.notif-panel-row { + display: flex; + align-items: flex-start; + width: 100%; +} + +.notif-delete { + flex-shrink: 0; + background: none; + border: none; + color: var(--text-tertiary, #555); + cursor: pointer; + padding: 2px 6px; + font-size: 12px; + border-radius: 4px; + opacity: 0; + transition: opacity 0.15s; +} + +.notif-panel-item:hover .notif-delete { + opacity: 1; +} + +.notif-delete:hover { + color: var(--accent-red, #e55); + background: var(--hover-bg, rgba(128, 128, 128, 0.1)); +} + +.notif-panel-more { + padding: 8px 12px; + text-align: center; + border-top: 1px solid var(--border-color, #333); +} + +/* ── Mobile ────────────────────────────────── */ + +@media (max-width: 768px) { + .notif-dropdown { + position: fixed; + top: 48px; + left: 8px; + right: 8px; + width: auto; + max-height: calc(100vh - 96px); + } +} diff --git a/src/index.html b/src/index.html index 65aeeff..81909d1 100644 --- a/src/index.html +++ b/src/index.html @@ -21,6 +21,9 @@ + + + @@ -136,7 +139,15 @@ + +| Notification Type | +In-App | +
|---|