@sybilion/uilib 1.3.88 → 1.3.89

package/dist/esm/components/ui/Chat/ChatMessage/AgentMessageContent.helpers.js

@@ -4,27 +4,6 @@ import logger from '../../../../lib/logger.js';
 import S from './ChatMessage.styl.js';
 import S$1 from '../../InteractiveContent/InteractiveContent.styl.js';
 
-const injectHeaders = (content) => {
-    // Match #, ##, ###, or #### headers at start of line
-    const regex = /(^|\n)(#{1,4})\s+(.+?)(?=\n|$)/m;
-    const matches = content.match(regex);
-    if (!matches)
-        return null;
-    const level = matches[2].length;
-    const headerText = matches[3].replace(/^\*+|\*+$/g, '');
-    const Tag = level === 1 ? 'h1' : level === 2 ? 'h2' : level === 3 ? 'h3' : 'h4';
-    // Calculate the actual match position and length
-    // matches[0] includes the leading \n if present, but we want to replace from the # position
-    const hasLeadingNewline = matches[1] === '\n';
-    const startIndex = matches.index + (hasLeadingNewline ? 1 : 0);
-    // Length is: # markers + space + header text (excluding leading newline)
-    const length = matches[2].length + 1 + matches[3].length;
-    return {
-        elem: jsx(Tag, { children: headerText }),
-        index: startIndex,
-        length: length,
-    };
-};
 /** Match sits inside list/table HTML (those blocks use dangerouslySetInnerHTML elsewhere). */
 const isInsideHtmlListOrTable = (content, matchStartIndex) => {
     const before = content.substring(0, matchStartIndex);
@@ -402,6 +381,35 @@ const injectAnchor = (content) => {
         length: matches[0].length,
     };
 };
+const headerTextInjectors = [
+    injectAnchor,
+    injectMarkdownLink,
+    injectHTMLTags,
+    injectBold,
+    injectItalic,
+    injectAutolinkUrl,
+];
+const injectHeaders = (content) => {
+    // Match #, ##, ###, or #### headers at start of line
+    const regex = /(^|\n)(#{1,4})\s+(.+?)(?=\n|$)/m;
+    const matches = content.match(regex);
+    if (!matches)
+        return null;
+    const level = matches[2].length;
+    const headerText = matches[3].replace(/^\*+|\*+$/g, '');
+    const Tag = level === 1 ? 'h1' : level === 2 ? 'h2' : level === 3 ? 'h3' : 'h4';
+    // Calculate the actual match position and length
+    // matches[0] includes the leading \n if present, but we want to replace from the # position
+    const hasLeadingNewline = matches[1] === '\n';
+    const startIndex = matches.index + (hasLeadingNewline ? 1 : 0);
+    // Length is: # markers + space + header text (excluding leading newline)
+    const length = matches[2].length + 1 + matches[3].length;
+    return {
+        elem: jsx(Tag, { children: runFormattingPipeline(headerText, headerTextInjectors) }),
+        index: startIndex,
+        length: length,
+    };
+};
 const applyFormatting = (text) => runFormattingPipeline(text, [
     injectHeaders,
     injectAnchor,

package/dist/esm/components/ui/Chat/ChatMessage/ChatMessage.js

@@ -4,6 +4,7 @@ import { InteractiveContent } from '../../InteractiveContent/InteractiveContent.
 import 'lucide-react';
 import '../../InteractiveContent/InteractiveContent.styl.js';
 import { TextShimmer } from '../../TextShimmer/TextShimmer.js';
+import { stripJsonDashboardFences } from '../../../../lib/dashboard-spec/jsonDashboardFence.js';
 import { MessageRole } from '../Chat.types.js';
 import { userTextFileAttachmentsFromMessage } from '../userTextFileAttachments.js';
 import { AgentMessageContent } from './AgentMessageContent.js';
@@ -16,7 +17,7 @@ function ChatMessage({ role, text, inProgress, userTextFileAttachments, onQuickR
     });
     const isAssistant = role === MessageRole.ASSISTANT;
     const isSystem = role === MessageRole.SYSTEM;
-    return (jsx("div", { className: cn(S.root, S[`role-${role}`], className), children: isSystem ? (jsx("div", { className: cn(S.text, textClassName), children: inProgress ? (jsx(TextShimmer, { as: "span", children: text })) : renderSystemMessage && message ? (renderSystemMessage(message)) : (text) })) : isAssistant ? (jsx(AgentMessageContent, { text: text, textClassName: textClassName, onQuickReply: onQuickReply, suppressedQuickReplyKeys: suppressedQuickReplyKeys, quickReplyDisabled: quickReplyDisabled, quickReplyHidden: quickReplyHidden, isLastMessage: isLastMessage, scriptContinue: scriptContinue, onScriptContinue: onScriptContinue, renderMessageChart: renderMessageChart })) : (jsxs("div", { className: S.userColumn, children: [jsx("div", { className: cn(S.text, textClassName && S.textCustom, textClassName), children: jsx(InteractiveContent, { text: text }) }), fileAttachments.map(attachment => (jsx(UserTextFileAttachmentBubble, { attachment: attachment }, `${attachment.displayName}:${attachment.filename}`)))] })) }));
+    return (jsx("div", { className: cn(S.root, S[`role-${role}`], className), children: isSystem ? (jsx("div", { className: cn(S.text, textClassName), children: inProgress ? (jsx(TextShimmer, { as: "span", children: text })) : renderSystemMessage && message ? (renderSystemMessage(message)) : (text) })) : isAssistant ? (jsx(AgentMessageContent, { text: stripJsonDashboardFences(text), textClassName: textClassName, onQuickReply: onQuickReply, suppressedQuickReplyKeys: suppressedQuickReplyKeys, quickReplyDisabled: quickReplyDisabled, quickReplyHidden: quickReplyHidden, isLastMessage: isLastMessage, scriptContinue: scriptContinue, onScriptContinue: onScriptContinue, renderMessageChart: renderMessageChart })) : (jsxs("div", { className: S.userColumn, children: [jsx("div", { className: cn(S.text, textClassName && S.textCustom, textClassName), children: jsx(InteractiveContent, { text: text }) }), fileAttachments.map(attachment => (jsx(UserTextFileAttachmentBubble, { attachment: attachment }, `${attachment.displayName}:${attachment.filename}`)))] })) }));
 }
 
 export { ChatMessage };

package/dist/esm/components/ui/Chat/ChatSheet/useChatPanelChromeModel.js

@@ -22,7 +22,7 @@ const CHAT_NEW_SHORTCUT_KEY = 'o';
 const CHAT_QUERY_PARAM = 'chat';
 const CHAT_OPEN_VALUE = 'open';
 const PROMPT_QUERY_PARAM = 'prompt';
-function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onScriptComplete, renderMessageChart, renderSystemMessage, emptyState, allowedAttachments, allowPdfAttachments, onAttachmentsDropped, slashCommandItems, onSlashItemCommand, copyHistoryOnNewChat = false, transformSendPayload, }) {
+function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onScriptComplete, renderMessageChart, renderSystemMessage, emptyState, allowedAttachments, allowPdfAttachments, onAttachmentsDropped, slashCommandItems, onSlashItemCommand, copyHistoryOnNewChat = false, transformSendPayload, submitPresetsViaApi = false, }) {
     const effectiveScopeId = scopeId ?? NO_SCOPE_FALLBACK;
     const isMobile = useIsMobile();
     const { chatPanelContainer, isOpen: sidebarNavOpen, setOpen: setSidebarNavOpen, sidebarWidthPx, chatWidthPx, setChatWidthPx, getShellWidth, chatPanelOpen: shellChatPanelOpen, setChatPanelOpen, } = useSidebar();
@@ -350,7 +350,7 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
                 setOutboundLoadingLabel(loadingLabelFromSendPayload(payload));
                 try {
                     const { response: assistantResponse, sessionId } = await sendMessage(payload);
-                    onMessage?.(displayTextFromSendPayload(payload), assistantResponse, sessionId);
+                    await onMessage?.(displayTextFromSendPayload(payload), assistantResponse, sessionId);
                 }
                 finally {
                     setOutboundLoadingLabel(undefined);
@@ -488,7 +488,7 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
             setOutboundLoadingLabel(loadingLabelFromSendPayload(payload));
             try {
                 const { response: assistantResponse, sessionId } = await sendMessage(payload);
-                onMessage?.(displayTextFromSendPayload(payload), assistantResponse, sessionId);
+                await onMessage?.(displayTextFromSendPayload(payload), assistantResponse, sessionId);
             }
             finally {
                 setOutboundLoadingLabel(undefined);
@@ -523,10 +523,11 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
         const scriptGraph = isPresetScriptGraph(script);
         const hasLinearScript = Array.isArray(script) && script.length > 0;
         const hasReplies = preset.replies && Object.keys(preset.replies).length > 0;
-        const isLocalDemo = hasLinearScript ||
-            scriptGraph ||
-            Boolean(preset.answer?.trim()) ||
-            Boolean(hasReplies);
+        const isLocalDemo = !submitPresetsViaApi &&
+            (hasLinearScript ||
+                scriptGraph ||
+                Boolean(preset.answer?.trim()) ||
+                Boolean(hasReplies));
         if (!isLocalDemo) {
             if (!currentChatId)
                 return;
@@ -617,6 +618,7 @@ function useChatPanelChromeModel({ embedAsPage, presets, scopeId, onMessage, onS
         handlePromptSubmit,
         addMessage,
         presetsWithFreeform,
+        submitPresetsViaApi,
     ]);
     const resolvedEmptyState = useMemo(() => {
         if (!emptyState)

package/dist/esm/contexts/chat-context.js

@@ -2,84 +2,42 @@ import { jsx } from 'react/jsx-runtime';
 import { createContext, useState, useCallback, useEffect, useContext, useMemo } from 'react';
 import { MessageRole } from '../components/ui/Chat/Chat.types.js';
 import { normalizeUserTextFileAttachments } from '../components/ui/Chat/buildChatSendMessagePayload.js';
-import { stripJsonDashboardFences } from '../lib/dashboard-spec/stripJsonDashboardFences.js';
-import { LS } from '@homecode/ui';
-import { persistChatsToLS, safeLsSet } from './chatPersistence.js';
+import { normalizeJsonDashboardChatText, stripJsonDashboardFences } from '../lib/dashboard-spec/jsonDashboardFence.js';
+import { isEphemeralChatScope } from './chatPersistence.js';
+import { loadChatsFromSessionStorage, loadScopeIndex, persistScopeIndex, linkSessionToScope, loadSession, persistSession, addScopeIdToRegistry, removeSessionFromScope, countSessionReferences, deleteSessionBlob, renameSessionId } from './chatSessionStorage.js';
 
-const CHATS_PREFIX = 'chats-';
-const CHAT_SCOPE_IDS_REGISTRY_KEY = 'chat-scope-ids';
 const ChatContext = createContext(undefined);
 /** Stable composite key; avoids collisions if `scopeId` contains `:`. */
 function outboundPendingKey(scopeId, chatSessionId) {
     return `${scopeId}\0${chatSessionId}`;
 }
-function getCurrentChatIdKey(scopeId) {
-    return `chat-current-id-${scopeId}`;
-}
-function getChatsKey(scopeId) {
-    return `${CHATS_PREFIX}${scopeId}`;
-}
-function scopeIdsForUser(userId, all) {
-    const prefix = `${userId}-`;
-    const out = new Set();
-    for (const id of all) {
-        if (id.startsWith(prefix))
-            out.add(id);
-    }
-    return out;
-}
-function discoverScopeIdsFromLS() {
-    const scopeIds = new Set();
-    const registryRaw = LS.get(CHAT_SCOPE_IDS_REGISTRY_KEY);
-    const registry = Array.isArray(registryRaw) ? registryRaw : [];
-    registry.forEach((id) => {
-        if (typeof id === 'string' && id)
-            scopeIds.add(id);
-    });
-    try {
-        for (let i = 0; i < window.localStorage.length; i++) {
-            const key = window.localStorage.key(i);
-            if (key?.startsWith(CHATS_PREFIX)) {
-                const scopeId = key.slice(CHATS_PREFIX.length);
-                if (scopeId)
-                    scopeIds.add(scopeId);
-            }
+function applySessionUpdate(prev, sessionId, updater) {
+    let updatedChat = null;
+    const next = {};
+    for (const [scopeId, scopeChats] of Object.entries(prev)) {
+        const idx = scopeChats.findIndex(chat => chat.session_id === sessionId);
+        if (idx === -1) {
+            next[scopeId] = scopeChats;
+            continue;
         }
+        const chat = updater(scopeChats[idx]);
+        updatedChat = chat;
+        const scopeNext = [...scopeChats];
+        scopeNext[idx] = chat;
+        next[scopeId] = scopeNext;
     }
-    catch {
-        // ignore
-    }
-    return scopeIds;
-}
-function loadChatsFromLS(userId) {
-    if (typeof window === 'undefined' || userId === null) {
-        return { chats: {}, currentChatId: {} };
-    }
-    const chats = {};
-    const currentChatId = {};
-    const scopeIds = scopeIdsForUser(userId, discoverScopeIdsFromLS());
-    for (const scopeId of scopeIds) {
-        const chatsKey = getChatsKey(scopeId);
-        const storedRaw = LS.get(chatsKey);
-        const stored = Array.isArray(storedRaw) ? storedRaw : undefined;
-        if (stored?.length) {
-            chats[scopeId] = stored;
-            const ck = getCurrentChatIdKey(scopeId);
-            const savedCurrentIdRaw = LS.get(ck);
-            const savedCurrentId = typeof savedCurrentIdRaw === 'string' && savedCurrentIdRaw !== ''
-                ? savedCurrentIdRaw
-                : undefined;
-            currentChatId[scopeId] = savedCurrentId ?? stored[0]?.session_id ?? null;
-        }
-    }
-    return { chats, currentChatId };
+    if (updatedChat)
+        persistSession(updatedChat);
+    return next;
 }
-function addScopeIdToRegistry(scopeId) {
-    const raw = LS.get(CHAT_SCOPE_IDS_REGISTRY_KEY);
-    const registry = Array.isArray(raw) ? [...raw] : [];
-    if (!registry.includes(scopeId)) {
-        safeLsSet(CHAT_SCOPE_IDS_REGISTRY_KEY, [...registry, scopeId]);
+function remapSessionIdInMemory(prev, oldSessionId, newSessionId) {
+    const next = {};
+    for (const [scopeId, scopeChats] of Object.entries(prev)) {
+        next[scopeId] = scopeChats.map(chat => chat.session_id === oldSessionId
+            ? { ...chat, session_id: newSessionId }
+            : chat);
     }
+    return next;
 }
 /** Shallow-clone messages for seeding another session; drops in-progress rows. */
 function cloneMessagesForNewSession(messages) {
@@ -87,6 +45,7 @@ function cloneMessagesForNewSession(messages) {
         .filter(message => !message.inProgress)
         .map(message => ({
         ...message,
+        text: stripJsonDashboardFences(message.text),
         ...(message.meta ? { meta: { ...message.meta } } : {}),
         ...(message.userTextFileAttachments
             ? {
@@ -97,14 +56,14 @@ function cloneMessagesForNewSession(messages) {
 }
 function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessageFn, }) {
     const [chats, setChats] = useState(() => {
-        if (userSwitchKey === null)
+        if (userSwitchKey === null || typeof window === 'undefined')
             return {};
-        return loadChatsFromLS(userSwitchKey).chats;
+        return loadChatsFromSessionStorage(userSwitchKey).chats;
     });
     const [currentChatId, setCurrentChatIdState] = useState(() => {
-        if (userSwitchKey === null)
+        if (userSwitchKey === null || typeof window === 'undefined')
             return {};
-        return loadChatsFromLS(userSwitchKey).currentChatId;
+        return loadChatsFromSessionStorage(userSwitchKey).currentChatId;
     });
     const [outboundPendingByKey, setOutboundPendingByKey] = useState({});
     const [panelBusyCount, setPanelBusyCount] = useState(0);
@@ -140,6 +99,54 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
             return null;
         return v;
     }, [currentChatId]);
+    const setCurrentChatId = useCallback((currScopeId, sessionId) => {
+        if (!sessionId)
+            return;
+        setCurrentChatIdState(prev => ({ ...prev, [currScopeId]: sessionId }));
+        const index = loadScopeIndex(currScopeId);
+        if (index) {
+            persistScopeIndex(currScopeId, {
+                ...index,
+                currentSessionId: sessionId,
+            });
+        }
+    }, []);
+    const linkSessionToScope$1 = useCallback((scopeId, sessionId, options) => {
+        if (userSwitchKey === null)
+            return;
+        linkSessionToScope(scopeId, sessionId, options);
+        setChats(prev => {
+            const sessionFromLs = loadSession(sessionId);
+            let sessionFromMemory = null;
+            for (const scopeChats of Object.values(prev)) {
+                const found = scopeChats.find(chat => chat.session_id === sessionId);
+                if (found &&
+                    (!sessionFromMemory ||
+                        found.messages.length > sessionFromMemory.messages.length)) {
+                    sessionFromMemory = found;
+                }
+            }
+            const session = sessionFromMemory &&
+                (!sessionFromLs ||
+                    sessionFromMemory.messages.length >= sessionFromLs.messages.length)
+                ? sessionFromMemory
+                : sessionFromLs;
+            if (!session)
+                return prev;
+            if (session === sessionFromMemory) {
+                persistSession(sessionFromMemory);
+            }
+            const scopeChats = prev[scopeId] ?? [];
+            const exists = scopeChats.some(chat => chat.session_id === sessionId);
+            const updatedChats = exists
+                ? scopeChats.map(chat => chat.session_id === sessionId ? session : chat)
+                : [session, ...scopeChats];
+            return { ...prev, [scopeId]: updatedChats };
+        });
+        if (options?.makeCurrent !== false) {
+            setCurrentChatIdState(prev => ({ ...prev, [scopeId]: sessionId }));
+        }
+    }, [userSwitchKey]);
     const newChat = useCallback((scopeId, options) => {
         if (userSwitchKey === null)
             return undefined;
@@ -148,63 +155,65 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
         const seededMessages = options?.seedMessages && options.seedMessages.length > 0
             ? cloneMessagesForNewSession(options.seedMessages)
             : [];
-        const newChat = {
+        const created = {
             session_id: sessionId,
             name: '',
             messages: seededMessages,
         };
+        persistSession(created);
+        linkSessionToScope(scopeId, sessionId, { makeCurrent: true });
         setChats(prev => {
-            const currentChats = prev[scopeId] ?? [];
-            const updatedChats = [newChat, ...currentChats];
-            persistChatsToLS(scopeId, updatedChats);
-            return {
-                ...prev,
-                [scopeId]: updatedChats,
-            };
+            const scopeChats = prev[scopeId] ?? [];
+            const isEphemeral = isEphemeralChatScope(scopeId);
+            if (isEphemeral) {
+                for (const old of scopeChats) {
+                    if (old.session_id !== sessionId) {
+                        removeSessionFromScope(scopeId, old.session_id);
+                        if (countSessionReferences(userSwitchKey, old.session_id) === 0) {
+                            deleteSessionBlob(old.session_id);
+                        }
+                    }
+                }
+            }
+            const updatedChats = isEphemeral ? [created] : [created, ...scopeChats];
+            return { ...prev, [scopeId]: updatedChats };
         });
         setCurrentChatIdState(prev => ({ ...prev, [scopeId]: sessionId }));
-        safeLsSet(getCurrentChatIdKey(scopeId), sessionId);
         return sessionId;
     }, [userSwitchKey]);
-    const setCurrentChatId = useCallback((currScopeId, sessionId) => {
-        if (!sessionId)
-            return;
-        setCurrentChatIdState(prev => ({ ...prev, [currScopeId]: sessionId }));
-        safeLsSet(getCurrentChatIdKey(currScopeId), sessionId);
-    }, []);
     const deleteChat = useCallback((scopeId, sessionId) => {
-        const currentKey = getCurrentChatIdKey(scopeId);
+        const scopeChats = chats[scopeId] ?? [];
+        const deletedIndex = scopeChats.findIndex(chat => chat.session_id === sessionId);
+        if (deletedIndex === -1)
+            return;
+        removeSessionFromScope(scopeId, sessionId);
+        if (userSwitchKey != null &&
+            countSessionReferences(userSwitchKey, sessionId) === 0) {
+            deleteSessionBlob(sessionId);
+        }
         setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const deletedIndex = scopeChats.findIndex(c => c.session_id === sessionId);
-            if (deletedIndex === -1) {
-                return prev;
-            }
-            const updatedChats = scopeChats.filter(c => c.session_id !== sessionId);
-            persistChatsToLS(scopeId, updatedChats);
-            setCurrentChatIdState(prevCurr => {
-                if (prevCurr[scopeId] !== sessionId) {
-                    return prevCurr;
-                }
-                const nextId = deletedIndex > 0
-                    ? scopeChats[deletedIndex - 1].session_id
-                    : (updatedChats[0]?.session_id ?? null);
-                if (nextId) {
-                    safeLsSet(currentKey, nextId);
-                }
-                else {
-                    LS.remove(currentKey);
-                }
-                return { ...prevCurr, [scopeId]: nextId };
-            });
-            return { ...prev, [scopeId]: updatedChats };
+            const currentScopeChats = prev[scopeId] ?? [];
+            return {
+                ...prev,
+                [scopeId]: currentScopeChats.filter(chat => chat.session_id !== sessionId),
+            };
         });
-    }, []);
+        setCurrentChatIdState(prevCurr => {
+            if (prevCurr[scopeId] !== sessionId)
+                return prevCurr;
+            const index = loadScopeIndex(scopeId);
+            const nextId = index?.currentSessionId ??
+                (deletedIndex > 0 ? scopeChats[deletedIndex - 1].session_id : null);
+            return { ...prevCurr, [scopeId]: nextId };
+        });
+    }, [chats, userSwitchKey]);
     const addMessage = useCallback((scopeId, chatId, role, text, options) => {
         if (userSwitchKey === null)
             return undefined;
         addScopeIdToRegistry(scopeId);
-        const storedText = stripJsonDashboardFences(text);
+        const storedText = role === MessageRole.ASSISTANT
+            ? normalizeJsonDashboardChatText(text)
+            : stripJsonDashboardFences(text);
         const attachments = role === MessageRole.USER
             ? options?.userTextFileAttachments
             : undefined;
@@ -219,73 +228,52 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
             ...(options?.inProgress ? { inProgress: true } : {}),
             ...(options?.meta ? { meta: { ...options.meta } } : {}),
         };
-        setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const updatedChats = scopeChats.map(chat => {
-                if (chat.session_id === chatId) {
-                    return { ...chat, messages: [...chat.messages, newMessage] };
-                }
-                return chat;
-            });
-            persistChatsToLS(scopeId, updatedChats);
-            return { ...prev, [scopeId]: updatedChats };
-        });
+        setChats(prev => applySessionUpdate(prev, chatId, chat => ({
+            ...chat,
+            messages: [...chat.messages, newMessage],
+        })));
         return newMessage.id;
     }, [userSwitchKey]);
     const removeMessageById = useCallback((scopeId, chatId, messageId) => {
         if (userSwitchKey === null)
             return;
-        setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const updatedChats = scopeChats.map(chat => {
-                if (chat.session_id !== chatId)
-                    return chat;
-                return {
-                    ...chat,
-                    messages: chat.messages.filter(m => m.id !== messageId),
-                };
-            });
-            persistChatsToLS(scopeId, updatedChats);
-            return { ...prev, [scopeId]: updatedChats };
-        });
+        setChats(prev => applySessionUpdate(prev, chatId, chat => ({
+            ...chat,
+            messages: chat.messages.filter(message => message.id !== messageId),
+        })));
     }, [userSwitchKey]);
     const updateMessageById = useCallback((scopeId, chatId, messageId, patch) => {
         if (userSwitchKey === null)
             return;
-        setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const updatedChats = scopeChats.map(chat => {
-                if (chat.session_id !== chatId)
-                    return chat;
-                return {
-                    ...chat,
-                    messages: chat.messages.map(message => {
-                        if (message.id !== messageId)
-                            return message;
-                        const next = { ...message };
-                        if (patch.role != null) {
-                            next.role = patch.role;
-                        }
-                        if (patch.text != null) {
-                            next.text = stripJsonDashboardFences(patch.text);
-                        }
-                        if (patch.inProgress === true) {
-                            next.inProgress = true;
-                        }
-                        else if (patch.inProgress === false ||
-                            (patch.role != null && patch.role !== MessageRole.SYSTEM)) {
-                            delete next.inProgress;
-                        }
-                        if (patch.meta != null) {
-                            next.meta = { ...next.meta, ...patch.meta };
-                        }
-                        return next;
-                    }),
-                };
-            });
-            persistChatsToLS(scopeId, updatedChats);
-            return { ...prev, [scopeId]: updatedChats };
-        });
+        setChats(prev => applySessionUpdate(prev, chatId, chat => ({
+            ...chat,
+            messages: chat.messages.map(message => {
+                if (message.id !== messageId)
+                    return message;
+                const next = { ...message };
+                if (patch.role != null) {
+                    next.role = patch.role;
+                }
+                if (patch.text != null) {
+                    const targetRole = patch.role ?? message.role;
+                    next.text =
+                        targetRole === MessageRole.ASSISTANT
+                            ? normalizeJsonDashboardChatText(patch.text)
+                            : stripJsonDashboardFences(patch.text);
+                }
+                if (patch.inProgress === true) {
+                    next.inProgress = true;
+                }
+                else if (patch.inProgress === false ||
+                    (patch.role != null && patch.role !== MessageRole.SYSTEM)) {
+                    delete next.inProgress;
+                }
+                if (patch.meta != null) {
+                    next.meta = { ...next.meta, ...patch.meta };
+                }
+                return next;
+            }),
+        })));
     }, [userSwitchKey]);
     const setChatMessages = useCallback((scopeId, chatId, messages) => {
         if (userSwitchKey === null)
@@ -293,35 +281,23 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
         addScopeIdToRegistry(scopeId);
         const cloned = messages.map(message => ({
             ...message,
+            text: message.role === MessageRole.ASSISTANT
+                ? message.text
+                : stripJsonDashboardFences(message.text),
             ...(message.meta ? { meta: { ...message.meta } } : {}),
         }));
-        setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const updatedChats = scopeChats.map(chat => {
-                if (chat.session_id !== chatId)
-                    return chat;
-                return { ...chat, messages: cloned };
-            });
-            persistChatsToLS(scopeId, updatedChats);
-            return { ...prev, [scopeId]: updatedChats };
-        });
+        setChats(prev => applySessionUpdate(prev, chatId, chat => ({
+            ...chat,
+            messages: cloned,
+        })));
     }, [userSwitchKey]);
     const updateChatMeta = useCallback((scopeId, chatId, patch) => {
         if (userSwitchKey === null)
             return;
-        setChats(prev => {
-            const scopeChats = prev[scopeId] ?? [];
-            const updatedChats = scopeChats.map(chat => {
-                if (chat.session_id !== chatId)
-                    return chat;
-                return {
-                    ...chat,
-                    meta: { ...chat.meta, ...patch },
-                };
-            });
-            persistChatsToLS(scopeId, updatedChats);
-            return { ...prev, [scopeId]: updatedChats };
-        });
+        setChats(prev => applySessionUpdate(prev, chatId, chat => ({
+            ...chat,
+            meta: { ...chat.meta, ...patch },
+        })));
     }, [userSwitchKey]);
     const sendMessage = useCallback(async (scopeId, message, chatId) => {
         const targetChatId = chatId ?? getCurrentChatId(scopeId);
@@ -350,15 +326,11 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
                 data.session_id && data.session_id !== pendingChatSessionId
                     ? data.session_id
                     : pendingChatSessionId;
-            if (data.session_id && data.session_id !== pendingChatSessionId) {
-                setChats(prev => {
-                    const scopeChats = prev[scopeId] ?? [];
-                    const updatedChats = scopeChats.map(chat => chat.session_id === pendingChatSessionId
-                        ? { ...chat, session_id: data.session_id }
-                        : chat);
-                    persistChatsToLS(scopeId, updatedChats);
-                    return { ...prev, [scopeId]: updatedChats };
-                });
+            if (data.session_id &&
+                data.session_id !== pendingChatSessionId &&
+                userSwitchKey != null) {
+                renameSessionId(userSwitchKey, pendingChatSessionId, data.session_id);
+                setChats(prev => remapSessionIdInMemory(prev, pendingChatSessionId, data.session_id));
                 setCurrentChatId(scopeId, data.session_id);
             }
             if (progressMessageId) {
@@ -389,6 +361,7 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
         getCurrentChatId,
         sendChatMessageFn,
         setCurrentChatId,
+        userSwitchKey,
     ]);
     useEffect(() => {
         if (userSwitchKey === null) {
@@ -398,7 +371,7 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
             setPanelBusyCount(0);
             return;
         }
-        const loaded = loadChatsFromLS(userSwitchKey);
+        const loaded = loadChatsFromSessionStorage(userSwitchKey);
         const updatedCurrentChatId = { ...loaded.currentChatId };
         for (const [scopeId, scopeChats] of Object.entries(loaded.chats)) {
             if (scopeChats.length > 0 &&
@@ -412,6 +385,7 @@ function ChatProvider({ children, userSwitchKey, sendChatMessage: sendChatMessag
     }, [userSwitchKey]);
     return (jsx(ChatContext.Provider, { value: {
             newChat,
+            linkSessionToScope: linkSessionToScope$1,
             setCurrentChatId,
             addMessage,
             removeMessageById,
@@ -478,7 +452,7 @@ function useSyncChatPanelBusy(isLoading) {
     }, [isLoading, acquirePanelBusy, releasePanelBusy]);
 }
 function useChatsForScopeId(scopeId) {
-    const { getChatsForScopeId, getCurrentChatId, setCurrentChatId, newChat, addMessage, removeMessageById, updateMessageById, updateChatMeta, setChatMessages, sendMessage, deleteChat, } = useChats();
+    const { getChatsForScopeId, getCurrentChatId, setCurrentChatId, newChat, linkSessionToScope, addMessage, removeMessageById, updateMessageById, updateChatMeta, setChatMessages, sendMessage, deleteChat, } = useChats();
     const chats = getChatsForScopeId(scopeId);
     const currentChatId = getCurrentChatId(scopeId);
     const currentChat = useChat(scopeId, currentChatId ?? undefined);
@@ -489,6 +463,7 @@ function useChatsForScopeId(scopeId) {
         currentChatId,
         isOutboundPending,
         setCurrentChatId: (targetId) => setCurrentChatId(scopeId, targetId),
+        linkSessionToScope: (sessionId, options) => linkSessionToScope(scopeId, sessionId, options),
         newChat: (options) => newChat(scopeId, options),
         addMessage: (chatId, role, text, options) => addMessage(scopeId, chatId, role, text, options),
         removeMessageById: (chatId, messageId) => removeMessageById(scopeId, chatId, messageId),