From 69f2460d18a748e569c880df5d1188fbf593a80c Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 20 Jan 2026 18:26:58 +0200
Subject: [PATCH] Refactor chat session state hook to use useShape

---
 surfsense_web/hooks/use-chat-session-state.ts | 28 +++++++++++++++++++
 surfsense_web/lib/electric/client.ts          |  1 -
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 surfsense_web/hooks/use-chat-session-state.ts

diff --git a/surfsense_web/hooks/use-chat-session-state.ts b/surfsense_web/hooks/use-chat-session-state.ts
new file mode 100644
index 000000000..0272464df
--- /dev/null
+++ b/surfsense_web/hooks/use-chat-session-state.ts
@@ -0,0 +1,28 @@
+"use client";
+
+import { useShape } from "@electric-sql/react";
+import type { ChatSessionState } from "@/contracts/types/chat-session-state.types";
+
+const ELECTRIC_URL = process.env.NEXT_PUBLIC_ELECTRIC_URL || "http://localhost:5133";
+
+export function useChatSessionState(threadId: number | null) {
+	const { data, isLoading, isError, error } = useShape<ChatSessionState>({
+		url: `${ELECTRIC_URL}/v1/shape`,
+		params: {
+			table: "chat_session_state",
+			where: `thread_id = ${threadId}`,
+		},
+		// Skip fetching if no threadId
+		...(threadId ? {} : { url: undefined as unknown as string }),
+	});
+
+	const sessionState = data?.[0] ?? null;
+
+	return {
+		sessionState,
+		isAiResponding: !!sessionState?.ai_responding_to_user_id,
+		respondingToUserId: sessionState?.ai_responding_to_user_id ?? null,
+		loading: isLoading,
+		error: isError ? error : null,
+	};
+}
diff --git a/surfsense_web/lib/electric/client.ts b/surfsense_web/lib/electric/client.ts
index 514185d23..d900ddb0a 100644
--- a/surfsense_web/lib/electric/client.ts
+++ b/surfsense_web/lib/electric/client.ts
@@ -228,7 +228,6 @@ export async function initElectric(userId: string): Promise<ElectricClient> {
 				CREATE INDEX IF NOT EXISTS idx_documents_search_space_type ON documents(search_space_id, document_type);
 			`);
 
-			// Create the chat_comment_mentions table schema in PGlite
 			await db.exec(`
 				CREATE TABLE IF NOT EXISTS chat_comment_mentions (
 					id INTEGER PRIMARY KEY,