From 77c1921c77e4e16f3238f0f6098770833fea25a8 Mon Sep 17 00:00:00 2001
From: Snider <snider@host.uk.com>
Date: Wed, 15 Apr 2026 16:53:57 +0100
Subject: [PATCH] Fix chat store API and display middleware

---
 pkg/chat/service.go   |  4 ++--
 pkg/display/scheme.go | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkg/chat/service.go b/pkg/chat/service.go
index 597501e9..458de405 100644
--- a/pkg/chat/service.go
+++ b/pkg/chat/service.go
@@ -40,7 +40,7 @@ type Options struct {
 type Service struct {
 	*core.ServiceRuntime[Options]
 	options            Options
-	store              *store.KeyValueStore
+	store              *store.Store
 	httpClient         *http.Client
 	toolExecutor       ToolExecutor
 	toolHandler        *ToolCallHandler
@@ -155,7 +155,7 @@ func (s *Service) OnStartup(_ context.Context) core.Result {
 		return core.Result{Value: err, OK: false}
 	}
 
-	keyValueStore, err := store.New(store.Options{Path: s.options.StorePath})
+	keyValueStore, err := store.New(s.options.StorePath)
 	if err != nil {
 		return core.Result{Value: err, OK: false}
 	}
diff --git a/pkg/display/scheme.go b/pkg/display/scheme.go
index 5e9d2d32..3852fcc9 100644
--- a/pkg/display/scheme.go
+++ b/pkg/display/scheme.go
@@ -3,7 +3,6 @@ package display
 import (
 	"context"
 	"html"
-	"net/http"
 	"net/url"
 	"sort"
 	"strings"
@@ -17,9 +16,9 @@ import (
 
 type SchemeHandler func(context.Context, string, url.Values) core.Result
 
-type assetHandlerFunc func(w http.ResponseWriter, r *http.Request)
+type assetHandlerFunc func(w application.ResponseWriter, r *application.Request)
 
-func (f assetHandlerFunc) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (f assetHandlerFunc) ServeHTTP(w application.ResponseWriter, r *application.Request) {
 	f(w, r)
 }
 
@@ -453,12 +452,9 @@ func coalesce(values ...string) string {
 }
 
 func (s *Service) AssetMiddleware() application.Middleware {
-	return func(next http.Handler) http.Handler {
-		return assetHandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			rawURL := ""
-			if r.URL != nil {
-				rawURL = r.URL.String()
-			}
+	return func(next application.Handler) application.Handler {
+		return assetHandlerFunc(func(w application.ResponseWriter, r *application.Request) {
+			rawURL := r.URL
 			if strings.HasPrefix(strings.ToLower(strings.TrimSpace(rawURL)), "core://") {
 				result := s.ResolveScheme(context.Background(), rawURL)
 				if !result.OK {