fix(client,server): sending state after chat write; rate limit notice; unread count

Author: Cod-e-Codes

ARCHITECTURE.md

@@ -70,7 +70,7 @@ The client is a standalone terminal user interface built with the Bubble Tea fra
 - URL detection and external opening
 - Tab completion for @mentions
 - Connection status indicator
-- Unread message count
+- Unread count in the footer: increments only for other users' new `text`, `dm`, or `file` lines while the transcript viewport is scrolled up (not for typing, reactions, read receipts, edits, deletes, or your own echoed sends)
 - Optional debounced `read_receipt` to the server when the viewport follows the newest messages; failures surface in the banner only
 - Footer shows `E2E` when encryption is on, and `#channel` when the current room is not `general`; plaintext sessions omit an explicit `Unencrypted` label in the footer
 - Automatic WebSocket reconnect with exponential backoff (capped); on each successful connect (`wsConnected`), the reference client clears the in-memory transcript and related UI state before processing server history replay, so a server restart or network drop does not duplicate messages that were already on screen
@@ -104,7 +104,7 @@ The server is a standalone HTTP/WebSocket server application that provides real-
 - System metrics collection and health monitoring
 - Web-based admin panel with CSRF protection
 - Health check endpoints for monitoring systems
-- WebSocket message rate limiting
+- WebSocket per-connection message rate limiting; when the configured burst is exceeded the server sends one `System` `text` notice to that client, then ignores inbound JSON until cooldown (see **PROTOCOL.md**)
 - **Diagnostics**: `-doctor` and `-doctor-json` without binding ports (`internal/doctor`)
 
 ### Server Library (`server/`)

PROTOCOL.md

@@ -198,7 +198,7 @@ Per WebSocket connection, the server enforces rate limiting on **all** incoming
 - **Burst:** at most **20 messages** per **5 second** sliding window.
 - **Cooldown:** if the limit is exceeded, further incoming messages from that connection are ignored until **10 seconds** have elapsed since the violation, then counting resumes.
 
-Exceeded messages are dropped silently from the client’s perspective (the server logs the event). Alternative clients should pace high-frequency traffic accordingly.
+When the burst threshold is crossed, the server sends one `System` `text` notice to that connection, then ignores further incoming JSON until the cooldown elapses (the server still logs drops). Messages received during the cooldown window are dropped without an extra notice. Alternative clients should pace high-frequency traffic accordingly.
 
 ---
 

README.md

@@ -87,7 +87,7 @@ Screen recordings of a current build (GIF autoplay depends on the viewer).
 - **Docker Support** - Containerized deployment with `docker-compose.yml` for local dev; optional **TLS reverse proxy** via Caddy ([guide](deploy/CADDY-REVERSE-PROXY.md))
 - **Health Monitoring** - `/health` and `/health/simple` endpoints with system metrics
 - **Structured Logging** - JSON logs with component separation and user tracking
-- **UX Enhancements** - Stable status footer (connection, unread, optional E2E and channel), banner for command feedback, tab completion for @mentions, multi-line input, chat export
+- **UX Enhancements** - Stable status footer (connection, unread for others' new chat lines when scrolled above the tail, optional E2E and channel), banner for command feedback, tab completion for @mentions, multi-line input, chat export
 - **Cross-Platform** - Runs on Linux, macOS, Windows, and Android/Termux
 - **Diagnostics** - `marchat-client -doctor` and `marchat-server -doctor` (or `-doctor-json`) summarize environment, resolved paths, and configuration health
 
@@ -766,7 +766,8 @@ The TUI client can spawn **optional** external programs on send/receive and pass
 | SQL syntax error after backend switch | Ensure tables were created by the current server version and restart after changing `MARCHAT_DB_PATH`. |
 | Message history looks incomplete | History depends on **channel**, **per-user message state**, and server filters. **Ban/unban** and related flows can reset stored state so scrollback differs from the raw DB. |
 | Transcript resets after reconnect | On each successful WebSocket connect the reference client clears local messages and rebuilds from the server handshake replay (up to 50 recent lines). That avoids duplicates when the server comes back while the client stayed open. Lines older than that replay window are not shown again in that session unless you saved them with **`:export`** earlier. Third-party clients should replace or dedupe history on handshake; see **PROTOCOL.md** (Server Behavior). |
-| Banner stuck on `[Sending...]` after a bogus `:` command | Use a current **client**: it clears the sending state after a successful server-command write. Use a current **server** if you want a `System` line for unknown admin commands (`Unknown command:` plus the token). Older servers sent nothing for that case for admins. |
+| Banner stuck on `[Sending...]` | Current **client** clears sending after each successful WebSocket write for normal chat and for `admin_command`, so dropped or slow server work does not leave the banner stuck. Current **server** sends a `System` line for unknown admin `:` commands (`Unknown command:` plus the token) and one `System` line when per-connection message rate burst is exceeded (see **PROTOCOL.md** Rate Limiting). |
+| Footer unread looks wrong | The reference client increments unread only for other users' new `text`, `dm`, or `file` while the transcript is not at the bottom. It does not increment for typing, reactions, read receipts, edits, deletes, or your own echoed sends. See **ARCHITECTURE.md** (client). |
 | Ban history gaps not working | Set `MARCHAT_BAN_HISTORY_GAPS=true` (default off). The server creates the **`ban_history`** table when using a database backend that runs marchat migrations. |
 | TLS certificate errors | For dev/self-signed certs, pass **`--skip-tls-verify`** on the client (or enable **Skip TLS verify** in the profile / interactive setup). |
 | Plugin installation fails | Check registry URL (`MARCHAT_PLUGIN_REGISTRY_URL`), network access, and JSON validity; commercial plugins need a valid license for the **plugin name** (see **PLUGIN_ECOSYSTEM.md**). |

TESTING.md

@@ -36,7 +36,7 @@ The Marchat test suite provides foundational coverage of the application's core
 | `client/config/interactive_ui_test.go` | Client interactive UI components | TUI forms, profile selection, authentication prompts |
 | `client/code_snippet_test.go` | Client code snippet functionality | Text editing, selection, clipboard, syntax highlighting |
 | `client/file_picker_test.go` | Client file picker functionality | File browsing, selection, size validation, directory navigation |
-| `client/main_test.go` | Client main functionality | Message rendering, user lists, URL handling, encryption functions, flag validation, `wsConnected` transcript reset on reconnect |
+| `client/main_test.go` | Client main functionality | Message rendering, user lists, URL handling, encryption functions, flag validation, `wsConnected` transcript reset on reconnect, `TestMessageIncrementsUnread` |
 | `client/websocket_sanitize_test.go` | WebSocket URL / TLS hints | Sanitization helpers for display and connection hints |
 | `client/exthook/exthook_test.go` | Client hook helpers | Executable validation, hook JSON shaping, path rules |
 | `internal/doctor/db_checks_test.go` | Doctor DB probes | SQLite connectivity and version checks used by `-doctor` |

client/main.go

@@ -294,6 +294,28 @@ func (m *model) shouldNotify(msg shared.Message) (bool, NotificationLevel) {
 	return true, NotificationLevelInfo
 }
 
+// messageIncrementsUnread is true when an inbound message should bump the footer
+// unread count while the transcript viewport is not at the bottom. Ephemeral or
+// in-place update types (typing, reactions, edits, etc.) must not increment.
+func messageIncrementsUnread(m *model, v shared.Message) bool {
+	if v.Sender == m.cfg.Username {
+		return false
+	}
+	switch v.Type {
+	case shared.TypingMessage, shared.ReadReceiptType, shared.ReactionMessage,
+		shared.EditMessageType, shared.DeleteMessage, shared.PinMessage,
+		shared.SearchMessage, shared.AdminCommandType,
+		shared.JoinChannelType, shared.LeaveChannelType, shared.ListChannelsType:
+		return false
+	case shared.TextMessage, shared.DirectMessage, shared.FileMessageType:
+		return true
+	case "":
+		return true
+	default:
+		return false
+	}
+}
+
 type themeStyles struct {
 	User        lipgloss.Style
 	Time        lipgloss.Style
@@ -746,7 +768,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if wasAtBottom {
 			m.viewport.GotoBottom()
 			m.unreadCount = 0
-		} else {
+		} else if messageIncrementsUnread(m, v) {
 			m.unreadCount++
 		}
 		m.sending = false
@@ -1925,6 +1947,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 							return m, m.listenWebSocket()
 						}
 						m.banner = ""
+						m.sending = false
 					} else if m.useE2E {
 						log.Printf("DEBUG: Attempting to send global encrypted message: '%s'", text)
 
@@ -1958,6 +1981,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 						log.Printf("DEBUG: Global encrypted message sent successfully")
 						m.banner = ""
+						m.sending = false
 					} else {
 						// Send plain text message
 						msg := shared.Message{Sender: m.cfg.Username, Content: text}
@@ -1968,6 +1992,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 							return m, m.listenWebSocket()
 						}
 						m.banner = ""
+						m.sending = false
 					}
 				}
 				m.textarea.SetValue("")

client/main_test.go

@@ -16,6 +16,33 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 )
 
+func TestMessageIncrementsUnread(t *testing.T) {
+	m := &model{cfg: config.Config{Username: "me"}}
+	tests := []struct {
+		name string
+		msg  shared.Message
+		want bool
+	}{
+		{"own_text", shared.Message{Sender: "me", Type: shared.TextMessage}, false},
+		{"other_text", shared.Message{Sender: "you", Type: shared.TextMessage}, true},
+		{"typing", shared.Message{Sender: "you", Type: shared.TypingMessage}, false},
+		{"reaction", shared.Message{Sender: "you", Type: shared.ReactionMessage}, false},
+		{"read_receipt", shared.Message{Sender: "you", Type: shared.ReadReceiptType}, false},
+		{"edit", shared.Message{Sender: "you", Type: shared.EditMessageType}, false},
+		{"delete", shared.Message{Sender: "you", Type: shared.DeleteMessage}, false},
+		{"other_dm", shared.Message{Sender: "you", Type: shared.DirectMessage}, true},
+		{"other_file", shared.Message{Sender: "you", Type: shared.FileMessageType}, true},
+		{"legacy_empty_type", shared.Message{Sender: "you", Type: ""}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := messageIncrementsUnread(m, tt.msg); got != tt.want {
+				t.Errorf("got %v want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestWsConnectedClearsTranscript(t *testing.T) {
 	vp := viewport.New(80, 20)
 	vp.SetContent("stale viewport body")

server/client.go

@@ -88,6 +88,12 @@ func (c *Client) readPump() {
 		if len(msgTimestamps) >= rateLimitMessages {
 			log.Printf("Rate limit exceeded for client %s, cooldown %v", c.username, rateLimitCooldown)
 			cooldownUntil = now.Add(rateLimitCooldown)
+			c.send <- shared.Message{
+				Sender:    "System",
+				Content:   "Rate limited: too many messages in a short window. Wait before sending again.",
+				CreatedAt: time.Now(),
+				Type:      shared.TextMessage,
+			}
 			continue
 		}
 		msgTimestamps = append(msgTimestamps, now)