@quillsql/admin 1.8.7 → 1.8.9

package/dist/index.cjs

@@ -47,9 +47,11 @@ __export(index_exports, {
   SecondaryButtonPrimitive: () => SecondaryButtonPrimitive_default,
   TextInputPrimitive: () => TextInputPrimitive_default,
   VirtualTableManager: () => VirtualTableManager,
+  clearQuillSandboxStorage: () => clearQuillSandboxStorage,
   exportChatAsMarkdown: () => exportChatAsMarkdown,
   useAdmin: () => useAdmin,
-  useAgentChat: () => useAgentChat
+  useAgentChat: () => useAgentChat,
+  useSandboxSession: () => useSandboxSession
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -8175,32 +8177,140 @@ var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
 
 // src/components/AgentChat/AgentChatContext.tsx
 var import_react24 = require("react");
-var AgentChatContext = (0, import_react24.createContext)(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 = (0, import_react24.createContext)(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] = (0, import_react24.useState)([
     { role: "assistant", content: WELCOME_MESSAGE, isWelcome: true }
   ]);
-  const [initialSession] = (0, import_react24.useState)(hydrateSession);
-  const [session, setSessionRaw] = (0, import_react24.useState)(initialSession);
+  const [session, setSessionRaw] = (0, import_react24.useState)(
+    () => hydrateSessionFromStorage(clerkOrgId)
+  );
   const [showToolOutputs, setShowToolOutputs] = (0, import_react24.useState)(false);
   const [changelogEntries, setChangelogEntriesState] = (0, import_react24.useState)([]);
+  (0, import_react24.useEffect)(() => {
+    if (!clerkOrgId) return;
+    const stored = resolveSandboxSession(clerkOrgId);
+    if (stored?.session) {
+      setSessionRaw((prev) => prev ?? stored.session);
+    }
+  }, [clerkOrgId]);
   const setChangelogEntries = (0, import_react24.useCallback)((entries) => {
     setChangelogEntriesState(entries);
   }, []);
@@ -8213,17 +8323,6 @@ function useAgentChatRootState() {
       return next;
     });
   }, []);
-  (0, import_react24.useEffect)(() => {
-    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,
@@ -8480,7 +8579,7 @@ function AdminProvider({
   onRequestAddVirtualTable,
   hideEnvDropdown
 }) {
-  const agentChatState = useAgentChatRootState();
+  const agentChatState = useAgentChatRootState(clerkOrgId);
   const refreshChangelogRef = (0, import_react27.useRef)(null);
   const registerChangelogRefresh = (0, import_react27.useCallback)(
     (fn) => {
@@ -8490,6 +8589,7 @@ function AdminProvider({
   );
   const [clientLoading, setClientLoading] = (0, import_react27.useState)(true);
   const currentFetchingClientRef = (0, import_react27.useRef)(void 0);
+  const previousClerkOrgIdRef = (0, import_react27.useRef)(void 0);
   const [schemaLoading, setSchemaLoading] = (0, import_react27.useState)(false);
   const [error, setError] = (0, import_react27.useState)(null);
   const publicKeyRef = (0, import_react27.useRef)(void 0);
@@ -8564,6 +8664,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;
@@ -8574,7 +8689,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(
@@ -8583,10 +8699,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(
@@ -8594,8 +8714,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 = (0, import_react27.useMemo)(() => {
@@ -8639,7 +8765,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);
@@ -8647,7 +8778,7 @@ function AdminProvider({
         targetClientId,
         false,
         preserveSelectedDashboard,
-        resetSandbox
+        shouldResetSandbox
       );
       return;
     }
@@ -8784,11 +8915,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({
@@ -8796,14 +8931,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 } : {}
         },
@@ -8837,11 +8972,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)
@@ -8860,9 +8995,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({
@@ -8871,16 +9045,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,
@@ -8950,12 +9114,123 @@ function AdminProvider({
       dispatch({ type: "SET_CLERK_ORG_ID", payload: clerkOrgId });
     }
   }, [clerkOrgId]);
+  (0, import_react27.useEffect)(() => {
+    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]);
+  (0, import_react27.useEffect)(() => {
+    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]);
+  (0, import_react27.useEffect)(() => {
+    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]);
+  (0, import_react27.useEffect)(() => {
+    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
+  ]);
   (0, import_react27.useEffect)(() => {
     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(
@@ -8965,8 +9240,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;
@@ -8974,7 +9248,7 @@ function AdminProvider({
       if (currentFetchingClientRef.current === fetchPublicKey) return;
       fetchClient(fetchPublicKey, true);
     }
-  }, [publicKey]);
+  }, [publicKey, clerkOrgId]);
   (0, import_react27.useEffect)(() => {
     if (typeof window === "undefined") {
       return;
@@ -9239,8 +9513,8 @@ async function getClientTenantIds({
 }
 
 // src/public_components/DashboardManager.tsx
-var import_react66 = require("react");
-var import_react67 = require("@quillsql/react");
+var import_react67 = require("react");
+var import_react68 = require("@quillsql/react");
 
 // src/Admin.tsx
 var import_react31 = require("react");
@@ -21293,6 +21567,7 @@ function EditEnvironmentModal({
     state,
     dispatch,
     refreshClientsList,
+    setClient,
     getToken,
     quillFetchWithToken,
     eventTracking
@@ -21304,6 +21579,12 @@ function EditEnvironmentModal({
   const [isSubmitTenantLoading, setSubmitTenantLoading] = (0, import_react50.useState)(false);
   const [isSaveEnvironmentLoading, setIsSaveEnvironmentLoading] = (0, import_react50.useState)(false);
   const [isDeleteEnvironmentLoading, setIsDeleteEnvironmentLoading] = (0, import_react50.useState)(false);
+  const [isCreateChildEnvironmentLoading, setIsCreateChildEnvironmentLoading] = (0, import_react50.useState)(false);
+  const [
+    isPromoteChildEnvironmentLoading,
+    setIsPromoteChildEnvironmentLoading
+  ] = (0, import_react50.useState)(false);
+  const [developmentEnvironmentConfirm, setDevelopmentEnvironmentConfirm] = (0, import_react50.useState)(null);
   const [validationError, setValidationError] = (0, import_react50.useState)(
     void 0
   );
@@ -21311,6 +21592,26 @@ function EditEnvironmentModal({
   const connectionDetails = (0, import_react50.useMemo)(() => {
     return getDatabaseConnectionFormat(state.client?.databaseType || "");
   }, [state.client?.databaseType]);
+  const sourceClientId = (0, import_react50.useMemo)(() => {
+    if (state.sandboxParentClientId != null) {
+      return String(state.sandboxParentClientId);
+    }
+    return clientRecordId(state.client);
+  }, [state.sandboxParentClientId, state.client]);
+  const relatedChildEnvironments = (0, import_react50.useMemo)(() => {
+    const parentClientId = state.client?.sandboxParentClientId != null ? String(state.client.sandboxParentClientId) : sourceClientId;
+    if (!parentClientId) return [];
+    return state.clients.filter(
+      (c2) => c2.sandboxParentClientId != null && String(c2.sandboxParentClientId) === parentClientId
+    );
+  }, [state.clients, state.client?.sandboxParentClientId, sourceClientId]);
+  const sourceEnvironmentName = (0, import_react50.useMemo)(() => {
+    if (!sourceClientId) return state.client?.name;
+    const sourceClient = state.clients.find(
+      (c2) => clientRecordId(c2) === sourceClientId
+    );
+    return sourceClient?.name ?? state.client?.name;
+  }, [sourceClientId, state.clients, state.client?.name]);
   const [tenantToEdit, setTenantToEdit] = (0, import_react50.useState)(
     void 0
   );
@@ -21709,6 +22010,104 @@ function EditEnvironmentModal({
       setFetchSchemasLoading(false);
     }
   };
+  const handleCreateChildEnvironment = async () => {
+    if (!sourceClientId) return;
+    setDevelopmentEnvironmentConfirm(null);
+    setIsCreateChildEnvironmentLoading(true);
+    try {
+      const response = await quillFetchWithToken({
+        client: {
+          queryEndpoint: state.queryEndpoint,
+          clientId: sourceClientId,
+          withCredentials: !!state.withCredentials,
+          queryHeaders: state.queryHeaders
+        },
+        task: "create-sandbox",
+        metadata: {
+          clientId: sourceClientId,
+          permanentSandbox: true
+        },
+        adminMode: true
+      });
+      if (response.status === "error") {
+        throw new Error(response.error);
+      }
+      await refreshClientsList(sourceClientId);
+    } catch (e2) {
+      eventTracking?.logError?.({
+        type: "bug",
+        // TODO: determine type
+        severity: "high",
+        message: "Error creating child environment",
+        errorMessage: e2.message,
+        errorStack: e2.stack,
+        errorData: {
+          caller: "EditEnvironmentModal",
+          function: "handleCreateChildEnvironment"
+        }
+      });
+      setValidationError(e2.message);
+    } finally {
+      setIsCreateChildEnvironmentLoading(false);
+    }
+  };
+  const handlePromoteChildEnvironment = async () => {
+    if (developmentEnvironmentConfirm?.action !== "promote") return;
+    const childEnvironmentToPromote = developmentEnvironmentConfirm.environment;
+    const promoteClientId = clientRecordId(childEnvironmentToPromote);
+    if (!promoteClientId) {
+      setValidationError("Cannot promote: missing target environment id.");
+      return;
+    }
+    setDevelopmentEnvironmentConfirm(null);
+    setIsPromoteChildEnvironmentLoading(true);
+    try {
+      const response = await quillFetchWithToken({
+        client: {
+          queryEndpoint: state.queryEndpoint,
+          clientId: promoteClientId,
+          withCredentials: !!state.withCredentials,
+          queryHeaders: state.queryHeaders
+        },
+        task: "promote",
+        metadata: {
+          clientId: promoteClientId,
+          forcePromote: true
+        },
+        adminMode: true
+      });
+      if (response.status === "error" || response.error) {
+        throw new Error(response.error);
+      }
+      const hasActiveSandbox = state.sandboxSessionId != null || state.sandboxClientId != null;
+      if (hasActiveSandbox && sourceClientId) {
+        setClient(
+          { clientId: sourceClientId },
+          true,
+          true,
+          true
+        );
+      }
+      await refreshClientsList(sourceClientId);
+      setIsOpen(false);
+    } catch (e2) {
+      eventTracking?.logError?.({
+        type: "bug",
+        // TODO: determine type
+        severity: "high",
+        message: "Error promoting child environment",
+        errorMessage: e2.message,
+        errorStack: e2.stack,
+        errorData: {
+          caller: "EditEnvironmentModal",
+          function: "handlePromoteChildEnvironment"
+        }
+      });
+      setValidationError(e2.message);
+    } finally {
+      setIsPromoteChildEnvironmentLoading(false);
+    }
+  };
   const handleDeleteEnvironment = async () => {
     if (state.clients.length === 1) {
       alert("You cannot delete the only environment");
@@ -21755,8 +22154,9 @@ function EditEnvironmentModal({
       }
     }
   };
-  const isEnvironmentModalLoading = isDeleteEnvironmentLoading || isSaveEnvironmentLoading;
-  const environmentLoadingLabel = isDeleteEnvironmentLoading ? "Deleting environment..." : "Saving environment...";
+  const isEnvironmentModalLoading = isDeleteEnvironmentLoading || isSaveEnvironmentLoading || isCreateChildEnvironmentLoading || isPromoteChildEnvironmentLoading;
+  const environmentLoadingLabel = isDeleteEnvironmentLoading ? "Deleting environment..." : isCreateChildEnvironmentLoading ? "Creating child environment..." : isPromoteChildEnvironmentLoading ? "Promoting environment..." : "Saving environment...";
+  const isDevelopmentEnvironmentConfirmLoading = developmentEnvironmentConfirm?.action === "promote" ? isPromoteChildEnvironmentLoading : isCreateChildEnvironmentLoading;
   return /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_jsx_runtime52.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
       ModalComponent,
@@ -21769,6 +22169,9 @@ function EditEnvironmentModal({
           setSelectedEnvironmentName(state.client.name);
           setIsSaveEnvironmentLoading(false);
           setIsDeleteEnvironmentLoading(false);
+          setIsCreateChildEnvironmentLoading(false);
+          setIsPromoteChildEnvironmentLoading(false);
+          setDevelopmentEnvironmentConfirm(null);
         },
         style: {
           minWidth: "600px"
@@ -21939,38 +22342,115 @@ function EditEnvironmentModal({
                   disabled: isEnvironmentModalLoading
                 }
               ) }),
-              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_jsx_runtime52.Fragment, { children: [
-                /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(CardSection, { children: "Danger Zone" }),
-                /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
-                  "div",
-                  {
-                    style: {
-                      display: "flex",
-                      flexDirection: "column",
-                      width: "fit-content",
-                      gap: 16
-                    },
-                    children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
-                        SecondaryButtonComponent,
-                        {
-                          onClick: () => setIsConnectDatabaseModalOpen(true),
-                          label: "Edit Database Connection",
-                          disabled: isEnvironmentModalLoading
-                        }
-                      ),
-                      /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
-                        SecondaryButtonComponent,
-                        {
-                          onClick: handleDeleteEnvironment,
-                          label: "Delete Environment",
-                          disabled: isEnvironmentModalLoading
-                        }
-                      )
-                    ]
-                  }
-                )
-              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(CardSection, { children: "Danger Zone" }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
+                "div",
+                {
+                  style: {
+                    display: "flex",
+                    flexDirection: "column",
+                    width: "fit-content",
+                    gap: 16
+                  },
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      SecondaryButtonComponent,
+                      {
+                        onClick: () => setIsConnectDatabaseModalOpen(true),
+                        label: "Edit Database Connection",
+                        disabled: isEnvironmentModalLoading
+                      }
+                    ),
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      SecondaryButtonComponent,
+                      {
+                        onClick: handleDeleteEnvironment,
+                        label: "Delete Environment",
+                        disabled: isEnvironmentModalLoading
+                      }
+                    )
+                  ]
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(CardSection, { children: "Development Environments" }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
+                "div",
+                {
+                  style: {
+                    display: "flex",
+                    flexDirection: "column",
+                    width: "fit-content",
+                    gap: 16
+                  },
+                  children: [
+                    relatedChildEnvironments.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      "table",
+                      {
+                        style: {
+                          borderCollapse: "collapse",
+                          width: "100%",
+                          minWidth: 280,
+                          fontFamily: state.theme.fontFamily,
+                          fontSize: 14,
+                          color: state.theme.primaryTextColor
+                        },
+                        children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("tbody", { children: relatedChildEnvironments.map((env) => {
+                          const envId = clientRecordId(env);
+                          const cellBorder = `1px solid ${state.theme.borderColor ?? "#e7e7e7"}`;
+                          return /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("tr", { children: [
+                            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                              "td",
+                              {
+                                style: {
+                                  border: cellBorder,
+                                  padding: "8px 12px",
+                                  fontWeight: 500
+                                },
+                                children: env.name
+                              }
+                            ),
+                            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                              "td",
+                              {
+                                style: {
+                                  border: cellBorder,
+                                  padding: "8px 12px",
+                                  width: 1,
+                                  whiteSpace: "nowrap"
+                                },
+                                children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                                  ButtonComponent,
+                                  {
+                                    label: "Promote",
+                                    onClick: () => setDevelopmentEnvironmentConfirm({
+                                      action: "promote",
+                                      environment: env
+                                    }),
+                                    disabled: isEnvironmentModalLoading || developmentEnvironmentConfirm != null,
+                                    style: {
+                                      height: 32,
+                                      paddingLeft: 12,
+                                      paddingRight: 12
+                                    }
+                                  }
+                                )
+                              }
+                            )
+                          ] }, envId ?? env.name);
+                        }) })
+                      }
+                    ),
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      SecondaryButtonComponent,
+                      {
+                        onClick: () => setDevelopmentEnvironmentConfirm({ action: "create" }),
+                        label: "+ Create New",
+                        disabled: isEnvironmentModalLoading
+                      }
+                    ) })
+                  ]
+                }
+              ),
               /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("div", { style: { height: 18 } }),
               /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
                 "div",
@@ -22209,6 +22689,117 @@ function EditEnvironmentModal({
         )
       }
     ),
+    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+      ModalComponent,
+      {
+        isOpen: developmentEnvironmentConfirm != null,
+        onClose: () => {
+          if (isDevelopmentEnvironmentConfirmLoading) return;
+          setDevelopmentEnvironmentConfirm(null);
+        },
+        style: {
+          width: 480
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
+          "div",
+          {
+            style: {
+              display: "flex",
+              flexDirection: "column",
+              gap: 20,
+              width: "100%",
+              padding: 24
+            },
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(CardSection, { children: developmentEnvironmentConfirm?.action === "promote" ? "Promote Environment Changes" : "Create child environment" }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
+                "div",
+                {
+                  style: {
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: 12,
+                    fontFamily: state.theme.fontFamily,
+                    fontSize: 14,
+                    lineHeight: 1.6,
+                    color: state.theme.primaryTextColor
+                  },
+                  children: [
+                    developmentEnvironmentConfirm?.action === "promote" ? /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("p", { style: { margin: 0 }, children: [
+                      "Promoting",
+                      " ",
+                      /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("strong", { children: [
+                        developmentEnvironmentConfirm.environment?.name ?? "this environment",
+                        "\xA0into\xA0",
+                        sourceEnvironmentName ?? "the current environment"
+                      ] }),
+                      " ",
+                      "will replicate the development environment's state into the current environment."
+                    ] }) : /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)("p", { style: { margin: 0 }, children: [
+                      "Creating a child development environment for",
+                      " ",
+                      /* @__PURE__ */ (0, import_jsx_runtime52.jsx)("strong", { children: sourceEnvironmentName ?? "the current environment" }),
+                      " ",
+                      "will create an environment you can use to preview changes before promoting them into the currently active environment."
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      "p",
+                      {
+                        style: {
+                          margin: 0,
+                          padding: "12px 14px",
+                          borderRadius: 6,
+                          border: `1px solid ${state.theme.borderColor ?? "#e7e7e7"}`,
+                          backgroundColor: state.theme.hoverBackgroundColor ?? "#f7f7f7",
+                          color: "#DC2626"
+                        },
+                        children: "This is not a sandbox operation and will immediately apply to the live environment. Your current active session will be discarded."
+                      }
+                    )
+                  ]
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
+                "div",
+                {
+                  style: {
+                    display: "flex",
+                    flexDirection: "row",
+                    justifyContent: "flex-end",
+                    gap: 16,
+                    width: "100%"
+                  },
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      SecondaryButtonComponent,
+                      {
+                        label: "Cancel",
+                        onClick: () => setDevelopmentEnvironmentConfirm(null),
+                        disabled: isDevelopmentEnvironmentConfirmLoading
+                      }
+                    ),
+                    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+                      ButtonComponent,
+                      {
+                        label: "Confirm",
+                        onClick: () => {
+                          if (developmentEnvironmentConfirm?.action === "promote") {
+                            handlePromoteChildEnvironment();
+                          } else if (developmentEnvironmentConfirm?.action === "create") {
+                            handleCreateChildEnvironment();
+                          }
+                        },
+                        disabled: isDevelopmentEnvironmentConfirmLoading
+                      }
+                    )
+                  ]
+                }
+              )
+            ]
+          }
+        )
+      }
+    ),
     /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
       ModalComponent,
       {
@@ -22879,7 +23470,8 @@ function SavedQueriesModal({
   ) });
 }
 function SavedQueryTile({ report }) {
-  const { state, dispatch, getToken } = useAdmin();
+  const { state, dispatch, getToken, eventTracking } = useAdmin();
+  const { reload } = (0, import_react56.useDashboardInternal)(SAVED_QUERIES_DASHBOARD);
   (0, import_react55.useEffect)(() => {
     async function getIsOpenableByReportBuilder() {
       const hello = await parseQuillReportToQuillReportInternal(
@@ -22904,6 +23496,14 @@ function SavedQueryTile({ report }) {
       payload: report?.queryString
     });
   };
+  const handleDelete = async () => {
+    if (await deleteReport(report.id, state, getToken, eventTracking)) {
+      reload(SAVED_QUERIES_DASHBOARD, true, {
+        report: { id: report.id },
+        action: "delete"
+      });
+    }
+  };
   if (!report.queryString) {
     return null;
   }
@@ -22937,7 +23537,8 @@ function SavedQueryTile({ report }) {
             label: "Open in SQL Editor \u2197",
             onClick: handleOpenReportInSQLEditor
           }
-        )
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(SecondaryButtonPrimitive_default, { label: "Delete", onClick: handleDelete })
       ]
     }
   );
@@ -26445,11 +27046,42 @@ function DashboardSelectPopover({
 }
 
 // src/components/AgentChat/AgentChatPanel.tsx
-var import_react64 = require("react");
+var import_react65 = require("react");
 var import_re_resizable2 = require("re-resizable");
 
-// src/components/AgentChat/AgentChat.tsx
+// src/hooks/useSandboxSession.ts
 var import_react62 = require("react");
+function useSandboxSession() {
+  const { state } = useAdmin();
+  const { session } = useAgentChat();
+  return (0, import_react62.useMemo)(() => {
+    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
+var import_react63 = require("react");
 
 // src/components/AgentChat/agentChatMarkdownCss.ts
 var AGENT_CHAT_MARKDOWN_STYLE_ID = "quillsql-agent-chat-markdown";
@@ -26708,9 +27340,9 @@ async function* streamResponseHandler(response) {
 }
 
 // src/components/AgentChat/AgentChat.tsx
-var import_react63 = require("@quillsql/react");
+var import_react64 = require("@quillsql/react");
 var import_jsx_runtime62 = require("react/jsx-runtime");
-var MarkdownContent = (0, import_react62.memo)(function MarkdownContent2({
+var MarkdownContent = (0, import_react63.memo)(function MarkdownContent2({
   content
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime62.jsx)(import_react_markdown.default, { remarkPlugins: [import_remark_gfm.default], children: content });
@@ -26952,7 +27584,7 @@ function ToolCallBlock({ toolCall }) {
   );
 }
 function ToolCallResult({ content }) {
-  const [expanded, setExpanded] = (0, import_react62.useState)(false);
+  const [expanded, setExpanded] = (0, import_react63.useState)(false);
   if (!content) return null;
   const isLong = content.length > 300;
   const displayed = isLong && !expanded ? content.slice(0, 300) + "..." : content;
@@ -27417,7 +28049,7 @@ function AgentChat({
   sourceClientId,
   getToken
 }) {
-  (0, import_react62.useEffect)(() => {
+  (0, import_react63.useEffect)(() => {
     ensureAgentChatMarkdownStylesInjected();
   }, []);
   const {
@@ -27431,9 +28063,9 @@ function AgentChat({
   } = useAgentChat();
   const { state, setClient, quillFetchWithToken, refreshClientsList } = useAdmin();
   const { schema: allTableData } = useDatabaseSchema();
-  const { allReportsById } = (0, import_react63.useAllReports)();
-  const { data: virtualTables } = (0, import_react63.useVirtualTables)();
-  const changelogDiffs = (0, import_react62.useMemo)(
+  const { allReportsById } = (0, import_react64.useAllReports)();
+  const { data: virtualTables } = (0, import_react64.useVirtualTables)();
+  const changelogDiffs = (0, import_react63.useMemo)(
     () => changelogEntries.flatMap((entry) => {
       const diff = parseDiffEntry(entry);
       return diff ? [diff] : [];
@@ -27464,17 +28096,17 @@ function AgentChat({
       console.warn("[agent] fetch-changelog-list failed:", err);
     }
   };
-  const [input, setInput] = (0, import_react62.useState)("");
-  const [inputError, setInputError] = (0, import_react62.useState)("");
-  const [isLoading, setIsLoading] = (0, import_react62.useState)(false);
-  const [isPromoting, setIsPromoting] = (0, import_react62.useState)(false);
-  const [isDiscarding, setIsDiscarding] = (0, import_react62.useState)(false);
-  const [confirmAction, setConfirmAction] = (0, import_react62.useState)(null);
-  const containerRef = (0, import_react62.useRef)(null);
-  const textareaRef = (0, import_react62.useRef)(null);
-  const abortControllerRef = (0, import_react62.useRef)(null);
-  const lastScrolled = (0, import_react62.useRef)(Date.now());
-  (0, import_react62.useEffect)(() => {
+  const [input, setInput] = (0, import_react63.useState)("");
+  const [inputError, setInputError] = (0, import_react63.useState)("");
+  const [isLoading, setIsLoading] = (0, import_react63.useState)(false);
+  const [isPromoting, setIsPromoting] = (0, import_react63.useState)(false);
+  const [isDiscarding, setIsDiscarding] = (0, import_react63.useState)(false);
+  const [confirmAction, setConfirmAction] = (0, import_react63.useState)(null);
+  const containerRef = (0, import_react63.useRef)(null);
+  const textareaRef = (0, import_react63.useRef)(null);
+  const abortControllerRef = (0, import_react63.useRef)(null);
+  const lastScrolled = (0, import_react63.useRef)(Date.now());
+  (0, import_react63.useEffect)(() => {
     const run = async () => {
       if (!sandboxClientId || !agentSessionId) {
         return;
@@ -27483,7 +28115,7 @@ function AgentChat({
     };
     run();
   }, [sandboxClientId, agentSessionId]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react63.useEffect)(() => {
     const delay2 = Math.max(0, 500 - (Date.now() - lastScrolled.current));
     const timer = setTimeout(() => {
       const el = containerRef.current;
@@ -27501,7 +28133,7 @@ function AgentChat({
     abortControllerRef.current = null;
     setIsLoading(false);
   };
-  (0, import_react62.useEffect)(() => {
+  (0, import_react63.useEffect)(() => {
     if (!abortControllerRef.current) return;
     abortControllerRef.current.abort();
     abortControllerRef.current = null;
@@ -27517,6 +28149,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;
@@ -28264,38 +28897,48 @@ function AgentChatPanel() {
   const {
     messages,
     setMessages,
-    session,
     setSession,
     showToolOutputs,
     setShowToolOutputs,
     clearChangelogEntries
   } = useAgentChat();
-  const sourceClientId = state.sandboxParentClientId;
-  const sandboxClientId = state.sandboxClientId ?? session?.sandboxClientId ?? null;
-  const [collapsed, setCollapsed] = (0, import_react64.useState)(false);
+  const {
+    sessionId,
+    sandboxClientId,
+    sourceClientId,
+    session
+  } = useSandboxSession();
+  const [collapsed, setCollapsed] = (0, import_react65.useState)(false);
   const minWidth = typeof window !== "undefined" ? Math.max(DEFAULT_MIN_WIDTH, window.innerWidth * DEFAULT_WIDTH_FRACTION) : 480;
-  const [width, setWidth] = (0, import_react64.useState)(
+  const [width, setWidth] = (0, import_react65.useState)(
     () => getInitialWidth(DEFAULT_STORAGE_KEY, minWidth)
   );
   const maxWidth = typeof window !== "undefined" ? window.innerWidth * DEFAULT_MAX_WIDTH_FRACTION : 1200;
-  (0, import_react64.useEffect)(() => {
+  (0, import_react65.useEffect)(() => {
     if (typeof window === "undefined") return;
     window.localStorage.setItem(DEFAULT_STORAGE_KEY, String(Math.round(width)));
   }, [width]);
-  const prevClientIdRef = (0, import_react64.useRef)(clientId);
-  (0, import_react64.useEffect)(() => {
+  const prevClientIdRef = (0, import_react65.useRef)(clientId);
+  (0, import_react65.useEffect)(() => {
     const prev = prevClientIdRef.current;
     prevClientIdRef.current = clientId;
     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
@@ -28595,9 +29238,9 @@ function AgentChatPanel() {
                     children: clientId && /* @__PURE__ */ (0, import_jsx_runtime63.jsx)(
                       AgentChat,
                       {
-                        agentSessionId: session?.sessionId ?? "",
+                        agentSessionId: sessionId ?? "",
                         sandboxClientId: sandboxClientId ?? "",
-                        sourceClientId: session?.sourceClientId ?? sourceClientId ?? "",
+                        sourceClientId: sourceClientId ?? "",
                         getToken: async () => await getToken() || ""
                       }
                     )
@@ -28613,13 +29256,13 @@ function AgentChatPanel() {
 }
 
 // src/components/EnvironmentSwitcherWithModals.tsx
-var import_react65 = require("react");
+var import_react66 = require("react");
 var import_jsx_runtime64 = require("react/jsx-runtime");
 function EnvironmentSwitcherWithModals() {
   const { state, setClient, clientLoading } = useAdmin();
-  const envSelectRef = (0, import_react65.useRef)(null);
-  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react65.useState)(false);
-  const [showCreateEnvironmentModal, setShowCreateEnvironmentModal] = (0, import_react65.useState)(false);
+  const envSelectRef = (0, import_react66.useRef)(null);
+  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react66.useState)(false);
+  const [showCreateEnvironmentModal, setShowCreateEnvironmentModal] = (0, import_react66.useState)(false);
   return /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(import_jsx_runtime64.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime64.jsx)("div", { ref: envSelectRef, className: "flex flex-col", children: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
       EnvSelectPopover,
@@ -28744,14 +29387,14 @@ function DashboardManager({
     quillFetchWithToken,
     eventTracking
   } = useAdmin();
-  const parentRef = (0, import_react66.useRef)(null);
-  const dashboardSelectPopoverRef = (0, import_react66.useRef)(null);
-  const [newDashboardModalIsOpen, setNewDashboardModalIsOpen] = (0, import_react66.useState)(false);
-  const [editFilterModalIsOpen, setEditFilterModalIsOpen] = (0, import_react66.useState)(false);
-  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react66.useState)(false);
-  const [userFilters, setUserFilters] = (0, import_react66.useState)([]);
+  const parentRef = (0, import_react67.useRef)(null);
+  const dashboardSelectPopoverRef = (0, import_react67.useRef)(null);
+  const [newDashboardModalIsOpen, setNewDashboardModalIsOpen] = (0, import_react67.useState)(false);
+  const [editFilterModalIsOpen, setEditFilterModalIsOpen] = (0, import_react67.useState)(false);
+  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react67.useState)(false);
+  const [userFilters, setUserFilters] = (0, import_react67.useState)([]);
   const showCreateEnvironmentModal = state.activeComponent === "CreateEnvironment";
-  const setShowCreateEnvironmentModal = (0, import_react66.useCallback)(
+  const setShowCreateEnvironmentModal = (0, import_react67.useCallback)(
     (show) => {
       dispatch({
         type: "SET_ACTIVE_COMPONENT",
@@ -28760,8 +29403,8 @@ function DashboardManager({
     },
     [dispatch]
   );
-  const { data: dashboardConfig, reload: reloadDashboard } = (0, import_react67.useDashboardInternal)(state.selectedDashboard, userFilters);
-  const { dashboards, isLoading: dashboardsLoading } = (0, import_react67.useDashboards)();
+  const { data: dashboardConfig, reload: reloadDashboard } = (0, import_react68.useDashboardInternal)(state.selectedDashboard, userFilters);
+  const { dashboards, isLoading: dashboardsLoading } = (0, import_react68.useDashboards)();
   useLongLoading(dashboardsLoading, {
     origin: "DashboardManager",
     loadDescription: "Loading dashboards"
@@ -28770,7 +29413,7 @@ function DashboardManager({
   const visibleDashboards = dashboards?.filter(
     (dashboard) => dashboard.name !== SAVED_QUERIES_DASHBOARD
   ) ?? [];
-  (0, import_react66.useEffect)(() => {
+  (0, import_react67.useEffect)(() => {
     if (navigateToVirtualTableManager) {
       dispatch({
         type: "SET_NAVIGATE_TO_VIRTUAL_TABLE_BUILDER",
@@ -28780,7 +29423,7 @@ function DashboardManager({
       console.warn("navigateToDashboardBuilder is not defined");
     }
   }, []);
-  (0, import_react66.useEffect)(() => {
+  (0, import_react67.useEffect)(() => {
     if (clientLoading || dashboardsLoading) {
       return;
     }
@@ -28821,7 +29464,7 @@ function DashboardManager({
     setSelectedDashboard,
     dispatch
   ]);
-  const handleClickReport = (0, import_react66.useCallback)(
+  const handleClickReport = (0, import_react67.useCallback)(
     (elem) => {
       dispatch({ type: "SET_REPORT_ID", payload: elem.id });
       dispatch({
@@ -29527,12 +30170,12 @@ function DashboardManager({
 }
 
 // src/public_components/VirtualTableManager.tsx
-var import_react70 = require("react");
+var import_react71 = require("react");
 var import_react_dom9 = require("react-dom");
 
 // src/forms/virtual_tables/CreateEditVirtualTable.tsx
-var import_react68 = require("@quillsql/react");
-var import_react69 = require("react");
+var import_react69 = require("@quillsql/react");
+var import_react70 = require("react");
 
 // src/modals/TenantFieldModal.tsx
 var import_jsx_runtime67 = require("react/jsx-runtime");
@@ -29740,31 +30383,31 @@ function CreateEditVirtualTable({
   client
 }) {
   const name = initialVirtualTable?.name || "";
-  const [editVirtualTableQuery, setEditVirtualTableQuery] = (0, import_react69.useState)(
+  const [editVirtualTableQuery, setEditVirtualTableQuery] = (0, import_react70.useState)(
     initialVirtualTable?.viewQuery || ""
   );
-  const [ranVirtualTableQuery, setRanVirtualTableQuery] = (0, import_react69.useState)(
+  const [ranVirtualTableQuery, setRanVirtualTableQuery] = (0, import_react70.useState)(
     initialVirtualTable?.viewQuery || ""
   );
-  const [askAIButtonLoading, setAskAIButtonLoading] = (0, import_react69.useState)(false);
-  const [aiPrompt, setAIPrompt] = (0, import_react69.useState)("");
-  const [virtualTableAddable, setVirtualTableAddable] = (0, import_react69.useState)(false);
-  const [virtualTableOwners, setVirtualTableOwners] = (0, import_react69.useState)(
+  const [askAIButtonLoading, setAskAIButtonLoading] = (0, import_react70.useState)(false);
+  const [aiPrompt, setAIPrompt] = (0, import_react70.useState)("");
+  const [virtualTableAddable, setVirtualTableAddable] = (0, import_react70.useState)(false);
+  const [virtualTableOwners, setVirtualTableOwners] = (0, import_react70.useState)(
     initialVirtualTable?.ownerTenantFields ?? client.ownerTenantFields?.filter((f) => f !== SINGLE_TENANT) ?? []
   );
-  const [failingTenant, setFailingTenant] = (0, import_react69.useState)(
+  const [failingTenant, setFailingTenant] = (0, import_react70.useState)(
     void 0
   );
-  const [failingTenantErrorType, setFailingTenantErrorType] = (0, import_react69.useState)(void 0);
-  const [isLoading, setIsLoading] = (0, import_react69.useState)(false);
-  const [tableSearchQuery, setTableSearchQuery] = (0, import_react69.useState)("");
-  const [editorMounted, setEditorMounted] = (0, import_react69.useState)(false);
-  const [displayedTableData, setDisplayedTableData] = (0, import_react69.useState)(allTableData);
-  const [errorInfo, setErrorInfo] = (0, import_react69.useState)({ show: false, message: "" });
-  const [tableData, setTableData] = (0, import_react69.useState)(void 0);
-  const [runningQuery, setRunningQuery] = (0, import_react69.useState)(false);
+  const [failingTenantErrorType, setFailingTenantErrorType] = (0, import_react70.useState)(void 0);
+  const [isLoading, setIsLoading] = (0, import_react70.useState)(false);
+  const [tableSearchQuery, setTableSearchQuery] = (0, import_react70.useState)("");
+  const [editorMounted, setEditorMounted] = (0, import_react70.useState)(false);
+  const [displayedTableData, setDisplayedTableData] = (0, import_react70.useState)(allTableData);
+  const [errorInfo, setErrorInfo] = (0, import_react70.useState)({ show: false, message: "" });
+  const [tableData, setTableData] = (0, import_react70.useState)(void 0);
+  const [runningQuery, setRunningQuery] = (0, import_react70.useState)(false);
   const { state, getToken, quillFetchWithToken, eventTracking } = useAdmin();
-  const containerRef = (0, import_react69.useRef)(null);
+  const containerRef = (0, import_react70.useRef)(null);
   const addEditProcessVirtualTable = async (override = false) => {
     const missingTenantField = virtualTableOwners?.find(
       (field) => tableData && !tableData.fields.find(
@@ -29809,13 +30452,13 @@ function CreateEditVirtualTable({
       override
     );
   };
-  const dashboardOwnerTenants = (0, import_react69.useMemo)(() => {
+  const dashboardOwnerTenants = (0, import_react70.useMemo)(() => {
     return client.allTenantTypes?.filter((t2) => client.ownerTenantFields?.includes(t2.tenantField)).filter((t2) => t2.tenantField !== SINGLE_TENANT);
   }, [client.ownerTenantFields, client.allTenantTypes]);
-  (0, import_react69.useEffect)(() => {
+  (0, import_react70.useEffect)(() => {
     setDisplayedTableData(allTableData);
   }, [allTableData]);
-  (0, import_react69.useEffect)(() => {
+  (0, import_react70.useEffect)(() => {
     if (initialVirtualTable) {
       eventTracking?.addBreadcrumb?.({
         message: "Initial Query Run on CreateEditVirtualTable load",
@@ -30035,7 +30678,7 @@ function CreateEditVirtualTable({
                       }
                     ),
                     /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-                      import_react68.SchemaListComponent,
+                      import_react69.SchemaListComponent,
                       {
                         schema: displayedTableData,
                         theme: state.theme,
@@ -30212,7 +30855,7 @@ function CreateEditVirtualTable({
                             }
                           ) : null,
                           (tableData || runningQuery) && /* @__PURE__ */ (0, import_jsx_runtime69.jsx)(
-                            import_react68.Table,
+                            import_react69.Table,
                             {
                               containerStyle: {
                                 minHeight: 260,
@@ -30352,7 +30995,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;
@@ -30378,6 +31021,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,
@@ -30388,7 +31032,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;
@@ -30409,6 +31053,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,
@@ -30441,7 +31086,7 @@ var deleteVirtualTable = async (id, state, getToken) => {
 };
 
 // src/public_components/VirtualTableManager.tsx
-var import_react71 = require("@quillsql/react");
+var import_react72 = require("@quillsql/react");
 var import_prism_react_renderer5 = require("prism-react-renderer");
 
 // src/components/EmptyVirtualTablesComponent.tsx
@@ -30556,7 +31201,7 @@ function EmptyVirtualTablesComponent({
 
 // src/public_components/VirtualTableManager.tsx
 var import_jsx_runtime71 = require("react/jsx-runtime");
-var import_react72 = require("react");
+var import_react73 = require("react");
 function VirtualTableManager({
   containerStyle,
   virtualTable
@@ -30567,28 +31212,29 @@ function VirtualTableManager({
     reloadAll,
     refreshSome,
     loadingTables
-  } = (0, import_react71.useVirtualTables)();
-  const { reloadFilteredReports } = (0, import_react71.useReports)();
-  const [editModalIsOpen, setEditModalIsOpen] = (0, import_react70.useState)(false);
-  const [editQueryView, setEditQueryView] = (0, import_react70.useState)(false);
-  const [editVirtualTableId, setEditVirtualTableId] = (0, import_react70.useState)("");
-  const [editName, setEditName] = (0, import_react70.useState)("");
-  const [editError, setEditError] = (0, import_react70.useState)();
-  const [editVirtualTableQuery, setEditVirtualTableQuery] = (0, import_react70.useState)("");
+  } = (0, import_react72.useVirtualTables)();
+  const { reloadFilteredReports } = (0, import_react72.useReports)();
+  const [editModalIsOpen, setEditModalIsOpen] = (0, import_react71.useState)(false);
+  const [editQueryView, setEditQueryView] = (0, import_react71.useState)(false);
+  const [editVirtualTableId, setEditVirtualTableId] = (0, import_react71.useState)("");
+  const [editName, setEditName] = (0, import_react71.useState)("");
+  const [editDescription, setEditDescription] = (0, import_react71.useState)("");
+  const [editError, setEditError] = (0, import_react71.useState)();
+  const [editVirtualTableQuery, setEditVirtualTableQuery] = (0, import_react71.useState)("");
   const [
     editVirtualTableOwnerTenantFields,
     setEditVirtualTableOwnerTenantFields
-  ] = (0, import_react70.useState)([]);
-  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react70.useState)(false);
-  const [referencedTablesMap, setReferencedTablesMap] = (0, import_react70.useState)({});
-  const [referenceFiltersMap, setReferenceFiltersMap] = (0, import_react70.useState)({});
+  ] = (0, import_react71.useState)([]);
+  const [editEnvironmentModalIsOpen, setEditEnvironmentModalIsOpen] = (0, import_react71.useState)(false);
+  const [referencedTablesMap, setReferencedTablesMap] = (0, import_react71.useState)({});
+  const [referenceFiltersMap, setReferenceFiltersMap] = (0, import_react71.useState)({});
   const { schema: allTableData, isLoading: schemaIsLoading } = useDatabaseSchema();
-  const [customFieldInfo, setCustomFieldInfo] = (0, import_react70.useState)(void 0);
-  const [initialVirtualTable, setInitialVirtualTable] = (0, import_react70.useState)(void 0);
-  const [submittingVirtualTable, setSubmittingVirtualTable] = (0, import_react70.useState)(false);
-  const [noCustomerField, setNoCustomerField] = (0, import_react70.useState)(false);
-  const parentRef = (0, import_react70.useRef)(null);
-  const envHeaderRef = (0, import_react70.useRef)(null);
+  const [customFieldInfo, setCustomFieldInfo] = (0, import_react71.useState)(void 0);
+  const [initialVirtualTable, setInitialVirtualTable] = (0, import_react71.useState)(void 0);
+  const [submittingVirtualTable, setSubmittingVirtualTable] = (0, import_react71.useState)(false);
+  const [noCustomerField, setNoCustomerField] = (0, import_react71.useState)(false);
+  const parentRef = (0, import_react71.useRef)(null);
+  const envHeaderRef = (0, import_react71.useRef)(null);
   const {
     state,
     dispatch,
@@ -30598,7 +31244,7 @@ function VirtualTableManager({
     eventTracking
   } = useAdmin();
   const showCreateEnvironmentModal = state.activeComponent === "CreateEnvironment";
-  const setShowCreateEnvironmentModal = (0, import_react70.useCallback)(
+  const setShowCreateEnvironmentModal = (0, import_react71.useCallback)(
     (show) => {
       dispatch({
         type: "SET_ACTIVE_COMPONENT",
@@ -30610,11 +31256,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);
@@ -30673,13 +31321,13 @@ function VirtualTableManager({
     setReferencedTablesMap(data.data.referencedTablesMap);
     setReferenceFiltersMap(data.data.referenceFiltersMap);
   };
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
     if (state.client.id) {
       getReferencedTablesMap();
     }
   }, [state.client.id]);
   const showVirtualTableEditorPortal = editQueryView && !clientLoading && !areTablesLoading && !state.databaseTypeMismatch.show && typeof document !== "undefined";
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
     if (!showVirtualTableEditorPortal) return;
     const prevOverflow = document.body.style.overflow;
     document.body.style.overflow = "hidden";
@@ -30687,7 +31335,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 {
@@ -30727,6 +31375,7 @@ ${duplicateColumns.join("\n")}`
           submitResponse = await addVirtualTable(
             trimmedName,
             query,
+            description,
             customFieldInfo2,
             state,
             ownerTenantFields,
@@ -30763,43 +31412,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) {
@@ -30829,6 +31480,7 @@ ${duplicateColumns.join("\n")}`
             trimmedName,
             query,
             id,
+            description,
             customFieldInfo2,
             state,
             ownerTenantFields,
@@ -30930,7 +31582,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(
@@ -30938,6 +31590,7 @@ Please delete those filters before deleting this table.`
           query,
           ownerTenantFields,
           name,
+          description,
           id,
           columns,
           void 0,
@@ -30951,6 +31604,7 @@ Please delete those filters before deleting this table.`
           ownerTenantFields,
           void 0,
           void 0,
+          void 0,
           columns,
           void 0,
           override
@@ -30992,6 +31646,7 @@ Please delete those filters before deleting this table.`
                 query,
                 ownerTenantFields,
                 name,
+                void 0,
                 id,
                 columns,
                 override
@@ -31116,6 +31771,7 @@ Please delete those filters before deleting this table.`
                                   {
                                     onClick: () => {
                                       setEditName("");
+                                      setEditDescription("");
                                       setEditVirtualTableQuery("");
                                       setEditVirtualTableId("");
                                       setInitialVirtualTable(void 0);
@@ -31664,6 +32320,7 @@ Please delete those filters before deleting this table.`
                       EditAddViewModal,
                       {
                         viewName: editName,
+                        viewDescription: editDescription,
                         viewQuery: editVirtualTableQuery,
                         viewId: editVirtualTableId,
                         viewOwnerTenantFields: editVirtualTableOwnerTenantFields,
@@ -31671,7 +32328,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);
                           }
@@ -31680,6 +32337,7 @@ Please delete those filters before deleting this table.`
                             query,
                             ownerTenantFields,
                             name,
+                            description,
                             id,
                             columns,
                             customFieldInfo2,
@@ -31725,6 +32383,7 @@ Please delete those filters before deleting this table.`
 }
 function EditAddViewModal({
   viewName,
+  viewDescription,
   viewQuery,
   viewOwnerTenantFields,
   viewId,
@@ -31739,38 +32398,42 @@ function EditAddViewModal({
   isLoading,
   noCustomerField
 }) {
-  const [name, setName] = (0, import_react70.useState)(viewName);
-  const [query, setQuery] = (0, import_react70.useState)(viewQuery);
-  const [id, setId] = (0, import_react70.useState)(viewId);
-  const [useCustomField, setUseCustomField] = (0, import_react70.useState)(
+  const [name, setName] = (0, import_react71.useState)(viewName);
+  const [description, setDescription] = (0, import_react71.useState)(viewDescription);
+  const [query, setQuery] = (0, import_react71.useState)(viewQuery);
+  const [id, setId] = (0, import_react71.useState)(viewId);
+  const [useCustomField, setUseCustomField] = (0, import_react71.useState)(
     customFieldInfo ? true : false
   );
-  const [customFieldType, setCustomFieldType] = (0, import_react70.useState)(
+  const [customFieldType, setCustomFieldType] = (0, import_react71.useState)(
     customFieldInfo ? customFieldInfo.type : "eav"
   );
-  const [customFieldQuery, setCustomFieldQuery] = (0, import_react70.useState)(
+  const [customFieldQuery, setCustomFieldQuery] = (0, import_react71.useState)(
     customFieldInfo ? customFieldInfo.query : ""
   );
-  const [runQueryButtonLoading, setRunQueryButtonLoading] = (0, import_react70.useState)(false);
-  const [tableData, setTableData] = (0, import_react70.useState)(void 0);
-  const [errorInfo, setErrorInfo] = (0, import_react70.useState)({ show: false, message: "" });
-  const clientIsSingleTenant = (0, import_react70.useMemo)(
+  const [runQueryButtonLoading, setRunQueryButtonLoading] = (0, import_react71.useState)(false);
+  const [tableData, setTableData] = (0, import_react71.useState)(void 0);
+  const [errorInfo, setErrorInfo] = (0, import_react71.useState)({ show: false, message: "" });
+  const clientIsSingleTenant = (0, import_react71.useMemo)(
     () => onlySingleDatabaseTenant(state.client),
     [state.client]
   );
   const { getToken, eventTracking } = useAdmin();
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
     setCustomFieldQuery(customFieldInfo?.query || "");
     setCustomFieldType(customFieldInfo?.type || "eav");
     setUseCustomField(customFieldInfo ? true : false);
   }, [customFieldInfo]);
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
     setName(viewName);
   }, [viewName]);
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
+    setDescription(viewDescription);
+  }, [viewDescription]);
+  (0, import_react71.useEffect)(() => {
     setQuery(viewQuery);
   }, [viewQuery]);
-  (0, import_react70.useEffect)(() => {
+  (0, import_react71.useEffect)(() => {
     setId(viewId);
   }, [viewId]);
   return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
@@ -31784,6 +32447,7 @@ function EditAddViewModal({
         setTableData(void 0);
         setErrorInfo({ show: false, message: "" });
         setName("");
+        setDescription("");
         closeEditModal();
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
@@ -31830,21 +32494,47 @@ function EditAddViewModal({
                 ]
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(InputLabel, { children: "Name" }),
-            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
-              TextInputPrimitive_default,
-              {
-                ref: (input) => {
-                  if (editModalIsOpen && !viewName) {
-                    input?.focus();
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(InputLabel, { children: "Name" }),
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+                TextInputPrimitive_default,
+                {
+                  placeholder: "Enter view display name...",
+                  onChange: (e2) => setName(e2.target.value),
+                  value: name ? name : ""
+                }
+              )
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { style: { height: 12 } }),
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { style: { display: "flex", flexDirection: "column", gap: 4 }, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(InputLabel, { children: "Description" }),
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
+                "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__ */ (0, import_jsx_runtime71.jsx)("br", {}),
+                }
+              )
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { style: { height: 16 } }),
             viewOwnerTenantFields.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(import_jsx_runtime71.Fragment, { children: [
               /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(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__ */ (0, import_jsx_runtime71.jsx)(
@@ -31879,7 +32569,7 @@ function EditAddViewModal({
                   ))
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("br", {})
+              /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { style: { height: 16 } })
             ] }),
             error && /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(import_jsx_runtime71.Fragment, { children: [
               /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("h3", { style: { color: "#CA3A31" }, children: error }),
@@ -31907,7 +32597,7 @@ function EditAddViewModal({
                       position: "relative"
                     },
                     children: [
-                      tokens.map((line, i2) => /* @__PURE__ */ (0, import_react72.createElement)(
+                      tokens.map((line, i2) => /* @__PURE__ */ (0, import_react73.createElement)(
                         "div",
                         {
                           ...getLineProps({ line }),
@@ -32094,7 +32784,7 @@ function EditAddViewModal({
                   }
                 ),
                 !errorInfo.show && tableData && !runQueryButtonLoading && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
-                  import_react71.Table,
+                  import_react72.Table,
                   {
                     rows: tableData.rows,
                     columns: tableData.fields,
@@ -32155,7 +32845,14 @@ function EditAddViewModal({
                       viewName && /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
                         MemoizedButton,
                         {
-                          onClick: () => submit("delete", query, viewOwnerTenantFields, name, id),
+                          onClick: () => submit(
+                            "delete",
+                            query,
+                            viewOwnerTenantFields,
+                            name,
+                            description,
+                            id
+                          ),
                           label: "Delete",
                           style: { color: "red", backgroundColor: "white" }
                         }
@@ -32236,6 +32933,7 @@ function EditAddViewModal({
                                   query,
                                   viewOwnerTenantFields,
                                   name,
+                                  description,
                                   id,
                                   void 0,
                                   useCustomField ? {
@@ -32283,7 +32981,9 @@ function EditAddViewModal({
   SecondaryButtonPrimitive,
   TextInputPrimitive,
   VirtualTableManager,
+  clearQuillSandboxStorage,
   exportChatAsMarkdown,
   useAdmin,
-  useAgentChat
+  useAgentChat,
+  useSandboxSession
 });