harness uniformization

src/apps/officer-web/Screens/Dashboard/Chat/ChatPanel.tsx

@@ -1,6 +1,8 @@
 import { useRef, useEffect, useState } from 'react';
 import { useNavigate, useLocation } from 'react-router';
-import { useSessions, useOpenCodeSessions, useSlashCommands, SessionBar } from 'widgets/ChatHistory';
+import { useChatSessions } from '@/state/useChatSessions';
+import { useSlashCommands } from '@/state/useSlashCommands';
+import { SessionBar } from 'widgets/ChatHistory';
 import type { ModelOption } from '@/state/useModels';
 import type { useClaude } from './useClaude';
 import { EmbeddableChat, type Attachment } from './EmbeddableChat';
@@ -24,13 +26,7 @@ export const ChatPanel = ({ chat, provider = 'claude', availableModels = [], onP
   const [fullscreen, setFullscreen] = useState(false);
   const initialSentRef = useRef(false);
 
-  const claudeSessions = useSessions();
-  const opencodeSessions = useOpenCodeSessions();
-  const { archiveSession, deleteSession } =
-    provider === 'claude'
-      ? claudeSessions
-      : { archiveSession: undefined, deleteSession: opencodeSessions.deleteSession };
-  const sessions = provider === 'claude' ? claudeSessions.sessions : opencodeSessions.sessions;
+  const { sessions, archiveSession, deleteSession } = useChatSessions();
   const slashCommands = useSlashCommands({ sessionId });
   const sessionTitle = sessionId ? sessions.find((s) => s.id === sessionId)?.title : undefined;
   const listPath = '/chat';
@@ -89,16 +85,16 @@ export const ChatPanel = ({ chat, provider = 'claude', availableModels = [], onP
         isGenerating={isGenerating}
         fullscreen={fullscreen}
         onArchive={
-          archiveSession && sessionId
+          provider === 'claude' && sessionId
             ? async () => {
-                await archiveSession(sessionId);
+                await archiveSession(provider, sessionId);
                 navigate(listPath);
               }
             : undefined
         }
         onDelete={async () => {
           if (!sessionId) return;
-          await deleteSession(sessionId);
+          await deleteSession(provider, sessionId);
           navigate(listPath);
         }}
         onToggleFullscreen={() => setFullscreen((f) => !f)}

src/apps/officer-web/Screens/Dashboard/Chat/useClaude.ts

@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef } from 'react';
 import { useChatWebSocket } from 'hooks/useChatWebSocket';
-import { useSessions } from 'widgets/ChatHistory';
+import { useChatSessions } from '@/state/useChatSessions';
 import type { ChatMessage, ServerMessage, TaskInfo } from 'widgets/Chat';
 
 const SAVE_DEBOUNCE_MS = 1000;
@@ -31,7 +31,7 @@ export const useClaude = (initialSessionId?: string, initialModel?: string | nul
   const sessionIdRef = useRef<string | null>(initialSessionId ?? null);
   const saveTimerRef = useRef<number | null>(null);
 
-  const { getMessages, saveMessages } = useSessions();
+  const { getMessages, saveMessages } = useChatSessions();
 
   const token = localStorage.getItem('BEARER_TOKEN');
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -137,7 +137,7 @@ export const useClaude = (initialSessionId?: string, initialModel?: string | nul
       return;
     }
     if (!initialSessionId) return;
-    getMessages(initialSessionId)
+    getMessages('claude', initialSessionId)
       .then((data) => {
         if (Array.isArray(data) && data.length > 0) setMessages(data);
       })
@@ -156,7 +156,7 @@ export const useClaude = (initialSessionId?: string, initialModel?: string | nul
       if (storage) {
         storage.save(sid, snapshot).catch(() => {});
       } else {
-        saveMessages(sid, snapshot).catch(() => {});
+        saveMessages('claude', sid, snapshot).catch(() => {});
       }
       saveTimerRef.current = null;
     }, SAVE_DEBOUNCE_MS);

src/apps/officer-web/Screens/Dashboard/Chat/useOpenCode.ts

@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from 'react';
 import { useChatWebSocket } from 'hooks/useChatWebSocket';
 import { useSettings } from '@/state/useSettings';
 import { useVisibleOpenCodeModels } from '@/state/useModels';
-import { useOpenCodeSessions } from 'widgets/ChatHistory';
+import { useChatSessions } from '@/state/useChatSessions';
 import type { ChatMessage, ServerMessage, TaskInfo } from 'widgets/Chat';
 
 type UseOpenCodeOptions = {
@@ -29,7 +29,7 @@ export const useOpenCode = (initialSessionId?: string, initialModel?: string | n
     setSelectedModel(value);
   };
 
-  const { getMessages } = useOpenCodeSessions();
+  const { getMessages } = useChatSessions();
   const { settings } = useSettings();
   const openCodeModels = useVisibleOpenCodeModels();
 
@@ -144,7 +144,7 @@ export const useOpenCode = (initialSessionId?: string, initialModel?: string | n
   // Load messages from OpenCode on mount when resuming a session
   useEffect(() => {
     if (!initialSessionId) return;
-    getMessages(initialSessionId)
+    getMessages('opencode', initialSessionId)
       .then((data) => {
         if (Array.isArray(data) && data.length > 0) setMessages(data);
       })