fix: nil-close bug, stale docs, dead code, and tracked binaries (#7)

.claude/commands/pr.md

@@ -8,7 +8,7 @@ Create a PR on Gitea, wait for CI, and squash-merge it. Push code to both remote
 5. Create a Gitea PR: `tea pr create --head <branch> --base main`. Reference related issues with `#X`. Only use `Closes #X` if the PR fully resolves the issue.
 6. Wait for CI to pass: poll Gitea CI status. If CI fails, report the failure and stop — do not merge.
 7. Once CI passes, squash-merge on Gitea: `tea pr merge <index> --style squash` with a clean, semantic commit message including the PR number. No Claude attribution lines.
-8. Update local main and push to both remotes: `git checkout main && git pull gitea main && git push origin main`.
+8. Update local main and push to both remotes. If in a worktree, `main` is checked out in the primary tree, so run from there: `cd <primary-worktree> && git pull gitea main && git push origin main` (the primary worktree path is the repo root without `.claude/worktrees/…`). If not in a worktree: `git checkout main && git pull gitea main && git push origin main`.
 9. Clean up remote branches: `git push gitea --delete <branch> && git push origin --delete <branch>`.
 10. Prune refs: `git remote prune gitea && git remote prune origin`.
 11. Report the merged PR URL.

.gitignore

@@ -37,18 +37,9 @@ go.work.sum
 # Air artifacts
 *tmp/
 
-# binaries
+# Example binaries and data files
-internal/examples/chatroom/chatroom
+internal/examples/*/[a-z]*[!.go]
-internal/examples/counter/counter
+internal/examples/shakespeare/shake.db
-internal/examples/countercomp/countercomp
-internal/examples/greeter/greeter
-internal/examples/livereload/livereload
-internal/examples/picocss/picocss
-internal/examples/plugins/plugins
-internal/examples/realtimechart/realtimechart
-internal/examples/shakespeare/shakespeare
-internal/examples/nats-chatroom/nats-chatroom
-/nats-chatroom
 
 # NATS data directory
 data/

README.md

@@ -74,14 +74,13 @@ func main() {
 - **Plugin system** — `func(v *V)` hooks for integrating CSS/JS libraries
 - **Structured logging** — zerolog with configurable levels; console output in dev, JSON in production
 - **Graceful shutdown** — listens for SIGINT/SIGTERM, drains contexts, closes pub/sub
-- **Context lifecycle** — background reaper cleans up disconnected contexts; configurable TTL
 - **HTML DSL** — the `h` package provides type-safe Go-native HTML composition
 
 ## Examples
 
-The `internal/examples/` directory contains 14 runnable examples:
+The `internal/examples/` directory contains 19 runnable examples:
 
-`chatroom` · `counter` · `countercomp` · `greeter` · `keyboard` · `livereload` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare`
+`chatroom` · `counter` · `countercomp` · `effectspike` · `greeter` · `keyboard` · `livereload` · `maplibre` · `middleware` · `nats-chatroom` · `pathparams` · `picocss` · `plugins` · `pubsub-crud` · `realtimechart` · `session` · `shakespeare` · `signup` · `spa`
 
 ## Experimental
 

ci-check.sh

@@ -6,9 +6,13 @@ set -o pipefail
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$ROOT"
 
-echo "== CI: Format code =="
+echo "== CI: Check formatting =="
-go fmt ./...
+if [ -n "$(gofmt -l .)" ]; then
-echo "OK: formatting complete"
+  echo "ERROR: files not formatted:"
+  gofmt -l .
+  exit 1
+fi
+echo "OK: all files formatted"
 
 echo "== CI: Run go vet =="
 if ! go vet ./...; then

computed.go

@@ -1,7 +1,6 @@
 package via
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -51,5 +50,5 @@ func (s *computedSignal) recompute() {
 }
 
 func (s *computedSignal) patchValue() string {
-	return fmt.Sprintf("%v", s.lastVal)
+	return s.lastVal
 }

configuration.go

@@ -1,8 +1,6 @@
 package via
 
 import (
-	"time"
-
 	"github.com/alexedwards/scs/v2"
 	"github.com/rs/zerolog"
 )
@@ -62,16 +60,6 @@ type Options struct {
 	// the embedded NATS server. Ignored when a custom PubSub is configured.
 	Streams []StreamConfig
 
-	// ContextSuspendAfter is the time a context may be disconnected before
-	// the reaper suspends it (frees page resources but keeps the context
-	// shell for seamless re-init on reconnect). Default: 15m.
-	ContextSuspendAfter time.Duration
-
-	// ContextTTL is the maximum time a context may exist without an SSE
-	// connection before the background reaper fully disposes it.
-	// Default: 1h. Negative value disables the reaper.
-	ContextTTL time.Duration
-
 	// ActionRateLimit configures the default token-bucket rate limiter for
 	// action endpoints. Zero values use built-in defaults (10 req/s, burst 20).
 	// Set Rate to -1 to disable rate limiting entirely.

context.go

@@ -25,7 +25,7 @@ type Context struct {
 	app               *V
 	view              func() h.H
 	routeParams       map[string]string
-	parentPageCtx *Context
+	parentPageCtx     *Context
 	patchChan         chan patch
 	actionLimiter     *rate.Limiter
 	actionRegistry    map[string]actionEntry
@@ -39,11 +39,9 @@ type Context struct {
 	subscriptions     []Subscription
 	subsMu            sync.Mutex
 	disposeOnce       sync.Once
-	createdAt           time.Time
+	createdAt         time.Time
-	sseConnected        atomic.Bool
+	sseConnected      atomic.Bool
-	sseDisconnectedAt   atomic.Pointer[time.Time]
+	sseDisconnectedAt atomic.Pointer[time.Time]
-	lastSeenAt          atomic.Pointer[time.Time]
-	suspended           atomic.Bool
 }
 
 // View defines the UI rendered by this context.
@@ -444,13 +442,6 @@ func (c *Context) resetPageState() {
 	c.mu.Unlock()
 }
 
-// suspend frees page-scoped resources while keeping the context shell alive
-// in the registry for seamless re-init on reconnect.
-func (c *Context) suspend() {
-	c.resetPageState()
-	c.suspended.Store(true)
-}
-
 // Navigate performs an SPA navigation to the given path. It resets page state,
 // runs the target page's init function (with middleware), and pushes the new
 // view over the existing SSE connection with a view transition animation.
@@ -639,17 +630,17 @@ func newContext(id string, route string, v *V) *Context {
 	}
 
 	return &Context{
-		id:                id,
+		id:              id,
-		route:             route,
+		route:           route,
-		csrfToken:         genCSRFToken(),
+		csrfToken:       genCSRFToken(),
-		routeParams:       make(map[string]string),
+		routeParams:     make(map[string]string),
-		app:               v,
+		app:             v,
-		actionLimiter: newLimiter(v.actionRateLimit, defaultActionRate, defaultActionBurst),
+		actionLimiter:   newLimiter(v.actionRateLimit, defaultActionRate, defaultActionBurst),
-		actionRegistry:    make(map[string]actionEntry),
+		actionRegistry:  make(map[string]actionEntry),
-		signals:           new(sync.Map),
+		signals:         new(sync.Map),
-		patchChan:         make(chan patch, 8),
+		patchChan:       make(chan patch, 8),
-		ctxDisposedChan:   make(chan struct{}, 1),
+		ctxDisposedChan: make(chan struct{}, 1),
-		pageStopChan:      make(chan struct{}),
+		pageStopChan:    make(chan struct{}),
-		createdAt:         time.Now(),
+		createdAt:       time.Now(),
 	}
 }

docs/getting-started.md

@@ -66,7 +66,6 @@ v.Config(via.Options{
     Plugins:         []via.Plugin{MyPlugin},
     SessionManager:  sm,
     PubSub:          customBackend,
-    ContextTTL:      60 * time.Second,
     ActionRateLimit: via.RateLimitConfig{Rate: 20, Burst: 40},
 })
 ```
@@ -83,7 +82,6 @@ v.Config(via.Options{
 | `DatastarContent` | (embedded) | Custom Datastar JS bytes |
 | `DatastarPath` | `"/_datastar.js"` | URL path for the Datastar script |
 | `PubSub` | embedded NATS | Custom PubSub backend. Replaces the default NATS. See [PubSub and Sessions](pubsub-and-sessions.md) |
-| `ContextTTL` | `30s` | Max time a context survives without an SSE connection before cleanup. Negative value disables the reaper |
 | `ActionRateLimit` | `10 req/s, burst 20` | Default token-bucket rate limiter for action endpoints. Rate of `-1` disables limiting |
 
 ## Static Files

docs/state-and-interactivity.md

@@ -14,7 +14,7 @@ Browser hits page → new Context created → init function runs → HTML render
                         action fires → signals injected from browser → handler runs → Sync() → DOM patched
 ```
 
-The context is disposed when the SSE connection closes (tab close, navigation away, network loss). A background reaper also cleans up contexts that never establish an SSE connection within `ContextTTL` (default 30s).
+The context lives until the browser tab closes (detected via a `beforeunload` beacon) or the server shuts down. There is no background reaper — contexts persist across temporary SSE disconnections so backgrounded tabs resume seamlessly.
 
 During [SPA navigation](routing-and-navigation.md#spa-navigation), the context itself survives — only page-level state (signals, actions, fields, intervals, subscriptions) is reset. The SSE connection persists.
 
@@ -94,7 +94,7 @@ Available triggers:
 |--------|-------|-------|
 | `OnClick()` | `click` | |
 | `OnDblClick()` | `dblclick` | |
-| `OnChange()` | `change` | 200ms debounce |
+| `OnChange()` | `change` | |
 | `OnInput()` | `input` | No debounce |
 | `OnSubmit()` | `submit` | |
 | `OnKeyDown(key)` | `keydown` | Filtered by key name (e.g. `"Enter"`, `"Escape"`) |

h/h.go

@@ -5,7 +5,7 @@
 //
 //	h.Div(
 //		h.H1(h.Text("Hello, Via")),
-//		h.P(h.Text("Pure Go. No tmplates.")),
+//		h.P(h.Text("Pure Go. No templates.")),
 //	)
 package h
 

internal/examples/livereload/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"github.com/ryanhamamura/via"
-	// "github.com/go-via/via-plugin-picocss/picocss"
 	"github.com/ryanhamamura/via/h"
 )
 
@@ -15,9 +14,6 @@ func main() {
 		DocumentTitle: "Live Reload Demo",
 		DevMode:       true,
 		LogLevel:      via.LogLevelDebug,
-		Plugins:       []via.Plugin{
-			// picocss.Default
-		},
 	})
 
 	v.Page("/", func(c *via.Context) {

internal/examples/pathparams/main.go

@@ -4,17 +4,12 @@ import (
 	"strconv"
 
 	"github.com/ryanhamamura/via"
-	// "github.com/go-via/via-plugin-picocss/picocss"
 	. "github.com/ryanhamamura/via/h"
 )
 
 func main() {
 	v := via.New()
 
-	v.Config(via.Options{
-		// Plugins: []via.Plugin{picocss.Default},
-	})
-
 	v.Page("/counters/{counter_id}/{start_at_step}", func(c *via.Context) {
 
 		counterID := c.GetPathParam("counter_id")

internal/examples/picocss/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"github.com/ryanhamamura/via"
-	// "github.com/go-via/via-plugin-picocss/picocss"
 	"github.com/ryanhamamura/via/h"
 )
 
@@ -13,11 +12,6 @@ func main() {
 
 	v.Config(via.Options{
 		DocumentTitle: "Via Counter",
-		// Plugin is placed here. Use picocss.WithOptions(pococss.Options) to add the plugin
-		// with a different color theme or to enable a classes for a wide range of colors.
-		// Plugins: []via.Plugin{
-		// 	picocss.Default,
-		// },
 	})
 
 	v.Page("/", func(c *via.Context) {

internal/examples/realtimechart/main.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/ryanhamamura/via"
-	// "github.com/go-via/via-plugin-picocss/picocss"
 	"github.com/ryanhamamura/via/h"
 )
 
@@ -15,10 +14,7 @@ func main() {
 
 	v.Config(via.Options{
 		LogLevel: via.LogLevelDebug,
-		DevMode: true,
+		DevMode:  true,
-		Plugins: []via.Plugin{
-			// picocss.Default,
-		},
 	})
 
 	v.AppendToHead(

internal/examples/shakespeare/main.go

@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
+	_ "github.com/mattn/go-sqlite3"
 	"github.com/ryanhamamura/via"
 	"github.com/ryanhamamura/via/h"
-	_ "github.com/mattn/go-sqlite3"
 )
 
 type DataSource interface {
@@ -22,6 +22,9 @@ type ShakeDB struct {
 	findByTextStmt *sql.Stmt
 }
 
+// Prepare opens shake.db, a ~22 MB SQLite database of Shakespeare's works.
+// Download from https://github.com/nicholasgasior/gopher-fizzbuzz/raw/master/shake.db
+// and place it in this directory before running.
 func (shakeDB *ShakeDB) Prepare() {
 	db, err := sql.Open("sqlite3", "shake.db")
 	if err != nil {

maplibre/types.go

@@ -316,7 +316,7 @@ type Marker struct {
 type Popup struct {
 	Content         string // HTML content
 	LngLat          LngLat
-	HideCloseButton bool   // true removes the close button (MapLibre shows it by default)
+	HideCloseButton bool // true removes the close button (MapLibre shows it by default)
 	MaxWidth        string
 }
 

signal.go

@@ -80,4 +80,3 @@ func (s *Signal) Int() int {
 	}
 	return 0
 }
-

signal_test.go

@@ -1,7 +1,6 @@
 package via
 
 import (
-	//	"net/http/httptest"
 	"testing"
 
 	"github.com/ryanhamamura/via/h"

static_test.go

@@ -81,8 +81,8 @@ func TestStaticAutoSlash(t *testing.T) {
 
 func TestStaticFS(t *testing.T) {
 	fsys := fstest.MapFS{
-		"style.css":        {Data: []byte("body{}")},
+		"style.css": {Data: []byte("body{}")},
-		"js/app.js":        {Data: []byte("console.log('hi')")},
+		"js/app.js": {Data: []byte("console.log('hi')")},
 	}
 
 	v := New()

via.go

@@ -58,7 +58,6 @@ type V struct {
 	datastarPath         string
 	datastarContent      []byte
 	datastarOnce         sync.Once
-	reaperStop           chan struct{}
 	middleware           []Middleware
 	layout               func(func() h.H) h.H
 }
@@ -139,12 +138,6 @@ func (v *V) Config(cfg Options) {
 		v.defaultNATS = nil
 		v.pubsub = cfg.PubSub
 	}
-	if cfg.ContextSuspendAfter != 0 {
-		v.cfg.ContextSuspendAfter = cfg.ContextSuspendAfter
-	}
-	if cfg.ContextTTL != 0 {
-		v.cfg.ContextTTL = cfg.ContextTTL
-	}
 	if cfg.Streams != nil {
 		v.cfg.Streams = cfg.Streams
 	}
@@ -247,10 +240,10 @@ func (v *V) page(route string, raw, wrapped func(*Context)) {
 			bodyElements = append(bodyElements, h.Raw("<dataspa-inspector/>"))
 		}
 		view := h.HTML5(h.HTML5Props{
-			Title:     v.cfg.DocumentTitle,
+			Title: v.cfg.DocumentTitle,
-			Head:      headElements,
+			Head:  headElements,
-			Body:      bodyElements,
+			Body:  bodyElements,
-			})
+		})
 		_ = view.Render(w)
 	}))
 }
@@ -292,75 +285,6 @@ func (v *V) getCtx(id string) (*Context, error) {
 	return nil, fmt.Errorf("ctx '%s' not found", id)
 }
 
-func (v *V) startReaper() {
-	ttl := v.cfg.ContextTTL
-	if ttl < 0 {
-		return
-	}
-	if ttl == 0 {
-		ttl = time.Hour
-	}
-	suspendAfter := v.cfg.ContextSuspendAfter
-	if suspendAfter == 0 {
-		suspendAfter = 15 * time.Minute
-	}
-	if suspendAfter > ttl {
-		suspendAfter = ttl
-	}
-	interval := suspendAfter / 3
-	if interval < 5*time.Second {
-		interval = 5 * time.Second
-	}
-	v.reaperStop = make(chan struct{})
-	go func() {
-		ticker := time.NewTicker(interval)
-		defer ticker.Stop()
-		for {
-			select {
-			case <-v.reaperStop:
-				return
-			case <-ticker.C:
-				v.reapOrphanedContexts(suspendAfter, ttl)
-			}
-		}
-	}()
-}
-
-func (v *V) reapOrphanedContexts(suspendAfter, ttl time.Duration) {
-	now := time.Now()
-	v.contextRegistryMutex.RLock()
-	var toSuspend, toReap []*Context
-	for _, c := range v.contextRegistry {
-		if c.sseConnected.Load() {
-			continue
-		}
-		// Use the most recent liveness signal
-		lastAlive := c.createdAt
-		if dc := c.sseDisconnectedAt.Load(); dc != nil && dc.After(lastAlive) {
-			lastAlive = *dc
-		}
-		if seen := c.lastSeenAt.Load(); seen != nil && seen.After(lastAlive) {
-			lastAlive = *seen
-		}
-		silentFor := now.Sub(lastAlive)
-		if silentFor > ttl {
-			toReap = append(toReap, c)
-		} else if silentFor > suspendAfter && !c.suspended.Load() {
-			toSuspend = append(toSuspend, c)
-		}
-	}
-	v.contextRegistryMutex.RUnlock()
-
-	for _, c := range toSuspend {
-		v.logInfo(c, "suspending context (no SSE connection after %s)", suspendAfter)
-		c.suspend()
-	}
-	for _, c := range toReap {
-		v.logInfo(c, "reaping orphaned context (no SSE connection after %s)", ttl)
-		v.cleanupCtx(c)
-	}
-}
-
 // Start starts the Via HTTP server and blocks until a SIGINT or SIGTERM
 // signal is received, then performs a graceful shutdown.
 func (v *V) Start() {
@@ -389,8 +313,6 @@ func (v *V) Start() {
 		Handler: handler,
 	}
 
-	v.startReaper()
-
 	errCh := make(chan error, 1)
 	go func() {
 		errCh <- v.server.ListenAndServe()
@@ -417,9 +339,6 @@ func (v *V) Start() {
 // Shutdown gracefully shuts down the server and all contexts.
 // Safe for programmatic or test use.
 func (v *V) Shutdown() {
-	if v.reaperStop != nil {
-		close(v.reaperStop)
-	}
 	v.logInfo(nil, "draining all contexts")
 	v.drainAllContexts()
 
@@ -520,36 +439,39 @@ func (v *V) ensureDatastarHandler() {
 	})
 }
 
+func loadDevModeMap(path string) map[string]string {
+	m := make(map[string]string)
+	file, err := os.Open(path)
+	if err != nil {
+		return m
+	}
+	defer file.Close()
+	json.NewDecoder(file).Decode(&m)
+	return m
+}
+
+func saveDevModeMap(path string, m map[string]string) error {
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	return json.NewEncoder(file).Encode(m)
+}
+
 func (v *V) devModePersist(c *Context) {
 	p := filepath.Join(".via", "devmode", "ctx.json")
 	if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
 		v.logFatal("failed to create directory for devmode files: %v", err)
 	}
 
-	// load persisted list from file, or empty list if file not found
+	ctxRegMap := loadDevModeMap(p)
-	file, err := os.Open(p)
-	ctxRegMap := make(map[string]string)
-	if err == nil {
-		json.NewDecoder(file).Decode(&ctxRegMap)
-	}
-	file.Close()
-
-	// add ctx to persisted list
 	if _, ok := ctxRegMap[c.id]; !ok {
 		ctxRegMap[c.id] = c.route
 	}
 
-	// write persisted list to file
+	if err := saveDevModeMap(p, ctxRegMap); err != nil {
-	file, err = os.Create(p)
+		v.logErr(c, "devmode failed to persist ctx: %v", err)
-	if err != nil {
-		v.logErr(c, "devmode failed to percist ctx: %v", err)
-
-	}
-	defer file.Close()
-
-	encoder := json.NewEncoder(file)
-	if err := encoder.Encode(ctxRegMap); err != nil {
-		v.logErr(c, "devmode failed to persist ctx")
 	}
 	v.logDebug(c, "devmode persisted ctx to file")
 }
@@ -557,27 +479,11 @@ func (v *V) devModePersist(c *Context) {
 func (v *V) devModeRemovePersisted(c *Context) {
 	p := filepath.Join(".via", "devmode", "ctx.json")
 
-	// load persisted list from file, or empty list if file not found
+	ctxRegMap := loadDevModeMap(p)
-	file, err := os.Open(p)
-	ctxRegMap := make(map[string]string)
-	if err == nil {
-		json.NewDecoder(file).Decode(&ctxRegMap)
-	}
-	file.Close()
-
 	delete(ctxRegMap, c.id)
 
-	// write persisted list to file
+	if err := saveDevModeMap(p, ctxRegMap); err != nil {
-	file, err = os.Create(p)
+		v.logErr(c, "devmode failed to remove persisted ctx: %v", err)
-	if err != nil {
-		v.logErr(c, "devmode failed to remove percisted ctx: %v", err)
-
-	}
-	defer file.Close()
-
-	encoder := json.NewEncoder(file)
-	if err := encoder.Encode(ctxRegMap); err != nil {
-		v.logErr(c, "devmode failed to remove persisted ctx")
 	}
 	v.logDebug(c, "devmode removed persisted ctx from file")
 }
@@ -667,8 +573,6 @@ func New() *V {
 			return
 		}
 		c.reqCtx = r.Context()
-		now := time.Now()
-		c.lastSeenAt.Store(&now)
 
 		sse := datastar.NewSSE(w, r, datastar.WithCompression(datastar.WithBrotli(datastar.WithBrotliLevel(5))))
 
@@ -690,16 +594,6 @@ func New() *V {
 		c.sseDisconnectedAt.Store(nil)
 		v.logDebug(c, "SSE connection established")
 
-		if c.suspended.Load() {
-			c.navMu.Lock()
-			c.suspended.Store(false)
-			if initFn := v.pageRegistry[c.route]; initFn != nil {
-				v.logInfo(c, "resuming suspended context")
-				initFn(c)
-			}
-			c.navMu.Unlock()
-		}
-
 		go c.Sync()
 
 		keepalive := time.NewTicker(30 * time.Second)

via_test.go

@@ -134,9 +134,9 @@ func TestAction(t *testing.T) {
 
 func TestEventTypes(t *testing.T) {
 	tests := []struct {
-		name     string
+		name    string
-		attr     string
+		attr    string
-		buildEl  func(trigger *actionTrigger) h.H
+		buildEl func(trigger *actionTrigger) h.H
 	}{
 		{"OnSubmit", "data-on:submit", func(tr *actionTrigger) h.H { return h.Form(tr.OnSubmit()) }},
 		{"OnInput", "data-on:input", func(tr *actionTrigger) h.H { return h.Input(tr.OnInput()) }},
@@ -400,95 +400,6 @@ func TestPage_PanicsOnNoView(t *testing.T) {
 	})
 }
 
-func TestReaperCleansOrphanedContexts(t *testing.T) {
-	v := New()
-	c := newContext("orphan-1", "/", v)
-	c.createdAt = time.Now().Add(-time.Minute) // created 1 min ago
-	v.registerCtx(c)
-
-	_, err := v.getCtx("orphan-1")
-	assert.NoError(t, err)
-
-	v.reapOrphanedContexts(5*time.Second, 10*time.Second)
-
-	_, err = v.getCtx("orphan-1")
-	assert.Error(t, err, "orphaned context should have been reaped")
-}
-
-func TestReaperSuspendsContext(t *testing.T) {
-	v := New()
-	c := newContext("suspend-1", "/", v)
-	c.createdAt = time.Now().Add(-30 * time.Minute)
-	dc := time.Now().Add(-20 * time.Minute)
-	c.sseDisconnectedAt.Store(&dc)
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	got, err := v.getCtx("suspend-1")
-	assert.NoError(t, err, "suspended context should still be in registry")
-	assert.True(t, got.suspended.Load(), "context should be marked suspended")
-}
-
-func TestReaperReapsAfterTTL(t *testing.T) {
-	v := New()
-	c := newContext("reap-1", "/", v)
-	c.createdAt = time.Now().Add(-3 * time.Hour)
-	dc := time.Now().Add(-2 * time.Hour)
-	c.sseDisconnectedAt.Store(&dc)
-	c.suspended.Store(true)
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	_, err := v.getCtx("reap-1")
-	assert.Error(t, err, "context past TTL should have been reaped")
-}
-
-func TestReaperIgnoresAlreadySuspended(t *testing.T) {
-	v := New()
-	c := newContext("already-sus-1", "/", v)
-	c.createdAt = time.Now().Add(-30 * time.Minute)
-	dc := time.Now().Add(-20 * time.Minute)
-	c.sseDisconnectedAt.Store(&dc)
-	c.suspended.Store(true)
-	// give it a fresh pageStopChan so we can verify it's not re-closed
-	c.pageStopChan = make(chan struct{})
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	got, err := v.getCtx("already-sus-1")
-	assert.NoError(t, err, "already-suspended context within TTL should survive")
-	assert.True(t, got.suspended.Load())
-	// pageStopChan should still be open (not re-suspended)
-	select {
-	case <-got.pageStopChan:
-		t.Fatal("pageStopChan was closed — context was re-suspended")
-	default:
-	}
-}
-
-func TestReaperIgnoresConnectedContexts(t *testing.T) {
-	v := New()
-	c := newContext("connected-1", "/", v)
-	c.createdAt = time.Now().Add(-time.Minute)
-	c.sseConnected.Store(true)
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(5*time.Second, 10*time.Second)
-
-	_, err := v.getCtx("connected-1")
-	assert.NoError(t, err, "connected context should survive reaping")
-}
-
-func TestReaperDisabledWithNegativeTTL(t *testing.T) {
-	v := New()
-	v.cfg.ContextTTL = -1
-	v.startReaper()
-	assert.Nil(t, v.reaperStop, "reaper should not start with negative TTL")
-}
-
 func TestCleanupCtxIdempotent(t *testing.T) {
 	v := New()
 	c := newContext("idempotent-1", "/", v)
@@ -503,74 +414,6 @@ func TestCleanupCtxIdempotent(t *testing.T) {
 	assert.Error(t, err, "context should be removed after cleanup")
 }
 
-func TestReaperRespectsLastSeenAt(t *testing.T) {
-	v := New()
-	c := newContext("seen-1", "/", v)
-	c.createdAt = time.Now().Add(-30 * time.Minute)
-	// Disconnected 20 min ago, but client retried (lastSeenAt) 2 min ago
-	dc := time.Now().Add(-20 * time.Minute)
-	c.sseDisconnectedAt.Store(&dc)
-	seen := time.Now().Add(-2 * time.Minute)
-	c.lastSeenAt.Store(&seen)
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	_, err := v.getCtx("seen-1")
-	assert.NoError(t, err, "context with recent lastSeenAt should survive suspend threshold")
-	assert.False(t, c.suspended.Load(), "context should not be suspended")
-}
-
-func TestReaperFallsBackWithoutLastSeenAt(t *testing.T) {
-	v := New()
-	c := newContext("noseen-1", "/", v)
-	c.createdAt = time.Now().Add(-30 * time.Minute)
-	dc := time.Now().Add(-20 * time.Minute)
-	c.sseDisconnectedAt.Store(&dc)
-	// no lastSeenAt set — should fall back to sseDisconnectedAt
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	got, err := v.getCtx("noseen-1")
-	assert.NoError(t, err, "context should still be in registry (suspended, not reaped)")
-	assert.True(t, got.suspended.Load(), "context should be suspended using sseDisconnectedAt fallback")
-}
-
-func TestReaperReapsWithStaleLastSeenAt(t *testing.T) {
-	v := New()
-	c := newContext("stale-seen-1", "/", v)
-	c.createdAt = time.Now().Add(-3 * time.Hour)
-	dc := time.Now().Add(-2 * time.Hour)
-	c.sseDisconnectedAt.Store(&dc)
-	// lastSeenAt is also old — beyond TTL
-	seen := time.Now().Add(-90 * time.Minute)
-	c.lastSeenAt.Store(&seen)
-	c.suspended.Store(true)
-	v.registerCtx(c)
-
-	v.reapOrphanedContexts(15*time.Minute, time.Hour)
-
-	_, err := v.getCtx("stale-seen-1")
-	assert.Error(t, err, "context with stale lastSeenAt beyond TTL should be reaped")
-}
-
-func TestLastSeenAtUpdatedOnSSEConnect(t *testing.T) {
-	v := New()
-	c := newContext("seen-sse-1", "/", v)
-	v.registerCtx(c)
-
-	assert.Nil(t, c.lastSeenAt.Load(), "lastSeenAt should be nil before SSE connect")
-
-	// Simulate what the SSE handler does after getCtx
-	now := time.Now()
-	c.lastSeenAt.Store(&now)
-
-	got := c.lastSeenAt.Load()
-	assert.NotNil(t, got, "lastSeenAt should be set after SSE connect")
-	assert.WithinDuration(t, now, *got, time.Second)
-}
-
 func TestDevModeRemovePersistedFix(t *testing.T) {
 	v := New()
 	v.cfg.DevMode = true