@quillsql/admin 1.8.7 → 1.8.8

package/dist/index.js

@@ -8165,32 +8165,140 @@ import {
   useEffect as useEffect14,
   useState as useState14
 } from "react";
-var AgentChatContext = createContext2(null);
-var WELCOME_MESSAGE = "I'm your Quill BI Agent. I can create dashboards, reports, virtual tables, run queries, and manage environments \u2014 all through conversation.\n\nI'm working in a sandbox copy of your environment, so nothing affects production until you promote your changes.";
-var SESSION_STORAGE_KEY = "quill-agent-session";
-function hydrateSession() {
+
+// src/utils/sandboxStorage.ts
+var SANDBOX_STORAGE_KEY = "quill-sandbox-session";
+var LEGACY_SESSION_STORAGE_KEY = "quill-agent-session";
+function parsePersistedSandbox(raw) {
+  if (!raw) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed?.clerkOrgId && parsed?.sandboxSessionId && parsed?.sandboxClientId && parsed?.session?.sessionId) {
+      return parsed;
+    }
+  } catch {
+  }
+  return null;
+}
+function readPersistedSandboxRaw() {
   if (typeof window === "undefined") {
     return null;
   }
+  return parsePersistedSandbox(
+    window.localStorage.getItem(SANDBOX_STORAGE_KEY)
+  );
+}
+function readLegacySandboxSession(clerkOrgId) {
   try {
-    const raw = window.sessionStorage.getItem(SESSION_STORAGE_KEY);
-    if (!raw) return null;
-    const parsed = JSON.parse(raw);
-    if (parsed?.session?.sessionId && parsed?.session?.sandboxClientId) {
-      return parsed.session;
-    }
+    const legacyRaw = window.sessionStorage.getItem(LEGACY_SESSION_STORAGE_KEY);
+    if (!legacyRaw) return null;
+    const legacy = JSON.parse(legacyRaw);
+    const session = legacy?.session;
+    if (!session?.sessionId || !session.sandboxClientId) return null;
+    return {
+      clerkOrgId,
+      sandboxParentClientId: session.sourceClientId,
+      sandboxClientId: session.sandboxClientId,
+      sandboxSessionId: session.sessionId,
+      session,
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
   } catch {
+    return null;
+  }
+}
+function resolveSandboxSession(clerkOrgId) {
+  if (typeof window === "undefined") {
+    return null;
+  }
+  const fromLocal = readPersistedSandboxRaw();
+  if (fromLocal) {
+    if (!clerkOrgId || fromLocal.clerkOrgId === clerkOrgId) {
+      return fromLocal;
+    }
+    return null;
+  }
+  if (!clerkOrgId) {
+    return null;
+  }
+  return readLegacySandboxSession(clerkOrgId);
+}
+function writeSandboxSession(payload) {
+  if (typeof window === "undefined") return;
+  window.localStorage.setItem(
+    SANDBOX_STORAGE_KEY,
+    JSON.stringify({ ...payload, updatedAt: (/* @__PURE__ */ new Date()).toISOString() })
+  );
+  window.sessionStorage.removeItem(LEGACY_SESSION_STORAGE_KEY);
+}
+function clearSandboxSession() {
+  if (typeof window === "undefined") return;
+  window.localStorage.removeItem(SANDBOX_STORAGE_KEY);
+  window.sessionStorage.removeItem(LEGACY_SESSION_STORAGE_KEY);
+}
+function clearQuillSandboxStorage() {
+  clearSandboxSession();
+}
+function subscribeSandboxSession(onChange) {
+  if (typeof window === "undefined") {
+    return () => {
+    };
+  }
+  const handler = (event) => {
+    if (event.key !== SANDBOX_STORAGE_KEY) return;
+    onChange(parsePersistedSandbox(event.newValue));
+  };
+  window.addEventListener("storage", handler);
+  return () => window.removeEventListener("storage", handler);
+}
+function sandboxFieldsFromSession(sessionInfo, resultClient) {
+  return {
+    sandboxParentClientId: String(
+      resultClient?.sandboxParentClientId ?? sessionInfo.sourceClientId
+    ),
+    sandboxClientId: String(sessionInfo.sandboxClientId),
+    sandboxSessionId: String(sessionInfo.sessionId)
+  };
+}
+function persistSandboxFromSessionInfo(scopeId, sessionInfo, resultClient) {
+  if (!scopeId) return;
+  const fields = sandboxFieldsFromSession(sessionInfo, resultClient);
+  writeSandboxSession({
+    clerkOrgId: scopeId,
+    ...fields,
+    session: sessionInfo,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+function getSandboxStorageScopeId(...candidates) {
+  for (const candidate of candidates) {
+    if (candidate) return candidate;
   }
   return null;
 }
-function useAgentChatRootState() {
+
+// src/components/AgentChat/AgentChatContext.tsx
+var AgentChatContext = createContext2(null);
+var WELCOME_MESSAGE = "I'm your Quill BI Agent. I can create dashboards, reports, virtual tables, run queries, and manage environments \u2014 all through conversation.\n\nI'm working in a sandbox copy of your environment, so nothing affects production until you promote your changes.";
+function hydrateSessionFromStorage(clerkOrgId) {
+  return resolveSandboxSession(clerkOrgId)?.session ?? null;
+}
+function useAgentChatRootState(clerkOrgId) {
   const [messages, setMessages] = useState14([
     { role: "assistant", content: WELCOME_MESSAGE, isWelcome: true }
   ]);
-  const [initialSession] = useState14(hydrateSession);
-  const [session, setSessionRaw] = useState14(initialSession);
+  const [session, setSessionRaw] = useState14(
+    () => hydrateSessionFromStorage(clerkOrgId)
+  );
   const [showToolOutputs, setShowToolOutputs] = useState14(false);
   const [changelogEntries, setChangelogEntriesState] = useState14([]);
+  useEffect14(() => {
+    if (!clerkOrgId) return;
+    const stored = resolveSandboxSession(clerkOrgId);
+    if (stored?.session) {
+      setSessionRaw((prev) => prev ?? stored.session);
+    }
+  }, [clerkOrgId]);
   const setChangelogEntries = useCallback3((entries) => {
     setChangelogEntriesState(entries);
   }, []);
@@ -8203,17 +8311,6 @@ function useAgentChatRootState() {
       return next;
     });
   }, []);
-  useEffect14(() => {
-    if (typeof window === "undefined") return;
-    if (session) {
-      window.sessionStorage.setItem(
-        SESSION_STORAGE_KEY,
-        JSON.stringify({ session })
-      );
-    } else {
-      window.sessionStorage.removeItem(SESSION_STORAGE_KEY);
-    }
-  }, [session]);
   return {
     messages,
     setMessages,
@@ -8472,7 +8569,7 @@ function AdminProvider({
   onRequestAddVirtualTable,
   hideEnvDropdown
 }) {
-  const agentChatState = useAgentChatRootState();
+  const agentChatState = useAgentChatRootState(clerkOrgId);
   const refreshChangelogRef = useRef10(null);
   const registerChangelogRefresh = useCallback4(
     (fn) => {
@@ -8482,6 +8579,7 @@ function AdminProvider({
   );
   const [clientLoading, setClientLoading] = useState15(true);
   const currentFetchingClientRef = useRef10(void 0);
+  const previousClerkOrgIdRef = useRef10(void 0);
   const [schemaLoading, setSchemaLoading] = useState15(false);
   const [error, setError] = useState15(null);
   const publicKeyRef = useRef10(void 0);
@@ -8556,6 +8654,21 @@ function AdminProvider({
       sandboxSessionId: null
     };
   };
+  const mergeSandboxIntoState = (baseState, orgId) => {
+    const storedSandbox = resolveSandboxSession(
+      orgId ?? clerkOrgId ?? baseState.clerkOrgId
+    );
+    if (!storedSandbox) {
+      return baseState;
+    }
+    return {
+      ...baseState,
+      clerkOrgId: storedSandbox.clerkOrgId || baseState.clerkOrgId,
+      sandboxParentClientId: storedSandbox.sandboxParentClientId,
+      sandboxClientId: storedSandbox.sandboxClientId,
+      sandboxSessionId: storedSandbox.sandboxSessionId
+    };
+  };
   const hydrateStateFromSessionStorage = () => {
     if (typeof window === "undefined") {
       return null;
@@ -8566,7 +8679,8 @@ function AdminProvider({
       );
       if (clerkOrgId && localState?.clerkOrgId === clerkOrgId) {
         const parsedState = parsedSessionStorageAdminState(localState);
-        return {
+        const storedSandbox2 = resolveSandboxSession(clerkOrgId);
+        return mergeSandboxIntoState({
           ...parsedState,
           queryEndpoint,
           isSelfHosted: !QUILL_ENDPOINTS.includes(
@@ -8575,10 +8689,14 @@ function AdminProvider({
           queryHeaders: queryHeaders !== void 0 ? queryHeaders : parsedState.queryHeaders,
           withCredentials: withCredentials !== void 0 ? withCredentials : parsedState.withCredentials,
           hideEnvDropdown: hideEnvDropdown !== void 0 ? hideEnvDropdown : parsedState.hideEnvDropdown ?? false,
-          sandboxParentClientId: parsedState.sandboxParentClientId ?? null,
-          sandboxClientId: parsedState.sandboxClientId ?? null,
-          sandboxSessionId: parsedState.sandboxSessionId ?? null
-        };
+          sandboxParentClientId: storedSandbox2?.sandboxParentClientId ?? parsedState.sandboxParentClientId ?? null,
+          sandboxClientId: storedSandbox2?.sandboxClientId ?? parsedState.sandboxClientId ?? null,
+          sandboxSessionId: storedSandbox2?.sandboxSessionId ?? parsedState.sandboxSessionId ?? null
+        });
+      }
+      if (clerkOrgId && localState?.clerkOrgId && localState.clerkOrgId !== clerkOrgId) {
+        window.sessionStorage.removeItem("quill-adminState");
+        window.sessionStorage.removeItem("quill-client");
       }
     } catch (error2) {
       console.warn(
@@ -8586,8 +8704,14 @@ function AdminProvider({
         error2
       );
     }
-    window.sessionStorage.removeItem("quill-adminState");
-    window.sessionStorage.removeItem("quill-client");
+    const storedSandbox = resolveSandboxSession(clerkOrgId);
+    if (storedSandbox) {
+      return mergeSandboxIntoState(buildDefaultState());
+    }
+    const storedWithoutOrg = resolveSandboxSession(null);
+    if (storedWithoutOrg) {
+      return mergeSandboxIntoState(buildDefaultState());
+    }
     return null;
   };
   const initialState = useMemo7(() => {
@@ -8631,7 +8755,12 @@ function AdminProvider({
         return;
       }
       const activeClientId = state.client?._id ?? state.client?.id ?? state.client?.publicKey ?? state.client?.clientId;
-      if (!forceRefresh && !resetSandbox && activeClientId != null && String(activeClientId) === String(targetClientId)) {
+      const targetClientIdString = String(targetClientId);
+      const sandboxClientId = state.sandboxClientId ? String(state.sandboxClientId) : null;
+      const sandboxParentClientId = state.sandboxParentClientId ? String(state.sandboxParentClientId) : null;
+      const switchingOutsideSandbox = !!state.sandboxSessionId && targetClientIdString !== sandboxClientId && targetClientIdString !== sandboxParentClientId;
+      const shouldResetSandbox = !!resetSandbox || switchingOutsideSandbox;
+      if (!forceRefresh && !shouldResetSandbox && activeClientId != null && String(activeClientId) === String(targetClientId)) {
         return;
       }
       setClientLoading(true);
@@ -8639,7 +8768,7 @@ function AdminProvider({
         targetClientId,
         false,
         preserveSelectedDashboard,
-        resetSandbox
+        shouldResetSandbox
       );
       return;
     }
@@ -8776,11 +8905,15 @@ function AdminProvider({
     setClientLoading(true);
     currentFetchingClientRef.current = publicKey2;
     const requestedClientId = String(publicKey2);
-    const sandboxClientId = state.sandboxClientId != null ? String(state.sandboxClientId) : null;
-    const sandboxParentClientId = state.sandboxParentClientId != null ? String(state.sandboxParentClientId) : null;
-    const loadingExistingSandbox = loadSandbox && !resetSandbox && !!sandboxClientId && (requestedClientId === sandboxClientId || requestedClientId === sandboxParentClientId);
+    const storedSandbox = resolveSandboxSession(clerkOrgId ?? state.clerkOrgId);
+    const sandboxClientId = state.sandboxClientId != null ? String(state.sandboxClientId) : storedSandbox?.sandboxClientId ?? null;
+    const sandboxParentClientId = state.sandboxParentClientId != null ? String(state.sandboxParentClientId) : storedSandbox?.sandboxParentClientId ?? null;
+    const sandboxSessionId = state.sandboxSessionId ?? storedSandbox?.sandboxSessionId ?? null;
+    const loadingExistingSandbox = loadSandbox && !resetSandbox && !!sandboxClientId && !!sandboxSessionId && (requestedClientId === sandboxClientId || requestedClientId === sandboxParentClientId);
+    const requestClientId = loadingExistingSandbox ? sandboxParentClientId ?? publicKey2 : publicKey2;
     if (resetSandbox) {
       agentChatState.clearChangelogEntries();
+      clearSandboxSession();
     }
     try {
       const data = await quillFetchWithToken({
@@ -8788,14 +8921,14 @@ function AdminProvider({
           queryEndpoint,
           queryHeaders,
           withCredentials: !!state.withCredentials,
-          clientId: publicKey2
+          clientId: requestClientId
         },
         task: "client",
         metadata: {
-          clientId: loadingExistingSandbox ? sandboxParentClientId ?? publicKey2 : publicKey2,
+          clientId: loadingExistingSandbox ? sandboxParentClientId ?? requestClientId : requestClientId,
           fetchDefaultDashboard: true,
           sandboxClientId: loadingExistingSandbox ? sandboxClientId : void 0,
-          sandboxSessionId: loadingExistingSandbox ? state.sandboxSessionId ?? void 0 : void 0,
+          sandboxSessionId: loadingExistingSandbox ? sandboxSessionId ?? void 0 : void 0,
           ...loadSandbox ? { loadSandbox: true } : {},
           ...resetSandbox ? { resetSandbox: true } : {}
         },
@@ -8829,11 +8962,11 @@ function AdminProvider({
             queryEndpoint,
             queryHeaders,
             withCredentials: !!state.withCredentials,
-            clientId: publicKey2
+            clientId: requestClientId
           },
           task: "clients",
           metadata: {
-            clientId: publicKey2
+            clientId: requestClientId
           },
           adminMode: true
         }) : Promise.resolve(void 0)
@@ -8852,9 +8985,48 @@ function AdminProvider({
         });
       }
       const sessionInfo = buildSessionInfo(result, publicKey2);
-      agentChatState.setSession(sessionInfo);
+      if (sessionInfo) {
+        agentChatState.setSession(sessionInfo);
+        const sandboxFields = sandboxFieldsFromSession(sessionInfo, result.client);
+        dispatch({
+          type: "SET_SANDBOX_FIELDS",
+          payload: sandboxFields
+        });
+        persistSandboxFromSessionInfo(
+          getSandboxStorageScopeId(
+            clerkOrgId,
+            state.clerkOrgId,
+            publicKey2
+          ),
+          sessionInfo,
+          result.client
+        );
+      } else if (resetSandbox) {
+        agentChatState.setSession(null);
+        dispatch({
+          type: "SET_SANDBOX_FIELDS",
+          payload: {
+            sandboxParentClientId: null,
+            sandboxClientId: null,
+            sandboxSessionId: null
+          }
+        });
+      } else {
+        const preservedSandbox = storedSandbox ?? resolveSandboxSession(clerkOrgId ?? state.clerkOrgId);
+        if (preservedSandbox) {
+          dispatch({
+            type: "SET_SANDBOX_FIELDS",
+            payload: {
+              sandboxParentClientId: preservedSandbox.sandboxParentClientId,
+              sandboxClientId: preservedSandbox.sandboxClientId,
+              sandboxSessionId: preservedSandbox.sandboxSessionId
+            }
+          });
+          agentChatState.setSession((prev) => prev ?? preservedSandbox.session);
+        }
+      }
       if (typeof window !== "undefined" && clerkOrgId) {
-        const sourceClientId = sessionInfo?.sourceClientId ?? requestedClientId;
+        const sourceClientId = sessionInfo?.sourceClientId ?? storedSandbox?.sandboxParentClientId ?? requestedClientId;
         window.sessionStorage.setItem(
           "quill-client",
           JSON.stringify({
@@ -8863,16 +9035,6 @@ function AdminProvider({
           })
         );
       }
-      dispatch({
-        type: "SET_SANDBOX_FIELDS",
-        payload: {
-          sandboxParentClientId: sessionInfo ? String(
-            result.client.sandboxParentClientId ?? sessionInfo.sourceClientId
-          ) : null,
-          sandboxClientId: sessionInfo?.sandboxClientId ?? null,
-          sandboxSessionId: sessionInfo?.sessionId ?? null
-        }
-      });
       setClient({
         ...result.client,
         queryEndpoint: result.client.queryEndpoint ?? queryEndpoint,
@@ -8942,12 +9104,123 @@ function AdminProvider({
       dispatch({ type: "SET_CLERK_ORG_ID", payload: clerkOrgId });
     }
   }, [clerkOrgId]);
+  useEffect16(() => {
+    const previousClerkOrgId = previousClerkOrgIdRef.current;
+    const currentClerkOrgId = clerkOrgId ?? null;
+    if (previousClerkOrgId !== void 0 && previousClerkOrgId !== currentClerkOrgId) {
+      clearSandboxSession();
+      agentChatState.setSession(null);
+      agentChatState.clearChangelogEntries();
+      dispatch({
+        type: "SET_SANDBOX_FIELDS",
+        payload: {
+          sandboxParentClientId: null,
+          sandboxClientId: null,
+          sandboxSessionId: null
+        }
+      });
+    }
+    previousClerkOrgIdRef.current = currentClerkOrgId;
+  }, [clerkOrgId, agentChatState.setSession, agentChatState.clearChangelogEntries]);
+  useEffect16(() => {
+    if (!clerkOrgId) return;
+    const storedSandbox = resolveSandboxSession(clerkOrgId);
+    if (!storedSandbox) return;
+    if (!state.sandboxSessionId || state.sandboxSessionId !== storedSandbox.sandboxSessionId) {
+      dispatch({
+        type: "SET_SANDBOX_FIELDS",
+        payload: {
+          sandboxParentClientId: storedSandbox.sandboxParentClientId,
+          sandboxClientId: storedSandbox.sandboxClientId,
+          sandboxSessionId: storedSandbox.sandboxSessionId
+        }
+      });
+    }
+    agentChatState.setSession((prev) => prev ?? storedSandbox.session);
+  }, [clerkOrgId]);
+  useEffect16(() => {
+    if (!clerkOrgId) return;
+    return subscribeSandboxSession((stored) => {
+      if (!stored || stored.clerkOrgId !== clerkOrgId) {
+        dispatch({
+          type: "SET_SANDBOX_FIELDS",
+          payload: {
+            sandboxParentClientId: null,
+            sandboxClientId: null,
+            sandboxSessionId: null
+          }
+        });
+        agentChatState.setSession(null);
+        agentChatState.clearChangelogEntries();
+        return;
+      }
+      dispatch({
+        type: "SET_SANDBOX_FIELDS",
+        payload: {
+          sandboxParentClientId: stored.sandboxParentClientId,
+          sandboxClientId: stored.sandboxClientId,
+          sandboxSessionId: stored.sandboxSessionId
+        }
+      });
+      agentChatState.setSession(stored.session);
+    });
+  }, [clerkOrgId, agentChatState.setSession, agentChatState.clearChangelogEntries]);
+  useEffect16(() => {
+    const scopeId = getSandboxStorageScopeId(
+      clerkOrgId,
+      state.clerkOrgId,
+      publicKey
+    );
+    const session = agentChatState.session;
+    const sessionId = session?.sessionId ?? state.sandboxSessionId;
+    const sandboxClientId = session?.sandboxClientId ?? state.sandboxClientId ?? null;
+    const sourceClientId = session?.sourceClientId ?? state.sandboxParentClientId ?? null;
+    if (!scopeId || !sessionId || !sandboxClientId || !sourceClientId) {
+      return;
+    }
+    const sessionPayload = session ?? {
+      sessionId,
+      sourceClientId,
+      sourceClientName: "",
+      sandboxClientId,
+      sandboxClientName: "",
+      status: "active"
+    };
+    persistSandboxFromSessionInfo(scopeId, sessionPayload, {
+      sandboxParentClientId: sourceClientId
+    });
+  }, [
+    clerkOrgId,
+    publicKey,
+    state.clerkOrgId,
+    state.sandboxParentClientId,
+    state.sandboxClientId,
+    state.sandboxSessionId,
+    agentChatState.session
+  ]);
   useEffect16(() => {
     if (typeof window === "undefined") {
       return;
     }
+    const storedSandbox = resolveSandboxSession(clerkOrgId ?? state.clerkOrgId);
+    if (storedSandbox) {
+      if (!state.sandboxSessionId || state.sandboxSessionId !== storedSandbox.sandboxSessionId) {
+        dispatch({
+          type: "SET_SANDBOX_FIELDS",
+          payload: {
+            sandboxParentClientId: storedSandbox.sandboxParentClientId,
+            sandboxClientId: storedSandbox.sandboxClientId,
+            sandboxSessionId: storedSandbox.sandboxSessionId
+          }
+        });
+      }
+      agentChatState.setSession((prev) => prev ?? storedSandbox.session);
+    }
     if (publicKeyRef.current !== publicKey) {
-      dispatch({ type: "SET_ALL_STATE", payload: initialState });
+      dispatch({
+        type: "SET_ALL_STATE",
+        payload: storedSandbox ? mergeSandboxIntoState(initialState, clerkOrgId) : initialState
+      });
       publicKeyRef.current = publicKey;
     }
     const client = JSON.parse(
@@ -8957,8 +9230,7 @@ function AdminProvider({
     if (client && client.clerkOrgId === clerkOrgId) {
       overridePublicKey = client.id || client._id || client.publicKey;
     }
-    const hydratedClientId = state.sandboxParentClientId || state.client?.id || state.client?._id || state.client?.clientId || state.client?.publicKey;
-    const fetchPublicKey = overridePublicKey || hydratedClientId || publicKey;
+    const fetchPublicKey = overridePublicKey || storedSandbox?.sandboxParentClientId || state.sandboxParentClientId || state.client?.id || state.client?._id || state.client?.clientId || state.client?.publicKey || publicKey;
     if (!fetchPublicKey) {
       setClientLoading(false);
       currentFetchingClientRef.current = void 0;
@@ -8966,7 +9238,7 @@ function AdminProvider({
       if (currentFetchingClientRef.current === fetchPublicKey) return;
       fetchClient(fetchPublicKey, true);
     }
-  }, [publicKey]);
+  }, [publicKey, clerkOrgId]);
   useEffect16(() => {
     if (typeof window === "undefined") {
       return;
@@ -26520,8 +26792,39 @@ function DashboardSelectPopover({
 import { useEffect as useEffect32, useRef as useRef23, useState as useState35 } from "react";
 import { Resizable as Resizable2 } from "re-resizable";
 
+// src/hooks/useSandboxSession.ts
+import { useMemo as useMemo20 } from "react";
+function useSandboxSession() {
+  const { state } = useAdmin();
+  const { session } = useAgentChat();
+  return useMemo20(() => {
+    const sessionId = session?.sessionId ?? state.sandboxSessionId ?? null;
+    const sandboxClientId = session?.sandboxClientId ?? state.sandboxClientId ?? null;
+    const sourceClientId = session?.sourceClientId ?? state.sandboxParentClientId ?? null;
+    const mergedSession = session ?? (sessionId && sandboxClientId && sourceClientId ? {
+      sessionId,
+      sourceClientId,
+      sourceClientName: "",
+      sandboxClientId,
+      sandboxClientName: "",
+      status: "active"
+    } : null);
+    return {
+      sessionId,
+      sandboxClientId,
+      sourceClientId,
+      session: mergedSession
+    };
+  }, [
+    session,
+    state.sandboxSessionId,
+    state.sandboxClientId,
+    state.sandboxParentClientId
+  ]);
+}
+
 // src/components/AgentChat/AgentChat.tsx
-import { memo as memo2, useEffect as useEffect31, useMemo as useMemo20, useRef as useRef22, useState as useState34 } from "react";
+import { memo as memo2, useEffect as useEffect31, useMemo as useMemo21, useRef as useRef22, useState as useState34 } from "react";
 
 // src/components/AgentChat/agentChatMarkdownCss.ts
 var AGENT_CHAT_MARKDOWN_STYLE_ID = "quillsql-agent-chat-markdown";
@@ -27508,7 +27811,7 @@ function AgentChat({
   const { schema: allTableData } = useDatabaseSchema();
   const { allReportsById } = useAllReports2();
   const { data: virtualTables } = useVirtualTables();
-  const changelogDiffs = useMemo20(
+  const changelogDiffs = useMemo21(
     () => changelogEntries.flatMap((entry) => {
       const diff = parseDiffEntry(entry);
       return diff ? [diff] : [];
@@ -27592,6 +27895,7 @@ function AgentChat({
     setMessages((prev) => prev.filter((m3) => m3.isWelcome));
     setSession(null);
     clearChangelogEntries();
+    clearSandboxSession();
     const activeClientId = getActiveClientId(state.client);
     const sourceId = sourceClientId || state.sandboxParentClientId || activeClientId || null;
     if (!sourceId) return;
@@ -28339,14 +28643,17 @@ function AgentChatPanel() {
   const {
     messages,
     setMessages,
-    session,
     setSession,
     showToolOutputs,
     setShowToolOutputs,
     clearChangelogEntries
   } = useAgentChat();
-  const sourceClientId = state.sandboxParentClientId;
-  const sandboxClientId = state.sandboxClientId ?? session?.sandboxClientId ?? null;
+  const {
+    sessionId,
+    sandboxClientId,
+    sourceClientId,
+    session
+  } = useSandboxSession();
   const [collapsed, setCollapsed] = useState35(false);
   const minWidth = typeof window !== "undefined" ? Math.max(DEFAULT_MIN_WIDTH, window.innerWidth * DEFAULT_WIDTH_FRACTION) : 480;
   const [width, setWidth] = useState35(
@@ -28364,13 +28671,20 @@ function AgentChatPanel() {
     if (!prev || !clientId || prev === clientId) return;
     if (sandboxClientId && clientId === sandboxClientId) return;
     if (sourceClientId && clientId === sourceClientId) return;
+    if (state.sandboxSessionId && (clientId === state.sandboxClientId || clientId === state.sandboxParentClientId)) {
+      return;
+    }
     setMessages((prev2) => prev2.filter((m3) => m3.isWelcome));
     setSession(null);
     clearChangelogEntries();
+    clearSandboxSession();
   }, [
     clientId,
     sandboxClientId,
     sourceClientId,
+    state.sandboxSessionId,
+    state.sandboxClientId,
+    state.sandboxParentClientId,
     setMessages,
     setSession,
     clearChangelogEntries
@@ -28670,9 +28984,9 @@ function AgentChatPanel() {
                     children: clientId && /* @__PURE__ */ jsx63(
                       AgentChat,
                       {
-                        agentSessionId: session?.sessionId ?? "",
+                        agentSessionId: sessionId ?? "",
                         sandboxClientId: sandboxClientId ?? "",
-                        sourceClientId: session?.sourceClientId ?? sourceClientId ?? "",
+                        sourceClientId: sourceClientId ?? "",
                         getToken: async () => await getToken() || ""
                       }
                     )
@@ -29605,7 +29919,7 @@ function DashboardManager({
 import {
   useCallback as useCallback11,
   useEffect as useEffect35,
-  useMemo as useMemo22,
+  useMemo as useMemo23,
   useRef as useRef27,
   useState as useState39
 } from "react";
@@ -29616,7 +29930,7 @@ import {
   Table as Table3,
   SchemaListComponent as SchemaListComponent2
 } from "@quillsql/react";
-import { useEffect as useEffect34, useMemo as useMemo21, useRef as useRef26, useState as useState38 } from "react";
+import { useEffect as useEffect34, useMemo as useMemo22, useRef as useRef26, useState as useState38 } from "react";
 
 // src/modals/TenantFieldModal.tsx
 import { Fragment as Fragment21, jsx as jsx67, jsxs as jsxs52 } from "react/jsx-runtime";
@@ -29893,7 +30207,7 @@ function CreateEditVirtualTable({
       override
     );
   };
-  const dashboardOwnerTenants = useMemo21(() => {
+  const dashboardOwnerTenants = useMemo22(() => {
     return client.allTenantTypes?.filter((t2) => client.ownerTenantFields?.includes(t2.tenantField)).filter((t2) => t2.tenantField !== SINGLE_TENANT);
   }, [client.ownerTenantFields, client.allTenantTypes]);
   useEffect34(() => {
@@ -30436,7 +30750,7 @@ ${duplicateColumns.join("\n")}`
 }
 
 // src/utils/dataEditor.tsx
-var editVirtualTable = async (editName, editViewQuery, editViewId, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
+var editVirtualTable = async (editName, editViewQuery, editViewId, description, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
   if (!editName.length) {
     alert("Please enter a table name.");
     return;
@@ -30462,6 +30776,7 @@ var editVirtualTable = async (editName, editViewQuery, editViewId, customFieldIn
       name: editName,
       customFieldInfo,
       id: editViewId,
+      description,
       clientId: state.client._id,
       runQueryConfig: { getColumns: true },
       databaseType: state.client.databaseType,
@@ -30472,7 +30787,7 @@ var editVirtualTable = async (editName, editViewQuery, editViewId, customFieldIn
     getToken
   });
 };
-var addVirtualTable = async (name, editViewQuery, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
+var addVirtualTable = async (name, editViewQuery, description, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
   if (!name.length) {
     alert("Please enter a table name.");
     return;
@@ -30493,6 +30808,7 @@ var addVirtualTable = async (name, editViewQuery, customFieldInfo, state, ownerT
       preQueries: [editViewQuery.replace(/;/, "")],
       customFieldInfo,
       name,
+      description,
       clientId: state.client._id,
       runQueryConfig: { getColumns: true },
       databaseType: state.client.databaseType,
@@ -30657,6 +30973,7 @@ function VirtualTableManager({
   const [editQueryView, setEditQueryView] = useState39(false);
   const [editVirtualTableId, setEditVirtualTableId] = useState39("");
   const [editName, setEditName] = useState39("");
+  const [editDescription, setEditDescription] = useState39("");
   const [editError, setEditError] = useState39();
   const [editVirtualTableQuery, setEditVirtualTableQuery] = useState39("");
   const [
@@ -30694,11 +31011,13 @@ function VirtualTableManager({
   const closeEditModal = () => {
     setEditModalIsOpen(false);
     setEditName("");
+    setEditDescription("");
     setEditVirtualTableQuery("");
     setCustomFieldInfo(void 0);
   };
   const clickTableCell = (table, suppressModal = false) => {
     setEditName(table.name);
+    setEditDescription(table.description ?? "");
     setEditVirtualTableQuery(table.viewQuery);
     setEditVirtualTableOwnerTenantFields(table.ownerTenantFields ?? []);
     setEditVirtualTableId(table._id);
@@ -30771,7 +31090,7 @@ function VirtualTableManager({
       document.body.style.overflow = prevOverflow;
     };
   }, [showVirtualTableEditorPortal]);
-  const handleModalSubmit = async (submitRequest, query, ownerTenantFields, name, id, columns, customFieldInfo2, override) => {
+  const handleModalSubmit = async (submitRequest, query, ownerTenantFields, name, description, id, columns, customFieldInfo2, override) => {
     if (override) {
       setNoCustomerField(true);
     } else {
@@ -30811,6 +31130,7 @@ ${duplicateColumns.join("\n")}`
           submitResponse = await addVirtualTable(
             trimmedName,
             query,
+            description,
             customFieldInfo2,
             state,
             ownerTenantFields,
@@ -30847,43 +31167,45 @@ ${errorColumns.length > 1 ? "They" : "It"} will be deleted off of the referencin
                   return;
               }
             } else {
-              const referencedTableInfo = referencedTablesMap[prevTableName].map((info) => {
-                return `"${info.reportName}" on the "${info.dashboardName}" dashboard`;
-              });
-              if (referenceFiltersMap?.[prevTableName]) {
-                const referencedFilterInfo = referenceFiltersMap[prevTableName].map((info) => {
-                  return `${info.dashboardName} - ${info.filterField}`;
+              if (prevTableName !== trimmedName) {
+                const referencedTableInfo = referencedTablesMap[prevTableName].map((info) => {
+                  return `"${info.reportName}" on the "${info.dashboardName}" dashboard`;
                 });
-                alert(
-                  `Warning
+                if (referenceFiltersMap?.[prevTableName]) {
+                  const referencedFilterInfo = referenceFiltersMap[prevTableName].map((info) => {
+                    return `${info.dashboardName} - ${info.filterField}`;
+                  });
+                  alert(
+                    `Warning
 
 '${prevTableName}' is referenced in the following dashboard filters: 
 
 ${referencedFilterInfo.join(
-                    "\n"
-                  )} 
+                      "\n"
+                    )} 
 
 Please delete those filters before renaming this virtual table.`
-                );
-                return;
-              }
-              if (table && table.broken) {
+                  );
+                  return;
+                }
+                if (table && table.broken) {
+                  alert(
+                    "Error\n\nThis virtual table has an invalid query. Please fix the query before renaming it."
+                  );
+                  return;
+                }
                 alert(
-                  "Error\n\nThis virtual table has an invalid query. Please fix the query before renaming it."
-                );
-                return;
-              }
-              alert(
-                `Warning
+                  `Warning
 
 '${prevTableName}' is referenced by: 
 ${referencedTableInfo.join(
-                  "\n"
-                )} 
+                    "\n"
+                  )} 
 
 Please delete those charts before renaming this virtual table.`
-              );
-              return;
+                );
+                return;
+              }
             }
           }
           if (!trimmedName) {
@@ -30913,6 +31235,7 @@ ${duplicateColumns.join("\n")}`
             trimmedName,
             query,
             id,
+            description,
             customFieldInfo2,
             state,
             ownerTenantFields,
@@ -31014,7 +31337,7 @@ Please delete those filters before deleting this table.`
     await reloadTables();
     return response;
   };
-  const handleEditAddView = async (request, query, ownerTenantFields, name, id, columns, override) => {
+  const handleEditAddView = async (request, query, ownerTenantFields, name, description, id, columns, override) => {
     switch (request) {
       case "edit":
         await handleModalSubmit(
@@ -31022,6 +31345,7 @@ Please delete those filters before deleting this table.`
           query,
           ownerTenantFields,
           name,
+          description,
           id,
           columns,
           void 0,
@@ -31035,6 +31359,7 @@ Please delete those filters before deleting this table.`
           ownerTenantFields,
           void 0,
           void 0,
+          void 0,
           columns,
           void 0,
           override
@@ -31076,6 +31401,7 @@ Please delete those filters before deleting this table.`
                 query,
                 ownerTenantFields,
                 name,
+                void 0,
                 id,
                 columns,
                 override
@@ -31200,6 +31526,7 @@ Please delete those filters before deleting this table.`
                                   {
                                     onClick: () => {
                                       setEditName("");
+                                      setEditDescription("");
                                       setEditVirtualTableQuery("");
                                       setEditVirtualTableId("");
                                       setInitialVirtualTable(void 0);
@@ -31748,6 +32075,7 @@ Please delete those filters before deleting this table.`
                       EditAddViewModal,
                       {
                         viewName: editName,
+                        viewDescription: editDescription,
                         viewQuery: editVirtualTableQuery,
                         viewId: editVirtualTableId,
                         viewOwnerTenantFields: editVirtualTableOwnerTenantFields,
@@ -31755,7 +32083,7 @@ Please delete those filters before deleting this table.`
                         customFieldInfo,
                         closeEditModal,
                         error: editError,
-                        submit: async (submitRequest, query, ownerTenantFields, name, id, columns, customFieldInfo2, noCustomerField2) => {
+                        submit: async (submitRequest, query, ownerTenantFields, name, description, id, columns, customFieldInfo2, noCustomerField2) => {
                           if (submitRequest !== "delete") {
                             setSubmittingVirtualTable(true);
                           }
@@ -31764,6 +32092,7 @@ Please delete those filters before deleting this table.`
                             query,
                             ownerTenantFields,
                             name,
+                            description,
                             id,
                             columns,
                             customFieldInfo2,
@@ -31809,6 +32138,7 @@ Please delete those filters before deleting this table.`
 }
 function EditAddViewModal({
   viewName,
+  viewDescription,
   viewQuery,
   viewOwnerTenantFields,
   viewId,
@@ -31824,6 +32154,7 @@ function EditAddViewModal({
   noCustomerField
 }) {
   const [name, setName] = useState39(viewName);
+  const [description, setDescription] = useState39(viewDescription);
   const [query, setQuery] = useState39(viewQuery);
   const [id, setId] = useState39(viewId);
   const [useCustomField, setUseCustomField] = useState39(
@@ -31838,7 +32169,7 @@ function EditAddViewModal({
   const [runQueryButtonLoading, setRunQueryButtonLoading] = useState39(false);
   const [tableData, setTableData] = useState39(void 0);
   const [errorInfo, setErrorInfo] = useState39({ show: false, message: "" });
-  const clientIsSingleTenant = useMemo22(
+  const clientIsSingleTenant = useMemo23(
     () => onlySingleDatabaseTenant(state.client),
     [state.client]
   );
@@ -31851,6 +32182,9 @@ function EditAddViewModal({
   useEffect35(() => {
     setName(viewName);
   }, [viewName]);
+  useEffect35(() => {
+    setDescription(viewDescription);
+  }, [viewDescription]);
   useEffect35(() => {
     setQuery(viewQuery);
   }, [viewQuery]);
@@ -31868,6 +32202,7 @@ function EditAddViewModal({
         setTableData(void 0);
         setErrorInfo({ show: false, message: "" });
         setName("");
+        setDescription("");
         closeEditModal();
       },
       children: /* @__PURE__ */ jsxs56(
@@ -31914,21 +32249,47 @@ function EditAddViewModal({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx71(InputLabel, { children: "Name" }),
-            /* @__PURE__ */ jsx71(
-              TextInputPrimitive_default,
-              {
-                ref: (input) => {
-                  if (editModalIsOpen && !viewName) {
-                    input?.focus();
+            /* @__PURE__ */ jsxs56("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [
+              /* @__PURE__ */ jsx71(InputLabel, { children: "Name" }),
+              /* @__PURE__ */ jsx71(
+                TextInputPrimitive_default,
+                {
+                  placeholder: "Enter view display name...",
+                  onChange: (e2) => setName(e2.target.value),
+                  value: name ? name : ""
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsx71("div", { style: { height: 12 } }),
+            /* @__PURE__ */ jsxs56("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [
+              /* @__PURE__ */ jsx71(InputLabel, { children: "Description" }),
+              /* @__PURE__ */ jsx71(
+                "textarea",
+                {
+                  placeholder: "Enter description...",
+                  onChange: (e2) => setDescription(e2.target.value),
+                  value: description ?? "",
+                  rows: 3,
+                  style: {
+                    width: "100%",
+                    minHeight: 88,
+                    resize: "vertical",
+                    padding: "10px 12px",
+                    fontWeight: "medium",
+                    backgroundColor: state.theme?.backgroundColor || "white",
+                    color: state.theme?.primaryTextColor,
+                    borderWidth: "1px",
+                    borderColor: state.theme?.borderColor || "#E7E7E7",
+                    borderStyle: "solid",
+                    borderRadius: "6px",
+                    fontSize: 14,
+                    fontFamily: state.theme?.fontFamily,
+                    boxSizing: "border-box"
                   }
-                },
-                placeholder: "Enter view display name...",
-                onChange: (e2) => setName(e2.target.value),
-                value: name ? name : ""
-              }
-            ),
-            /* @__PURE__ */ jsx71("br", {}),
+                }
+              )
+            ] }),
+            /* @__PURE__ */ jsx71("div", { style: { height: 16 } }),
             viewOwnerTenantFields.length > 0 && /* @__PURE__ */ jsxs56(Fragment22, { children: [
               /* @__PURE__ */ jsx71(InputLabel, { tooltip: "Dashboards may only query from virtual tables that share an owner with them. Virtual tables are required to return each of their owners' foreign keys as part of the query.", children: "Owners" }),
               /* @__PURE__ */ jsx71(
@@ -31963,7 +32324,7 @@ function EditAddViewModal({
                   ))
                 }
               ),
-              /* @__PURE__ */ jsx71("br", {})
+              /* @__PURE__ */ jsx71("div", { style: { height: 16 } })
             ] }),
             error && /* @__PURE__ */ jsxs56(Fragment22, { children: [
               /* @__PURE__ */ jsx71("h3", { style: { color: "#CA3A31" }, children: error }),
@@ -32239,7 +32600,14 @@ function EditAddViewModal({
                       viewName && /* @__PURE__ */ jsx71(
                         MemoizedButton,
                         {
-                          onClick: () => submit("delete", query, viewOwnerTenantFields, name, id),
+                          onClick: () => submit(
+                            "delete",
+                            query,
+                            viewOwnerTenantFields,
+                            name,
+                            description,
+                            id
+                          ),
                           label: "Delete",
                           style: { color: "red", backgroundColor: "white" }
                         }
@@ -32320,6 +32688,7 @@ function EditAddViewModal({
                                   query,
                                   viewOwnerTenantFields,
                                   name,
+                                  description,
                                   id,
                                   void 0,
                                   useCustomField ? {
@@ -32366,7 +32735,9 @@ export {
   SecondaryButtonPrimitive_default as SecondaryButtonPrimitive,
   TextInputPrimitive_default as TextInputPrimitive,
   VirtualTableManager,
+  clearQuillSandboxStorage,
   exportChatAsMarkdown,
   useAdmin,
-  useAgentChat
+  useAgentChat,
+  useSandboxSession
 };