diff --git a/frontend/src/stores/commandPalette.ts b/frontend/src/stores/commandPalette.ts index 4d145f5b..3a06ee67 100644 --- a/frontend/src/stores/commandPalette.ts +++ b/frontend/src/stores/commandPalette.ts @@ -1,9 +1,20 @@ import { defineStore } from 'pinia' -import { ref } from 'vue' +import { ref, watch } from 'vue' +import { useAuthStore } from './auth' -const RECENT_KEY = 'weknora_cmdk_recent' +const RECENT_KEY_PREFIX = 'weknora_cmdk_recent' const RECENT_LIMIT = 4 +// recentKey scopes "recent searches" to the active (user, tenant) pair. +// The previous global key leaked queries between users sharing a browser +// and across tenant switches inside the same account. Falling back to +// "anon" keeps the palette functional before login finishes hydrating. +function recentKey(userId: string | null | undefined, tenantId: number | string | null | undefined): string { + const u = userId ? String(userId) : 'anon' + const t = tenantId !== null && tenantId !== undefined && tenantId !== '' ? String(tenantId) : 'none' + return `${RECENT_KEY_PREFIX}:${u}:${t}` +} + /** * Pinia store for the global command palette (⌘K / Ctrl+K). * The palette itself is rendered once in platform/index.vue. @@ -15,9 +26,16 @@ export const useCommandPaletteStore = defineStore('commandPalette', () => { const initialQuery = ref('') const recentQueries = ref([]) + // Lazily resolve the auth store inside actions / watchers — at store + // setup time pinia may not have finished registering peer stores yet. + const currentRecentKey = (): string => { + const auth = useAuthStore() + return recentKey(auth.user?.id, auth.effectiveTenantId) + } + const loadRecent = () => { try { - const raw = localStorage.getItem(RECENT_KEY) + const raw = localStorage.getItem(currentRecentKey()) recentQueries.value = raw ? JSON.parse(raw) : [] } catch { recentQueries.value = [] @@ -42,7 +60,7 @@ export const useCommandPaletteStore = defineStore('commandPalette', () => { ...recentQueries.value.filter(x => x !== trimmed), ].slice(0, RECENT_LIMIT) try { - localStorage.setItem(RECENT_KEY, JSON.stringify(recentQueries.value)) + localStorage.setItem(currentRecentKey(), JSON.stringify(recentQueries.value)) } catch { /* ignore quota errors */ } @@ -51,14 +69,23 @@ export const useCommandPaletteStore = defineStore('commandPalette', () => { const clearRecent = () => { recentQueries.value = [] try { - localStorage.removeItem(RECENT_KEY) + localStorage.removeItem(currentRecentKey()) } catch { /* ignore */ } } - // Load recent queries immediately on store creation. - loadRecent() + // Reload recent queries whenever the active user or tenant changes + // (login, logout, tenant switch). Each (user, tenant) pair has its own + // localStorage namespace so queries don't bleed across identities. + watch( + () => { + const auth = useAuthStore() + return [auth.user?.id, auth.effectiveTenantId] as const + }, + () => loadRecent(), + { immediate: true }, + ) return { open,