diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index f5f198cae3..35eff66901 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -3870,6 +3870,15 @@ function onLoginSuccess() {
async function initApp() {
const t0 = performance.now();
console.log("[STARTUP] initApp begin");
+ void Promise.all([initSavedSqlEditorPositions(), savedSqlStore.initFromStorage()])
+ .then(() => {
+ console.log(`[STARTUP] savedSqlStore.initFromStorage: ${(performance.now() - t0).toFixed(0)}ms`);
+ void queryStore.hydrateSavedSqlTabs();
+ })
+ .catch((e: any) => {
+ toast(t("connection.loadFailed", { message: e?.message || String(e) }), 5000);
+ });
+
const restoreOpenTabs = async () => {
await settingsStore.initEditorSettings();
markStartupPhase("settings-ready");
@@ -3916,15 +3925,6 @@ async function initApp() {
void promptTemplateStore.init();
- void Promise.all([initSavedSqlEditorPositions(), savedSqlStore.initFromStorage()])
- .then(() => {
- console.log(`[STARTUP] savedSqlStore.initFromStorage: ${(performance.now() - t0).toFixed(0)}ms`);
- void queryStore.hydrateSavedSqlTabs();
- })
- .catch((e: any) => {
- toast(t("connection.loadFailed", { message: e?.message || String(e) }), 5000);
- });
-
restoreActiveConnectionContext();
} catch (e: any) {
toast(t("connection.loadFailed", { message: e?.message || String(e) }), 5000);
diff --git a/apps/desktop/src/components/layout/SqlLibraryPanel.vue b/apps/desktop/src/components/layout/SqlLibraryPanel.vue
index 14fb6638e6..007140ab9b 100644
--- a/apps/desktop/src/components/layout/SqlLibraryPanel.vue
+++ b/apps/desktop/src/components/layout/SqlLibraryPanel.vue
@@ -2,7 +2,7 @@
import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from "vue";
import type { CSSProperties } from "vue";
import { useI18n } from "vue-i18n";
-import { ArrowDownWideNarrow, ChevronsDownUp, Download, FilePlus, FileText, FolderCog, FolderClosed, FolderOpen, FolderPlus, Library, LocateFixed, Pencil, Play, Search, Trash2, Upload, X } from "@lucide/vue";
+import { ArrowDownWideNarrow, ChevronsDownUp, Download, FilePlus, FileText, FolderCog, FolderClosed, FolderOpen, FolderPlus, Library, Loader2, LocateFixed, Pencil, Play, Search, Trash2, Upload, X } from "@lucide/vue";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import CustomContextMenu, { type ContextMenuItem as CtxMenuItem } from "@/components/ui/CustomContextMenu.vue";
@@ -1446,7 +1446,12 @@ function showDropInside(targetId: string) {
-
+
+
+
{{ t("common.loading") }}
+
+
+
{{ t("sqlLibrary.empty") }}
diff --git a/apps/desktop/src/stores/savedSqlStore.ts b/apps/desktop/src/stores/savedSqlStore.ts
index bd3c333b60..5b1a51ed6d 100644
--- a/apps/desktop/src/stores/savedSqlStore.ts
+++ b/apps/desktop/src/stores/savedSqlStore.ts
@@ -148,6 +148,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
const folders = ref
([]);
const files = ref([]);
const isLoaded = ref(false);
+ const loadState = ref<"idle" | "loading" | "loaded" | "failed">("idle");
let pendingSync: Promise | null = null;
let initFromStoragePromise: Promise | null = null;
const pendingFolderCreates = new Map>();
@@ -186,13 +187,20 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
async function initFromStorage() {
if (isLoaded.value) return;
if (!initFromStoragePromise) {
+ loadState.value = "loading";
initFromStoragePromise = (async () => {
await migrateLegacyLocalStorage();
applyLibrary(await api.loadSavedSqlLibrary());
isLoaded.value = true;
- })().finally(() => {
- initFromStoragePromise = null;
- });
+ loadState.value = "loaded";
+ })()
+ .catch((error) => {
+ loadState.value = "failed";
+ throw error;
+ })
+ .finally(() => {
+ initFromStoragePromise = null;
+ });
}
await initFromStoragePromise;
}
@@ -821,6 +829,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
folders,
files,
isLoaded,
+ loadState,
version,
treeVersion,
initFromStorage,
diff --git a/packages/app-tests/externalSqlFileStartup.test.ts b/packages/app-tests/externalSqlFileStartup.test.ts
index 675d1e5322..0fd8fe9442 100644
--- a/packages/app-tests/externalSqlFileStartup.test.ts
+++ b/packages/app-tests/externalSqlFileStartup.test.ts
@@ -61,14 +61,15 @@ test("web startup uses the guarded initializer behind the existing authenticatio
assert.ok(initAppStart >= 0 && initAppEnd > initAppStart);
const initAppSource = appSource.slice(initAppStart, initAppEnd);
+ const savedSqlInitialization = initAppSource.indexOf("savedSqlStore.initFromStorage()");
const webInitialization = initAppSource.indexOf("await initializeOpenTabs({");
const optionalInitialization = initAppSource.indexOf("initializeOptionalState: () => settingsStore.initAiConfigs()", webInitialization);
const requiredRestoration = initAppSource.indexOf("restoreOpenTabs,", optionalInitialization);
- const savedSqlInitialization = initAppSource.indexOf("savedSqlStore.initFromStorage()", requiredRestoration);
+ assert.ok(savedSqlInitialization >= 0);
assert.ok(webInitialization >= 0);
+ assert.ok(savedSqlInitialization < webInitialization);
assert.ok(optionalInitialization > webInitialization);
assert.ok(requiredRestoration > optionalInitialization);
- assert.ok(savedSqlInitialization > requiredRestoration);
assert.equal(initAppSource.includes("if (!desktopOpenTabsRestorationBarrier) await settingsStore.initAiConfigs()"), false);
const mountedStart = appSource.indexOf("onMounted(async () =>");
diff --git a/packages/app-tests/savedSqlStore.test.ts b/packages/app-tests/savedSqlStore.test.ts
index 3d7afabfb6..83957c6e73 100644
--- a/packages/app-tests/savedSqlStore.test.ts
+++ b/packages/app-tests/savedSqlStore.test.ts
@@ -28,6 +28,38 @@ beforeEach(() => {
vi.clearAllMocks();
});
+test("tracks saved SQL library loading and supports retry after failure", async () => {
+ let resolveLoad: ((library: SavedSqlLibrary) => void) | undefined;
+ apiMock.loadSavedSqlLibrary.mockImplementationOnce(
+ () =>
+ new Promise((resolve) => {
+ resolveLoad = resolve;
+ }),
+ );
+
+ const store = useSavedSqlStore();
+ assert.equal(store.loadState, "idle");
+
+ const loading = store.initFromStorage();
+ assert.equal(store.loadState, "loading");
+ await Promise.resolve();
+ resolveLoad?.({ folders: [], files: [] });
+ await loading;
+
+ assert.equal(store.loadState, "loaded");
+ assert.equal(store.isLoaded, true);
+
+ setActivePinia(createPinia());
+ const retryingStore = useSavedSqlStore();
+ apiMock.loadSavedSqlLibrary.mockRejectedValueOnce(new Error("storage unavailable"));
+ await assert.rejects(retryingStore.initFromStorage(), /storage unavailable/);
+ assert.equal(retryingStore.loadState, "failed");
+
+ apiMock.loadSavedSqlLibrary.mockResolvedValueOnce({ folders: [], files: [] });
+ await retryingStore.initFromStorage();
+ assert.equal(retryingStore.loadState, "loaded");
+});
+
test("concurrent saved SQL folder creates reuse the same pending folder", async () => {
let resolveSave: ((folder: SavedSqlFolder) => void) | undefined;
apiMock.saveSavedSqlFolder.mockImplementation(