feat(rename): complete searchSpace to workspace transition across frontend and backend

- Introduced a comprehensive specification for renaming `searchSpace` to `workspace` in `surfsense_web` and `surfsense_desktop`, ensuring all TypeScript identifiers, React props, and local data structures are updated.
- Implemented migration shims for persisted local state to prevent data loss during the transition.
- Updated observability metrics and IPC channels to reflect the new naming convention.
- Removed legacy `active-search-space` module and replaced it with `active-workspace` to maintain consistency.
- Ensured no behavioral changes or data loss for users during the renaming process.

surfsense_web/app/dashboard/[workspace_id]/automations/[automation_id]/automation-detail-content.tsx

@@ -45,7 +45,7 @@ export function AutomationDetailContent({
 				<ShieldAlert className="mx-auto h-10 w-10 text-muted-foreground" aria-hidden />
 				<h2 className="mt-3 text-base font-semibold text-foreground">Access denied</h2>
 				<p className="mt-1 text-sm text-muted-foreground max-w-md mx-auto">
-					You don't have permission to view automations in this search space.
+					You don't have permission to view automations in this workspace.
 				</p>
 			</div>
 		);

surfsense_web/app/dashboard/[workspace_id]/automations/[automation_id]/edit/automation-edit-content.tsx

@@ -32,7 +32,7 @@ export function AutomationEditContent({ workspaceId, automationId }: AutomationE
 				<ShieldAlert className="mx-auto h-10 w-10 text-muted-foreground" aria-hidden />
 				<h2 className="mt-3 text-base font-semibold text-foreground">Access denied</h2>
 				<p className="mt-1 text-sm text-muted-foreground max-w-md mx-auto">
-					You don't have permission to edit automations in this search space.
+					You don't have permission to edit automations in this workspace.
 				</p>
 			</div>
 		);

surfsense_web/app/dashboard/[workspace_id]/automations/automations-content.tsx

@@ -13,7 +13,7 @@ interface AutomationsContentProps {
 
 /**
  * Client orchestrator for the automations list page. Pulls the active
- * search space's first page (via ``useAutomations`` → ``automationsListAtom``)
+ * workspace's first page (via ``useAutomations`` → ``automationsListAtom``)
  * and the user's permissions, then decides between empty / loading / table.
  *
  * Read access is mandatory; anything else is hidden behind RBAC. The
@@ -46,7 +46,7 @@ export function AutomationsContent({ workspaceId }: AutomationsContentProps) {
 				<ShieldAlert className="mx-auto h-10 w-10 text-muted-foreground" aria-hidden />
 				<h2 className="mt-3 text-base font-semibold text-foreground">Access denied</h2>
 				<p className="mt-1 text-sm text-muted-foreground max-w-md mx-auto">
-					You don't have permission to view automations in this search space.
+					You don't have permission to view automations in this workspace.
 				</p>
 			</div>
 		);

surfsense_web/app/dashboard/[workspace_id]/automations/components/automations-empty-state.tsx

@@ -40,7 +40,7 @@ export function AutomationsEmptyState({ workspaceId, canCreate }: AutomationsEmp
 				</div>
 			) : (
 				<p className="mt-6 text-xs text-muted-foreground">
-					You don't have permission to create automations in this search space.
+					You don't have permission to create automations in this workspace.
 				</p>
 			)}
 		</div>

surfsense_web/app/dashboard/[workspace_id]/automations/components/builder/automation-builder-form.tsx

@@ -120,7 +120,7 @@ export function AutomationBuilderForm({
 
 	const [submitting, setSubmitting] = useState(false);
 
-	// Eligible models + the search-space-seeded defaults. Models are chosen per
+	// Eligible models + the workspace-seeded defaults. Models are chosen per
 	// automation on create; in edit mode the backend preserves the captured
 	// snapshot, so the picker is create-only.
 	const eligibleModels = useAutomationEligibleModels();

surfsense_web/app/dashboard/[workspace_id]/automations/components/builder/mention-task-input.tsx

@@ -235,7 +235,7 @@ export function MentionTaskInput({
 						<ComposerSuggestionPopoverContent side="bottom">
 							<DocumentMentionPicker
 								ref={pickerRef}
-								searchSpaceId={workspaceId}
+								workspaceId={workspaceId}
 								onSelectionChange={handleSelection}
 								onDone={closePopover}
 								initialSelectedDocuments={mentions}

surfsense_web/app/dashboard/[workspace_id]/automations/components/delete-automation-dialog.tsx

@@ -47,7 +47,7 @@ export function DeleteAutomationDialog({
 	async function handleConfirm() {
 		setSubmitting(true);
 		try {
-			await deleteAutomation({ automationId, searchSpaceId: workspaceId });
+			await deleteAutomation({ automationId, workspaceId: workspaceId });
 			onDeleted?.();
 			onOpenChange(false);
 		} finally {

surfsense_web/app/dashboard/[workspace_id]/automations/new/automation-new-content.tsx

@@ -31,7 +31,7 @@ export function AutomationNewContent({ workspaceId }: AutomationNewContentProps)
 				<ShieldAlert className="mx-auto h-10 w-10 text-muted-foreground" aria-hidden />
 				<h2 className="mt-3 text-base font-semibold text-foreground">Access denied</h2>
 				<p className="mt-1 text-sm text-muted-foreground max-w-md mx-auto">
-					You don't have permission to create automations in this search space.
+					You don't have permission to create automations in this workspace.
 				</p>
 			</div>
 		);

surfsense_web/app/dashboard/[workspace_id]/chats/page.tsx

@@ -5,7 +5,7 @@ export default async function ChatsPage({ params }: { params: Promise<{ workspac
 
 	return (
 		<div className="w-full select-none">
-			<AllChatsWorkspaceContent searchSpaceId={workspace_id} />
+			<AllChatsWorkspaceContent workspaceId={workspace_id} />
 		</div>
 	);
 }

surfsense_web/app/dashboard/[workspace_id]/client-layout.tsx

@@ -52,12 +52,12 @@ export function DashboardClientLayout({
 
 	const isOnboardingPage = pathname?.includes("/onboard");
 	const isOwner = access?.is_owner ?? false;
-	const isSearchSpaceReady = activeWorkspaceId === workspaceId;
+	const isWorkspaceReady = activeWorkspaceId === workspaceId;
 
 	useEffect(() => {
-		if (isSearchSpaceReady) return;
+		if (isWorkspaceReady) return;
 		setHasCheckedOnboarding(false);
-	}, [isSearchSpaceReady]);
+	}, [isWorkspaceReady]);
 
 	useEffect(() => {
 		if (isOnboardingPage) {
@@ -66,7 +66,7 @@ export function DashboardClientLayout({
 		}
 
 		if (
-			isSearchSpaceReady &&
+			isWorkspaceReady &&
 			!loading &&
 			!accessLoading &&
 			!globalConfigsLoading &&
@@ -75,7 +75,7 @@ export function DashboardClientLayout({
 			!hasCheckedOnboarding
 		) {
 			// Onboarding is only relevant when no operator-provided
-			// global_llm_config.yaml exists. When it does, search spaces inherit
+			// global_llm_config.yaml exists. When it does, workspaces inherit
 			// the global config and should never be forced into onboarding.
 			if (globalConfigStatus?.exists) {
 				setHasCheckedOnboarding(true);
@@ -102,7 +102,7 @@ export function DashboardClientLayout({
 			setHasCheckedOnboarding(true);
 		}
 	}, [
-		isSearchSpaceReady,
+		isWorkspaceReady,
 		loading,
 		accessLoading,
 		globalConfigsLoading,
@@ -153,13 +153,13 @@ export function DashboardClientLayout({
 		setActiveWorkspaceIdState(activeSeacrhSpaceId);
 
 		// Sync to Electron store if stored value is null (first navigation)
-		if (electronAPI?.getActiveSearchSpace && electronAPI.setActiveSearchSpace) {
-			const setActiveSearchSpace = electronAPI.setActiveSearchSpace;
+		if (electronAPI?.getActiveWorkspace && electronAPI.setActiveWorkspace) {
+			const setActiveWorkspace = electronAPI.setActiveWorkspace;
 			electronAPI
-				.getActiveSearchSpace()
+				.getActiveWorkspace()
 				.then((stored: string | null) => {
 					if (!stored) {
-						setActiveSearchSpace(activeSeacrhSpaceId);
+						setActiveWorkspace(activeSeacrhSpaceId);
 					}
 				})
 				.catch(() => {});
@@ -169,7 +169,7 @@ export function DashboardClientLayout({
 	// Determine if we should show loading
 	const shouldShowLoading =
 		!hasCheckedOnboarding &&
-		(!isSearchSpaceReady ||
+		(!isWorkspaceReady ||
 			loading ||
 			accessLoading ||
 			globalConfigsLoading ||
@@ -214,7 +214,7 @@ export function DashboardClientLayout({
 	return (
 		<DocumentUploadDialogProvider>
 			<OnboardingTour />
-			<LayoutDataProvider searchSpaceId={workspaceId}>{children}</LayoutDataProvider>
+			<LayoutDataProvider workspaceId={workspaceId}>{children}</LayoutDataProvider>
 		</DocumentUploadDialogProvider>
 	);
 }

surfsense_web/app/dashboard/[workspace_id]/new-chat/[[...chat_id]]/page.tsx

@@ -579,7 +579,7 @@ export default function NewChatPage() {
 				error,
 				flow,
 				context: {
-					searchSpaceId: workspaceId,
+					workspaceId: workspaceId,
 					threadId,
 				},
 			});
@@ -717,7 +717,7 @@ export default function NewChatPage() {
 		data: typeof threadMessagesQuery.data;
 	}>({ threadId: null, data: undefined });
 
-	// Reset thread-local runtime state on route/search-space changes. Data fetching
+	// Reset thread-local runtime state on route/workspace changes. Data fetching
 	// is handled by React Query below so the chat shell can render immediately.
 	useEffect(() => {
 		const nextThreadId = urlChatId > 0 ? urlChatId : null;
@@ -755,7 +755,7 @@ export default function NewChatPage() {
 				chatId: thread.id,
 				title: thread.title,
 				chatUrl: `/dashboard/${thread.workspace_id ?? workspaceId}/new-chat/${thread.id}`,
-				searchSpaceId: thread.workspace_id ?? workspaceId,
+				workspaceId: thread.workspace_id ?? workspaceId,
 				visibility: thread.visibility,
 				hasComments: thread.has_comments ?? false,
 			});
@@ -892,7 +892,7 @@ export default function NewChatPage() {
 			}
 			setCurrentThreadMetadata({
 				id: null,
-				searchSpaceId: null,
+				workspaceId: null,
 				visibility: null,
 				hasComments: false,
 			});
@@ -906,7 +906,7 @@ export default function NewChatPage() {
 
 		setCurrentThreadMetadata({
 			id: currentThread.id,
-			searchSpaceId: currentThread.workspace_id ?? workspaceId,
+			workspaceId: currentThread.workspace_id ?? workspaceId,
 			visibility,
 			hasComments: currentThread.has_comments ?? false,
 		});

surfsense_web/app/dashboard/[workspace_id]/onboard/page.tsx

@@ -74,7 +74,7 @@ export default function OnboardPage() {
 					</p>
 				</div>
 				<ModelProviderConnectionsPanel
-					searchSpaceId={workspaceId}
+					workspaceId={workspaceId}
 					connections={connections}
 					className="flex flex-col gap-6 text-left"
 					footerAction={

surfsense_web/app/dashboard/[workspace_id]/page.tsx

@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 
-export default async function SearchSpaceDashboardPage({
+export default async function WorkspaceDashboardPage({
 	params,
 }: {
 	params: Promise<{ workspace_id: string }>;

surfsense_web/app/dashboard/[workspace_id]/team/team-content.tsx

@@ -96,7 +96,7 @@ import type { Role } from "@/contracts/types/roles.types";
 import { invitesApiService } from "@/lib/apis/invites-api.service";
 import { rolesApiService } from "@/lib/apis/roles-api.service";
 import { formatRelativeDate } from "@/lib/format-date";
-import { trackSearchSpaceInviteSent, trackSearchSpaceUsersViewed } from "@/lib/posthog/events";
+import { trackWorkspaceInviteSent, trackWorkspaceUsersViewed } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { cn } from "@/lib/utils";
 
@@ -229,7 +229,7 @@ export function TeamContent({ workspaceId }: TeamContentProps) {
 	useEffect(() => {
 		if (members.length > 0 && !membersLoading) {
 			const ownerCount = members.filter((m) => m.is_owner).length;
-			trackSearchSpaceUsersViewed(workspaceId, members.length, ownerCount);
+			trackWorkspaceUsersViewed(workspaceId, members.length, ownerCount);
 		}
 	}, [members, membersLoading, workspaceId]);
 
@@ -654,7 +654,7 @@ function CreateInviteDialog({
 			setCreatedInvite(invite);
 
 			const roleName = roleId ? roles.find((r) => r.id.toString() === roleId)?.name : undefined;
-			trackSearchSpaceInviteSent(workspaceId, {
+			trackWorkspaceInviteSent(workspaceId, {
 				roleName,
 				hasExpiry: !!expiresAt,
 				hasMaxUses: !!maxUses,

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/AgentPermissionsContent.tsx

@@ -226,9 +226,7 @@ export function AgentPermissionsContent() {
 	}
 
 	if (!workspaceId) {
-		return (
-			<p className="text-sm text-muted-foreground">Open a search space to manage agent rules.</p>
-		);
+		return <p className="text-sm text-muted-foreground">Open a workspace to manage agent rules.</p>;
 	}
 
 	return (

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/DesktopContent.tsx

@@ -13,15 +13,15 @@ import {
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
-import type { SearchSpace } from "@/contracts/types/workspace.types";
+import type { Workspace } from "@/contracts/types/workspace.types";
 import { useElectronAPI } from "@/hooks/use-platform";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 
 export function DesktopContent() {
 	const api = useElectronAPI();
 	const [loading, setLoading] = useState(true);
 
-	const [searchSpaces, setSearchSpaces] = useState<SearchSpace[]>([]);
+	const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
 	const [activeSpaceId, setActiveSpaceId] = useState<string | null>(null);
 
 	const [autoLaunchEnabled, setAutoLaunchEnabled] = useState(false);
@@ -40,14 +40,14 @@ export function DesktopContent() {
 		setAutoLaunchSupported(hasAutoLaunchApi);
 
 		Promise.all([
-			api.getActiveSearchSpace?.() ?? Promise.resolve(null),
-			searchSpacesApiService.getSearchSpaces(),
+			api.getActiveWorkspace?.() ?? Promise.resolve(null),
+			workspacesApiService.getWorkspaces(),
 			hasAutoLaunchApi ? api.getAutoLaunch() : Promise.resolve(null),
 		])
 			.then(([spaceId, spaces, autoLaunch]) => {
 				if (!mounted) return;
 				setActiveSpaceId(spaceId);
-				if (spaces) setSearchSpaces(spaces);
+				if (spaces) setWorkspaces(spaces);
 				if (autoLaunch) {
 					setAutoLaunchEnabled(autoLaunch.enabled);
 					setAutoLaunchHidden(autoLaunch.openAsHidden);
@@ -136,30 +136,30 @@ export function DesktopContent() {
 		}
 	};
 
-	const handleSearchSpaceChange = (value: string) => {
+	const handleWorkspaceChange = (value: string) => {
 		setActiveSpaceId(value);
-		api.setActiveSearchSpace?.(value);
-		toast.success("Default search space updated");
+		api.setActiveWorkspace?.(value);
+		toast.success("Default workspace updated");
 	};
 
 	return (
 		<div className="flex flex-col gap-4 md:gap-6">
 			<section>
 				<div className="pb-2 md:pb-3">
-					<h2 className="text-base md:text-lg font-semibold">Default Search Space</h2>
+					<h2 className="text-base md:text-lg font-semibold">Default Workspace</h2>
 					<p className="text-xs md:text-sm text-muted-foreground">
-						Choose which search space General Assist, Screenshot Assist, and Quick Assist use by
+						Choose which workspace General Assist, Screenshot Assist, and Quick Assist use by
 						default.
 					</p>
 				</div>
 				<div>
-					{searchSpaces.length > 0 ? (
-						<Select value={activeSpaceId ?? undefined} onValueChange={handleSearchSpaceChange}>
+					{workspaces.length > 0 ? (
+						<Select value={activeSpaceId ?? undefined} onValueChange={handleWorkspaceChange}>
 							<SelectTrigger className="w-full">
-								<SelectValue placeholder="Select a search space" />
+								<SelectValue placeholder="Select a workspace" />
 							</SelectTrigger>
 							<SelectContent>
-								{searchSpaces.map((space) => (
+								{workspaces.map((space) => (
 									<SelectItem key={space.id} value={String(space.id)}>
 										{space.name}
 									</SelectItem>
@@ -167,9 +167,7 @@ export function DesktopContent() {
 							</SelectContent>
 						</Select>
 					) : (
-						<p className="text-sm text-muted-foreground">
-							No search spaces found. Create one first.
-						</p>
+						<p className="text-sm text-muted-foreground">No workspaces found. Create one first.</p>
 					)}
 				</div>
 			</section>

surfsense_web/app/dashboard/[workspace_id]/user-settings/components/MessagingChannelsContent.tsx

@@ -17,8 +17,8 @@ import {
 } from "@/components/ui/select";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
-import type { SearchSpace } from "@/contracts/types/workspace.types";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import type { Workspace } from "@/contracts/types/workspace.types";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { authenticatedFetch } from "@/lib/auth-fetch";
 import { buildBackendUrl } from "@/lib/env-config";
 import { cn } from "@/lib/utils";
@@ -79,7 +79,7 @@ export function MessagingChannelsContent() {
 	const workspaceId = Number(params.workspace_id);
 	const [gatewayConfig, setGatewayConfig] = useState<GatewayConfigState>(null);
 	const [connections, setConnections] = useState<GatewayConnection[]>([]);
-	const [searchSpaces, setSearchSpaces] = useState<SearchSpace[]>([]);
+	const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
 	const [pairing, setPairing] = useState<Pairing | null>(null);
 	const [pairingPlatform, setPairingPlatform] = useState<PairingPlatform | null>(null);
 	const [baileysHealth, setBaileysHealth] = useState<BaileysHealth | null>(null);
@@ -114,11 +114,11 @@ export function MessagingChannelsContent() {
 	const refresh = useCallback(async () => {
 		const [nextConnections, spaces, nextGatewayConfig] = await Promise.all([
 			fetchConnections(),
-			searchSpacesApiService.getSearchSpaces(),
+			workspacesApiService.getWorkspaces(),
 			fetchGatewayConfig(),
 		]);
 		setConnections(nextConnections);
-		setSearchSpaces(spaces);
+		setWorkspaces(spaces);
 		setGatewayConfig(nextGatewayConfig);
 	}, [fetchConnections, fetchGatewayConfig]);
 
@@ -210,10 +210,7 @@ export function MessagingChannelsContent() {
 		await refreshPlatform(connection.platform as GatewayPlatform);
 	}
 
-	async function updateConnectionSearchSpace(
-		connection: GatewayConnection,
-		nextWorkspaceId: string
-	) {
+	async function updateConnectionWorkspace(connection: GatewayConnection, nextWorkspaceId: string) {
 		const previousConnections = connections;
 		const parsedWorkspaceId = Number(nextWorkspaceId);
 		const targetKey = connectionKey(connection);
@@ -324,14 +321,14 @@ export function MessagingChannelsContent() {
 							<div className="flex flex-wrap items-center gap-2">
 								<Select
 									value={String(connection.workspace_id)}
-									onValueChange={(value) => updateConnectionSearchSpace(connection, value)}
-									disabled={searchSpaces.length === 0}
+									onValueChange={(value) => updateConnectionWorkspace(connection, value)}
+									disabled={workspaces.length === 0}
 								>
 									<SelectTrigger className="h-8 min-w-[180px] flex-1 text-xs">
-										<SelectValue placeholder="Select search space" />
+										<SelectValue placeholder="Select workspace" />
 									</SelectTrigger>
 									<SelectContent>
-										{searchSpaces.map((space) => (
+										{workspaces.map((space) => (
 											<SelectItem key={space.id} value={String(space.id)}>
 												{space.name}
 											</SelectItem>
@@ -409,7 +406,7 @@ export function MessagingChannelsContent() {
 					<AlertDescription>
 						<p>
 							Soon you'll be able to connect WhatsApp, Telegram, Slack, and Discord to your
-							SurfSense agent so you can ask questions, route messages to search spaces, and get
+							SurfSense agent so you can ask questions, route messages to workspaces, and get
 							answers from your knowledge base without leaving your chat app.
 						</p>
 					</AlertDescription>

surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx

@@ -9,25 +9,20 @@ import { useCallback, useMemo, useState } from "react";
 import { Separator } from "@/components/ui/separator";
 import { cn } from "@/lib/utils";
 
-export type SearchSpaceSettingsTab =
-	| "general"
-	| "models"
-	| "team-roles"
-	| "prompts"
-	| "public-links";
+export type WorkspaceSettingsTab = "general" | "models" | "team-roles" | "prompts" | "public-links";
 
-const DEFAULT_TAB: SearchSpaceSettingsTab = "general";
+const DEFAULT_TAB: WorkspaceSettingsTab = "general";
 
-interface SearchSpaceSettingsLayoutShellProps {
+interface WorkspaceSettingsLayoutShellProps {
 	workspaceId: string;
 	children: React.ReactNode;
 }
 
-export function SearchSpaceSettingsLayoutShell({
+export function WorkspaceSettingsLayoutShell({
 	workspaceId,
 	children,
-}: SearchSpaceSettingsLayoutShellProps) {
-	const t = useTranslations("searchSpaceSettings");
+}: WorkspaceSettingsLayoutShellProps) {
+	const t = useTranslations("workspaceSettings");
 	const segment = useSelectedLayoutSegment();
 	const [tabScrollPos, setTabScrollPos] = useState<"start" | "middle" | "end">("start");
 
@@ -69,13 +64,13 @@ export function SearchSpaceSettingsLayoutShell({
 		[t]
 	);
 
-	const activeTab: SearchSpaceSettingsTab =
+	const activeTab: WorkspaceSettingsTab =
 		segment && navItems.some((item) => item.value === segment)
-			? (segment as SearchSpaceSettingsTab)
+			? (segment as WorkspaceSettingsTab)
 			: DEFAULT_TAB;
 	const selectedLabel = navItems.find((item) => item.value === activeTab)?.label ?? t("title");
 
-	const hrefFor = (tab: SearchSpaceSettingsTab) =>
+	const hrefFor = (tab: WorkspaceSettingsTab) =>
 		`/dashboard/${workspaceId}/workspace-settings/${tab}`;
 
 	return (

surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout.tsx

@@ -1,8 +1,8 @@
 import type React from "react";
 import { use } from "react";
-import { SearchSpaceSettingsLayoutShell } from "./layout-shell";
+import { WorkspaceSettingsLayoutShell } from "./layout-shell";
 
-export default function SearchSpaceSettingsLayout({
+export default function WorkspaceSettingsLayout({
 	params,
 	children,
 }: {
@@ -12,8 +12,8 @@ export default function SearchSpaceSettingsLayout({
 	const { workspace_id } = use(params);
 
 	return (
-		<SearchSpaceSettingsLayoutShell workspaceId={workspace_id}>
+		<WorkspaceSettingsLayoutShell workspaceId={workspace_id}>
 			{children}
-		</SearchSpaceSettingsLayoutShell>
+		</WorkspaceSettingsLayoutShell>
 	);
 }

surfsense_web/app/dashboard/[workspace_id]/workspace-settings/page.tsx

@@ -1,6 +1,6 @@
 import { redirect } from "next/navigation";
 
-export default async function SearchSpaceSettingsPage({
+export default async function WorkspaceSettingsPage({
 	params,
 }: {
 	params: Promise<{ workspace_id: string }>;

surfsense_web/app/dashboard/page.tsx

@@ -6,8 +6,8 @@ import { motion } from "motion/react";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { useEffect, useState } from "react";
-import { searchSpacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
-import { CreateSearchSpaceDialog } from "@/components/layout";
+import { workspacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
+import { CreateWorkspaceDialog } from "@/components/layout";
 import { Button } from "@/components/ui/button";
 import { Card, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
 import { useGlobalLoadingEffect } from "@/hooks/use-global-loading";
@@ -42,7 +42,7 @@ function ErrorScreen({ message }: { message: string }) {
 }
 
 function EmptyState({ onCreateClick }: { onCreateClick: () => void }) {
-	const t = useTranslations("searchSpace");
+	const t = useTranslations("workspace");
 
 	return (
 		<div className="flex min-h-screen flex-col items-center justify-center gap-4 p-4">
@@ -74,26 +74,26 @@ export default function DashboardPage() {
 	const router = useRouter();
 	const [showCreateDialog, setShowCreateDialog] = useState(false);
 
-	const { data: searchSpaces = [], isLoading, error } = useAtomValue(searchSpacesAtom);
+	const { data: workspaces = [], isLoading, error } = useAtomValue(workspacesAtom);
 
 	useEffect(() => {
 		if (isLoading) return;
 
-		if (searchSpaces.length > 0) {
+		if (workspaces.length > 0) {
 			// Read the query string at the time of redirect — no subscription needed.
 			// (Vercel Best Practice: rerender-defer-reads 5.2)
 			const query = window.location.search;
-			router.replace(`/dashboard/${searchSpaces[0].id}/new-chat${query}`);
+			router.replace(`/dashboard/${workspaces[0].id}/new-chat${query}`);
 		}
-	}, [isLoading, searchSpaces, router]);
+	}, [isLoading, workspaces, router]);
 
 	// Show loading while fetching or while we have spaces and are about to redirect
-	const shouldShowLoading = isLoading || searchSpaces.length > 0;
+	const shouldShowLoading = isLoading || workspaces.length > 0;
 
 	// Use global loading screen - spinner animation won't reset
 	useGlobalLoadingEffect(shouldShowLoading);
 
-	if (error) return <ErrorScreen message={error?.message || "Failed to load search spaces"} />;
+	if (error) return <ErrorScreen message={error?.message || "Failed to load workspaces"} />;
 
 	if (shouldShowLoading) {
 		return null;
@@ -102,7 +102,7 @@ export default function DashboardPage() {
 	return (
 		<>
 			<EmptyState onCreateClick={() => setShowCreateDialog(true)} />
-			<CreateSearchSpaceDialog open={showCreateDialog} onOpenChange={setShowCreateDialog} />
+			<CreateWorkspaceDialog open={showCreateDialog} onOpenChange={setShowCreateDialog} />
 		</>
 	);
 }

surfsense_web/app/desktop/login/page.tsx

@@ -14,7 +14,7 @@ import { Separator } from "@/components/ui/separator";
 import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { getPostLoginRedirectPath } from "@/lib/auth-utils";
 
 type ShortcutKey = "generalAssist" | "quickAsk" | "screenshotAssist";
@@ -239,7 +239,7 @@ export default function DesktopLoginPage() {
 		setIsGoogleRedirecting(true);
 		try {
 			await api?.startGoogleOAuth?.();
-			await autoSetSearchSpace();
+			await autoSetWorkspace();
 			router.push(getPostLoginRedirectPath());
 		} catch (error) {
 			setIsGoogleRedirecting(false);
@@ -247,13 +247,13 @@ export default function DesktopLoginPage() {
 		}
 	};
 
-	const autoSetSearchSpace = async () => {
+	const autoSetWorkspace = async () => {
 		try {
-			const stored = await api?.getActiveSearchSpace?.();
+			const stored = await api?.getActiveWorkspace?.();
 			if (stored) return;
-			const spaces = await searchSpacesApiService.getSearchSpaces();
+			const spaces = await workspacesApiService.getWorkspaces();
 			if (spaces?.length) {
-				await api?.setActiveSearchSpace?.(String(spaces[0].id));
+				await api?.setActiveWorkspace?.(String(spaces[0].id));
 			}
 		} catch {
 			// non-critical — dashboard-sync will catch it later
@@ -272,7 +272,7 @@ export default function DesktopLoginPage() {
 			}
 			await api.loginPassword(email, password);
 
-			await autoSetSearchSpace();
+			await autoSetWorkspace();
 
 			setTimeout(() => {
 				router.push(getPostLoginRedirectPath());

surfsense_web/app/invite/[invite_code]/page.tsx

@@ -34,9 +34,9 @@ import { useSession } from "@/hooks/use-session";
 import { invitesApiService } from "@/lib/apis/invites-api.service";
 import { setRedirectPath } from "@/lib/auth-utils";
 import {
-	trackSearchSpaceInviteAccepted,
-	trackSearchSpaceInviteDeclined,
-	trackSearchSpaceUserAdded,
+	trackWorkspaceInviteAccepted,
+	trackWorkspaceInviteDeclined,
+	trackWorkspaceUserAdded,
 } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
@@ -97,12 +97,8 @@ export default function InviteAcceptPage() {
 				setAcceptedData(result);
 
 				// Track invite accepted and user added events
-				trackSearchSpaceInviteAccepted(
-					result.workspace_id,
-					result.workspace_name,
-					result.role_name
-				);
-				trackSearchSpaceUserAdded(result.workspace_id, result.workspace_name, result.role_name);
+				trackWorkspaceInviteAccepted(result.workspace_id, result.workspace_name, result.role_name);
+				trackWorkspaceUserAdded(result.workspace_id, result.workspace_name, result.role_name);
 			}
 		} catch (err: any) {
 			setError(err.message || "Failed to accept invite");
@@ -113,7 +109,7 @@ export default function InviteAcceptPage() {
 
 	const handleDecline = () => {
 		// Track invite declined event
-		trackSearchSpaceInviteDeclined(inviteInfo?.workspace_name);
+		trackWorkspaceInviteDeclined(inviteInfo?.workspace_name);
 		router.push("/dashboard");
 	};
 
@@ -187,7 +183,7 @@ export default function InviteAcceptPage() {
 										</div>
 										<div>
 											<p className="font-medium">{acceptedData.workspace_name}</p>
-											<p className="text-sm text-muted-foreground">Search Space</p>
+											<p className="text-sm text-muted-foreground">Workspace</p>
 										</div>
 									</div>
 									<div className="flex items-center gap-3">
@@ -206,7 +202,7 @@ export default function InviteAcceptPage() {
 									className="w-full gap-2"
 									onClick={() => router.push(`/dashboard/${acceptedData.workspace_id}`)}
 								>
-									Go to Search Space
+									Go to Workspace
 									<ArrowRight className="h-4 w-4" />
 								</Button>
 							</CardFooter>
@@ -256,7 +252,7 @@ export default function InviteAcceptPage() {
 								</motion.div>
 								<CardTitle className="text-2xl">You're Invited!</CardTitle>
 								<CardDescription>
-									Sign in to join {inviteInfo?.workspace_name || "this search space"}
+									Sign in to join {inviteInfo?.workspace_name || "this workspace"}
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="space-y-4">
@@ -267,7 +263,7 @@ export default function InviteAcceptPage() {
 										</div>
 										<div>
 											<p className="font-medium">{inviteInfo?.workspace_name}</p>
-											<p className="text-sm text-muted-foreground">Search Space</p>
+											<p className="text-sm text-muted-foreground">Workspace</p>
 										</div>
 									</div>
 									{inviteInfo?.role_name && (
@@ -303,7 +299,7 @@ export default function InviteAcceptPage() {
 								</motion.div>
 								<CardTitle className="text-2xl">You're Invited!</CardTitle>
 								<CardDescription>
-									Accept this invite to join {inviteInfo?.workspace_name || "this search space"}
+									Accept this invite to join {inviteInfo?.workspace_name || "this workspace"}
 								</CardDescription>
 							</CardHeader>
 							<CardContent className="space-y-4">
@@ -314,7 +310,7 @@ export default function InviteAcceptPage() {
 										</div>
 										<div>
 											<p className="font-medium">{inviteInfo?.workspace_name}</p>
-											<p className="text-sm text-muted-foreground">Search Space</p>
+											<p className="text-sm text-muted-foreground">Workspace</p>
 										</div>
 									</div>
 									{inviteInfo?.role_name && (

surfsense_web/atoms/agent-tools/agent-tools.atoms.ts

@@ -12,78 +12,78 @@ export const agentToolsAtom = atomWithQuery((_get) => ({
 
 const STORAGE_PREFIX = "surfsense-disabled-tools-";
 
-function loadDisabledTools(searchSpaceId: string): string[] {
+function loadDisabledTools(workspaceId: string): string[] {
 	if (typeof window === "undefined") return [];
 	try {
-		const raw = localStorage.getItem(`${STORAGE_PREFIX}${searchSpaceId}`);
+		const raw = localStorage.getItem(`${STORAGE_PREFIX}${workspaceId}`);
 		return raw ? (JSON.parse(raw) as string[]) : [];
 	} catch {
 		return [];
 	}
 }
 
-function saveDisabledTools(searchSpaceId: string, tools: string[]) {
+function saveDisabledTools(workspaceId: string, tools: string[]) {
 	if (typeof window === "undefined") return;
 	if (tools.length === 0) {
-		localStorage.removeItem(`${STORAGE_PREFIX}${searchSpaceId}`);
+		localStorage.removeItem(`${STORAGE_PREFIX}${workspaceId}`);
 	} else {
-		localStorage.setItem(`${STORAGE_PREFIX}${searchSpaceId}`, JSON.stringify(tools));
+		localStorage.setItem(`${STORAGE_PREFIX}${workspaceId}`, JSON.stringify(tools));
 	}
 }
 
 const disabledToolsBaseAtom = atom<string[]>([]);
 
-/** Tracks whether the atom has been hydrated from localStorage for the current search space */
+/** Tracks whether the atom has been hydrated from localStorage for the current workspace */
 const hydratedForAtom = atom<string | null>(null);
 
 /**
  * Read/write atom for the set of disabled tool names.
- * Persists to localStorage keyed by search space ID.
+ * Persists to localStorage keyed by workspace ID.
  */
 export const disabledToolsAtom = atom(
 	(get) => {
-		const searchSpaceId = get(activeWorkspaceIdAtom);
+		const workspaceId = get(activeWorkspaceIdAtom);
 		const hydratedFor = get(hydratedForAtom);
-		if (searchSpaceId && hydratedFor !== searchSpaceId) {
-			return loadDisabledTools(searchSpaceId);
+		if (workspaceId && hydratedFor !== workspaceId) {
+			return loadDisabledTools(workspaceId);
 		}
 		return get(disabledToolsBaseAtom);
 	},
 	(get, set, update: string[] | ((prev: string[]) => string[])) => {
-		const searchSpaceId = get(activeWorkspaceIdAtom);
+		const workspaceId = get(activeWorkspaceIdAtom);
 		const prev = get(disabledToolsBaseAtom);
 		const next = typeof update === "function" ? update(prev) : update;
 		set(disabledToolsBaseAtom, next);
-		set(hydratedForAtom, searchSpaceId);
-		if (searchSpaceId) {
-			saveDisabledTools(searchSpaceId, next);
+		set(hydratedForAtom, workspaceId);
+		if (workspaceId) {
+			saveDisabledTools(workspaceId, next);
 		}
 	}
 );
 
 /**
- * Hydrate disabled tools from localStorage when search space changes.
- * Call this from a useEffect in a component that has access to the search space.
+ * Hydrate disabled tools from localStorage when workspace changes.
+ * Call this from a useEffect in a component that has access to the workspace.
  */
 export const hydrateDisabledToolsAtom = atom(null, (get, set) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
-	if (!searchSpaceId) return;
-	const stored = loadDisabledTools(searchSpaceId);
+	const workspaceId = get(activeWorkspaceIdAtom);
+	if (!workspaceId) return;
+	const stored = loadDisabledTools(workspaceId);
 	set(disabledToolsBaseAtom, stored);
-	set(hydratedForAtom, searchSpaceId);
+	set(hydratedForAtom, workspaceId);
 });
 
 /** Toggle a single tool's enabled/disabled state */
 export const toggleToolAtom = atom(null, (get, set, toolName: string) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	const current = get(disabledToolsBaseAtom);
 	const next = current.includes(toolName)
 		? current.filter((t) => t !== toolName)
 		: [...current, toolName];
 	set(disabledToolsBaseAtom, next);
-	set(hydratedForAtom, searchSpaceId);
-	if (searchSpaceId) {
-		saveDisabledTools(searchSpaceId, next);
+	set(hydratedForAtom, workspaceId);
+	if (workspaceId) {
+		saveDisabledTools(workspaceId, next);
 	}
 });
 

surfsense_web/atoms/automations/automations-mutation.atoms.ts

@@ -26,15 +26,15 @@ import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { queryClient } from "@/lib/query-client/client";
 
 // Cache invalidation strategy:
-// - Automation writes invalidate the search-space list + the touched detail.
+// - Automation writes invalidate the workspace list + the touched detail.
 // - Trigger writes only invalidate the parent automation detail (triggers
 //   come back inline in AutomationDetail).
 // We deliberately invalidate the whole "automations" prefix on the list side
-// because list is keyed by (searchSpaceId, limit, offset) and we don't track
+// because list is keyed by (workspaceId, limit, offset) and we don't track
 // the active pagination in this layer.
 
-function invalidateList(searchSpaceId: number) {
-	queryClient.invalidateQueries({ queryKey: ["automations", "list", searchSpaceId] });
+function invalidateList(workspaceId: number) {
+	queryClient.invalidateQueries({ queryKey: ["automations", "list", workspaceId] });
 }
 
 function invalidateDetail(automationId: number) {
@@ -113,17 +113,17 @@ export const updateAutomationMutationAtom = atomWithMutation(() => ({
 
 export const deleteAutomationMutationAtom = atomWithMutation(() => ({
 	meta: { suppressGlobalErrorToast: true },
-	mutationFn: async (vars: { automationId: number; searchSpaceId: number }) => {
+	mutationFn: async (vars: { automationId: number; workspaceId: number }) => {
 		await automationsApiService.deleteAutomation(vars.automationId);
 		return vars;
 	},
 	onSuccess: (vars) => {
-		invalidateList(vars.searchSpaceId);
+		invalidateList(vars.workspaceId);
 		invalidateDetail(vars.automationId);
 		toast.success("Automation deleted");
 		trackAutomationDeleted({
 			automation_id: vars.automationId,
-			workspace_id: vars.searchSpaceId,
+			workspace_id: vars.workspaceId,
 		});
 	},
 	onError: (error: Error, vars) => {

surfsense_web/atoms/automations/automations-query.atoms.ts

@@ -3,7 +3,7 @@ import { activeWorkspaceIdAtom } from "@/atoms/workspaces/workspace-query.atoms"
 import { automationsApiService } from "@/lib/apis/automations-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
-// First page of the active search space's automations.
+// First page of the active workspace's automations.
 // Detail + paginated/parameterized reads live in hooks (see use-automation.ts,
 // use-automation-runs.ts) so atoms stay tied to "current scope" and don't
 // proliferate atom families for every (id, limit, offset) tuple.
@@ -11,18 +11,18 @@ const DEFAULT_LIMIT = 50;
 const DEFAULT_OFFSET = 0;
 
 export const automationsListAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.automations.list(Number(searchSpaceId ?? 0), DEFAULT_LIMIT, DEFAULT_OFFSET),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.automations.list(Number(workspaceId ?? 0), DEFAULT_LIMIT, DEFAULT_OFFSET),
+		enabled: !!workspaceId,
 		staleTime: 60 * 1000,
 		queryFn: async () => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				return { items: [], total: 0 };
 			}
 			return automationsApiService.listAutomations({
-				workspace_id: Number(searchSpaceId),
+				workspace_id: Number(workspaceId),
 				limit: DEFAULT_LIMIT,
 				offset: DEFAULT_OFFSET,
 			});

surfsense_web/atoms/chat/current-thread.atom.ts

@@ -4,14 +4,14 @@ import { reportPanelAtom } from "./report-panel.atom";
 
 interface CurrentThreadState {
 	id: number | null;
-	searchSpaceId: number | null;
+	workspaceId: number | null;
 	visibility: ChatVisibility | null;
 	hasComments: boolean;
 }
 
 interface CurrentThreadMetadataPatch {
 	id: number | null;
-	searchSpaceId?: number | null;
+	workspaceId?: number | null;
 	visibility?: ChatVisibility | null;
 	hasComments?: boolean;
 }
@@ -24,7 +24,7 @@ interface CurrentThreadMetadataUpdate {
 
 const initialState: CurrentThreadState = {
 	id: null,
-	searchSpaceId: null,
+	workspaceId: null,
 	visibility: null,
 	hasComments: false,
 };
@@ -44,11 +44,11 @@ export const setCurrentThreadMetadataAtom = atom(
 		set(currentThreadAtom, {
 			...current,
 			id: metadata.id,
-			searchSpaceId:
-				"searchSpaceId" in metadata
-					? (metadata.searchSpaceId ?? null)
+			workspaceId:
+				"workspaceId" in metadata
+					? (metadata.workspaceId ?? null)
 					: isSameThread
-						? current.searchSpaceId
+						? current.workspaceId
 						: null,
 			visibility:
 				"visibility" in metadata

surfsense_web/atoms/connectors/connector-mutation.atoms.ts

@@ -13,38 +13,38 @@ import { queryClient } from "@/lib/query-client/client";
 import { activeWorkspaceIdAtom } from "../workspaces/workspace-query.atoms";
 
 export const createConnectorMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: cacheKeys.connectors.all(searchSpaceId ?? ""),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.connectors.all(workspaceId ?? ""),
+		enabled: !!workspaceId,
 		mutationFn: async (request: CreateConnectorRequest) => {
 			return connectorsApiService.createConnector(request);
 		},
 
 		onSuccess: () => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.connectors.all(searchSpaceId),
+				queryKey: cacheKeys.connectors.all(workspaceId),
 			});
 		},
 	};
 });
 
 export const updateConnectorMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: cacheKeys.connectors.all(searchSpaceId ?? ""),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.connectors.all(workspaceId ?? ""),
+		enabled: !!workspaceId,
 		mutationFn: async (request: UpdateConnectorRequest) => {
 			return connectorsApiService.updateConnector(request);
 		},
 
 		onSuccess: (_, request: UpdateConnectorRequest) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.connectors.all(searchSpaceId),
+				queryKey: cacheKeys.connectors.all(workspaceId),
 			});
 			queryClient.invalidateQueries({
 				queryKey: cacheKeys.connectors.byId(String(request.id)),
@@ -54,19 +54,19 @@ export const updateConnectorMutationAtom = atomWithMutation((get) => {
 });
 
 export const deleteConnectorMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: cacheKeys.connectors.all(searchSpaceId ?? ""),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.connectors.all(workspaceId ?? ""),
+		enabled: !!workspaceId,
 		mutationFn: async (request: DeleteConnectorRequest) => {
 			return connectorsApiService.deleteConnector(request);
 		},
 
 		onSuccess: (_, request: DeleteConnectorRequest) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 			queryClient.setQueryData(
-				cacheKeys.connectors.all(searchSpaceId),
+				cacheKeys.connectors.all(workspaceId),
 				(oldData: GetConnectorsResponse | undefined) => {
 					if (!oldData) return oldData;
 					return oldData.filter((connector) => connector.id !== request.id);
@@ -80,19 +80,19 @@ export const deleteConnectorMutationAtom = atomWithMutation((get) => {
 });
 
 export const indexConnectorMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
 		mutationKey: cacheKeys.connectors.index(),
-		enabled: !!searchSpaceId,
+		enabled: !!workspaceId,
 		mutationFn: async (request: IndexConnectorRequest) => {
 			return connectorsApiService.indexConnector(request);
 		},
 
 		onSuccess: (response: IndexConnectorResponse) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.connectors.all(searchSpaceId),
+				queryKey: cacheKeys.connectors.all(workspaceId),
 			});
 			queryClient.invalidateQueries({
 				queryKey: cacheKeys.connectors.byId(String(response.connector_id)),

surfsense_web/atoms/connectors/connector-query.atoms.ts

@@ -4,16 +4,16 @@ import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { activeWorkspaceIdAtom } from "../workspaces/workspace-query.atoms";
 
 export const connectorsAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.connectors.all(searchSpaceId!),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.connectors.all(workspaceId!),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000, // 5 minutes
 		queryFn: async () => {
 			return connectorsApiService.getConnectors({
 				queryParams: {
-					workspace_id: searchSpaceId!,
+					workspace_id: workspaceId!,
 				},
 			});
 		},

surfsense_web/atoms/documents/document-mutation.atoms.ts

@@ -14,12 +14,12 @@ import { queryClient } from "@/lib/query-client/client";
 import { globalDocumentsQueryParamsAtom } from "./ui.atoms";
 
 export const createDocumentMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	const documentsQueryParams = get(globalDocumentsQueryParamsAtom);
 
 	return {
 		mutationKey: cacheKeys.documents.globalQueryParams(documentsQueryParams),
-		enabled: !!searchSpaceId,
+		enabled: !!workspaceId,
 		mutationFn: async (request: CreateDocumentRequest) => {
 			return documentsApiService.createDocument(request);
 		},
@@ -34,12 +34,12 @@ export const createDocumentMutationAtom = atomWithMutation((get) => {
 });
 
 export const uploadDocumentMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	const documentsQueryParams = get(globalDocumentsQueryParamsAtom);
 
 	return {
 		mutationKey: cacheKeys.documents.globalQueryParams(documentsQueryParams),
-		enabled: !!searchSpaceId,
+		enabled: !!workspaceId,
 		mutationFn: async (request: UploadDocumentRequest) => {
 			return documentsApiService.uploadDocument(request);
 		},
@@ -47,19 +47,19 @@ export const uploadDocumentMutationAtom = atomWithMutation((get) => {
 		onSuccess: () => {
 			// Note: Toast notification is handled by the caller (DocumentUploadTab) to use i18n
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.logs.summary(searchSpaceId ?? undefined),
+				queryKey: cacheKeys.logs.summary(workspaceId ?? undefined),
 			});
 		},
 	};
 });
 
 export const updateDocumentMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	const documentsQueryParams = get(globalDocumentsQueryParamsAtom);
 
 	return {
 		mutationKey: cacheKeys.documents.globalQueryParams(documentsQueryParams),
-		enabled: !!searchSpaceId,
+		enabled: !!workspaceId,
 		mutationFn: async (request: UpdateDocumentRequest) => {
 			return documentsApiService.updateDocument(request);
 		},
@@ -77,12 +77,12 @@ export const updateDocumentMutationAtom = atomWithMutation((get) => {
 });
 
 export const deleteDocumentMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	const documentsQueryParams = get(globalDocumentsQueryParamsAtom);
 
 	return {
 		mutationKey: cacheKeys.documents.globalQueryParams(documentsQueryParams),
-		enabled: !!searchSpaceId,
+		enabled: !!workspaceId,
 		mutationFn: async (request: DeleteDocumentRequest) => {
 			return documentsApiService.deleteDocument(request);
 		},

surfsense_web/atoms/documents/folder.atoms.ts

@@ -4,7 +4,7 @@ import { atom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 
 /**
- * Set of folder IDs that are currently expanded in the tree, keyed by search space ID.
+ * Set of folder IDs that are currently expanded in the tree, keyed by workspace ID.
  * Persisted to localStorage so expand/collapse state survives page refreshes.
  */
 export const expandedFolderIdsAtom = atomWithStorage<Record<number, number[]>>(
@@ -13,7 +13,7 @@ export const expandedFolderIdsAtom = atomWithStorage<Record<number, number[]>>(
 );
 
 /**
- * Expanded folder keys for Local filesystem tree, keyed by search space ID.
+ * Expanded folder keys for Local filesystem tree, keyed by workspace ID.
  * Persisted so local tree expansion survives remounts/reloads.
  */
 export const localExpandedFolderKeysAtom = atomWithStorage<Record<number, string[]>>(

surfsense_web/atoms/documents/ui.atoms.ts

@@ -12,7 +12,7 @@ export interface AgentCreatedDocument {
 	id: number;
 	title: string;
 	documentType: string;
-	searchSpaceId: number;
+	workspaceId: number;
 	folderId: number | null;
 	createdById: string | null;
 }

surfsense_web/atoms/editor/editor-panel.atom.ts

@@ -6,7 +6,7 @@ interface EditorPanelState {
 	kind: "document" | "local_file" | "memory";
 	documentId: number | null;
 	localFilePath: string | null;
-	searchSpaceId: number | null;
+	workspaceId: number | null;
 	memoryScope: "user" | "team" | null;
 	title: string | null;
 }
@@ -16,7 +16,7 @@ const initialState: EditorPanelState = {
 	kind: "document",
 	documentId: null,
 	localFilePath: null,
-	searchSpaceId: null,
+	workspaceId: null,
 	memoryScope: null,
 	title: null,
 };
@@ -33,18 +33,18 @@ export const openEditorPanelAtom = atom(
 		get,
 		set,
 		payload:
-			| { documentId: number; searchSpaceId: number; title?: string; kind?: "document" }
+			| { documentId: number; workspaceId: number; title?: string; kind?: "document" }
 			| {
 					kind: "local_file";
 					localFilePath: string;
 					title?: string;
-					searchSpaceId?: number;
+					workspaceId?: number;
 			  }
 			| {
 					kind: "memory";
 					memoryScope: "user" | "team";
 					title?: string;
-					searchSpaceId?: number;
+					workspaceId?: number;
 			  }
 	) => {
 		if (!get(editorPanelAtom).isOpen) {
@@ -56,7 +56,7 @@ export const openEditorPanelAtom = atom(
 				kind: "local_file",
 				documentId: null,
 				localFilePath: payload.localFilePath,
-				searchSpaceId: payload.searchSpaceId ?? null,
+				workspaceId: payload.workspaceId ?? null,
 				memoryScope: null,
 				title: payload.title ?? null,
 			});
@@ -70,7 +70,7 @@ export const openEditorPanelAtom = atom(
 				kind: "memory",
 				documentId: null,
 				localFilePath: null,
-				searchSpaceId: payload.searchSpaceId ?? null,
+				workspaceId: payload.workspaceId ?? null,
 				memoryScope: payload.memoryScope,
 				title: payload.title ?? null,
 			});
@@ -83,7 +83,7 @@ export const openEditorPanelAtom = atom(
 			kind: "document",
 			documentId: payload.documentId,
 			localFilePath: null,
-			searchSpaceId: payload.searchSpaceId,
+			workspaceId: payload.workspaceId,
 			memoryScope: null,
 			title: payload.title ?? null,
 		});

surfsense_web/atoms/invites/invites-mutation.atoms.ts

@@ -79,7 +79,7 @@ export const acceptInviteMutationAtom = atomWithMutation(() => ({
 		return invitesApiService.acceptInvite(request);
 	},
 	onSuccess: () => {
-		queryClient.invalidateQueries({ queryKey: cacheKeys.searchSpaces.all });
+		queryClient.invalidateQueries({ queryKey: cacheKeys.workspaces.all });
 		toast.success("Invite accepted successfully");
 	},
 	onError: (error: Error) => {

surfsense_web/atoms/invites/invites-query.atoms.ts

@@ -4,18 +4,18 @@ import { invitesApiService } from "@/lib/apis/invites-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
 export const invitesAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.invites.all(searchSpaceId?.toString() ?? ""),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.invites.all(workspaceId?.toString() ?? ""),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000, // 5 minutes
 		queryFn: async () => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				return [];
 			}
 			return invitesApiService.getInvites({
-				workspace_id: Number(searchSpaceId),
+				workspace_id: Number(workspaceId),
 			});
 		},
 	};

surfsense_web/atoms/logs/log-mutation.atoms.ts

@@ -13,10 +13,10 @@ import { queryClient } from "@/lib/query-client/client";
  * Create Log Mutation
  */
 export const createLogMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	return {
-		mutationKey: cacheKeys.logs.list(searchSpaceId ?? undefined),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.logs.list(workspaceId ?? undefined),
+		enabled: !!workspaceId,
 		mutationFn: async (request: CreateLogRequest) => logsApiService.createLog(request),
 		onSuccess: () => {
 			// Invalidate all log-related queries (list, summary, detail, withQueryParams)
@@ -29,10 +29,10 @@ export const createLogMutationAtom = atomWithMutation((get) => {
  * Update Log Mutation
  */
 export const updateLogMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	return {
-		mutationKey: cacheKeys.logs.list(searchSpaceId ?? undefined),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.logs.list(workspaceId ?? undefined),
+		enabled: !!workspaceId,
 		mutationFn: async ({ logId, data }: { logId: number; data: UpdateLogRequest }) =>
 			logsApiService.updateLog(logId, data),
 		onSuccess: (_data, variables) => {
@@ -45,10 +45,10 @@ export const updateLogMutationAtom = atomWithMutation((get) => {
  * Delete Log Mutation
  */
 export const deleteLogMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 	return {
-		mutationKey: cacheKeys.logs.list(searchSpaceId ?? undefined),
-		enabled: !!searchSpaceId,
+		mutationKey: cacheKeys.logs.list(workspaceId ?? undefined),
+		enabled: !!workspaceId,
 		mutationFn: async (request: DeleteLogRequest) => logsApiService.deleteLog(request),
 		onSuccess: (_data, request) => {
 			queryClient.invalidateQueries({ queryKey: ["logs"] });

surfsense_web/atoms/members/members-mutation.atoms.ts

@@ -3,8 +3,8 @@ import { toast } from "sonner";
 import type {
 	DeleteMembershipRequest,
 	DeleteMembershipResponse,
-	LeaveSearchSpaceRequest,
-	LeaveSearchSpaceResponse,
+	LeaveWorkspaceRequest,
+	LeaveWorkspaceResponse,
 	UpdateMembershipRequest,
 	UpdateMembershipResponse,
 } from "@/contracts/types/members.types";
@@ -48,20 +48,20 @@ export const deleteMemberMutationAtom = atomWithMutation(() => {
 	};
 });
 
-export const leaveSearchSpaceMutationAtom = atomWithMutation(() => {
+export const leaveWorkspaceMutationAtom = atomWithMutation(() => {
 	return {
 		meta: { suppressGlobalErrorToast: true },
-		mutationFn: async (request: LeaveSearchSpaceRequest) => {
-			return membersApiService.leaveSearchSpace(request);
+		mutationFn: async (request: LeaveWorkspaceRequest) => {
+			return membersApiService.leaveWorkspace(request);
 		},
-		onSuccess: (_: LeaveSearchSpaceResponse, request: LeaveSearchSpaceRequest) => {
-			toast.success("Successfully left the search space");
+		onSuccess: (_: LeaveWorkspaceResponse, request: LeaveWorkspaceRequest) => {
+			toast.success("Successfully left the workspace");
 			queryClient.invalidateQueries({
 				queryKey: cacheKeys.members.all(request.workspace_id.toString()),
 			});
 		},
 		onError: () => {
-			toast.error("Failed to leave search space");
+			toast.error("Failed to leave workspace");
 		},
 	};
 });

surfsense_web/atoms/members/members-query.atoms.ts

@@ -5,37 +5,37 @@ import { membersApiService } from "@/lib/apis/members-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
 export const membersAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.members.all(searchSpaceId?.toString() ?? ""),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.members.all(workspaceId?.toString() ?? ""),
+		enabled: !!workspaceId,
 		staleTime: 3 * 1000, // 3 seconds - short staleness for live collaboration
 		refetchInterval: 2 * 60 * 1000, // 2 minutes
 		queryFn: async () => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				return [];
 			}
 			return membersApiService.getMembers({
-				workspace_id: Number(searchSpaceId),
+				workspace_id: Number(workspaceId),
 			});
 		},
 	};
 });
 
 export const myAccessAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.members.myAccess(searchSpaceId?.toString() ?? ""),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.members.myAccess(workspaceId?.toString() ?? ""),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000, // 5 minutes
 		queryFn: async () => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				return null;
 			}
 			return membersApiService.getMyAccess({
-				workspace_id: Number(searchSpaceId),
+				workspace_id: Number(workspaceId),
 			});
 		},
 	};

surfsense_web/atoms/model-connections/model-connections-mutation.atoms.ts

@@ -18,18 +18,18 @@ import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { queryClient } from "@/lib/query-client/client";
 import { activeWorkspaceIdAtom } from "../workspaces/workspace-query.atoms";
 
-function invalidateModelConnections(searchSpaceId: number) {
+function invalidateModelConnections(workspaceId: number) {
 	queryClient.invalidateQueries({
-		queryKey: cacheKeys.modelConnections.all(searchSpaceId),
+		queryKey: cacheKeys.modelConnections.all(workspaceId),
 	});
 	queryClient.invalidateQueries({
-		queryKey: cacheKeys.modelConnections.roles(searchSpaceId),
+		queryKey: cacheKeys.modelConnections.roles(workspaceId),
 	});
 }
 
-function upsertModelConnection(searchSpaceId: number, connection: ConnectionRead) {
+function upsertModelConnection(workspaceId: number, connection: ConnectionRead) {
 	queryClient.setQueryData<ConnectionRead[]>(
-		cacheKeys.modelConnections.all(searchSpaceId),
+		cacheKeys.modelConnections.all(workspaceId),
 		(current = []) => {
 			if (current.some((item) => item.id === connection.id)) {
 				return current.map((item) => (item.id === connection.id ? connection : item));
@@ -40,19 +40,19 @@ function upsertModelConnection(searchSpaceId: number, connection: ConnectionRead
 }
 
 export const createModelConnectionMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-connections", "create"],
 		mutationFn: (request: ConnectionCreateRequest) =>
 			modelConnectionsApiService.createConnection(request),
 		onSuccess: (connection: ConnectionRead, request: ConnectionCreateRequest) => {
-			const resolvedSearchSpaceId = Number(
-				request.workspace_id ?? connection.workspace_id ?? searchSpaceId
+			const resolvedWorkspaceId = Number(
+				request.workspace_id ?? connection.workspace_id ?? workspaceId
 			);
 			toast.success("Connection created");
-			if (resolvedSearchSpaceId > 0) {
-				upsertModelConnection(resolvedSearchSpaceId, connection);
-				invalidateModelConnections(resolvedSearchSpaceId);
+			if (resolvedWorkspaceId > 0) {
+				upsertModelConnection(resolvedWorkspaceId, connection);
+				invalidateModelConnections(resolvedWorkspaceId);
 			}
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to create connection"),
@@ -60,34 +60,34 @@ export const createModelConnectionMutationAtom = atomWithMutation((get) => {
 });
 
 export const updateModelConnectionMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-connections", "update"],
 		mutationFn: ({ id, data }: { id: number; data: ConnectionUpdateRequest }) =>
 			modelConnectionsApiService.updateConnection(id, data),
 		onSuccess: () => {
 			toast.success("Connection updated");
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to update connection"),
 	};
 });
 
 export const deleteModelConnectionMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-connections", "delete"],
 		mutationFn: (id: number) => modelConnectionsApiService.deleteConnection(id),
 		onSuccess: () => {
 			toast.success("Connection deleted");
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to delete connection"),
 	};
 });
 
 export const verifyModelConnectionMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-connections", "verify"],
 		mutationFn: (id: number) => modelConnectionsApiService.verifyConnection(id),
@@ -103,14 +103,14 @@ export const verifyModelConnectionMutationAtom = atomWithMutation((get) => {
 						: "Couldn't list models. Chat may still work — add model IDs manually."
 				);
 			}
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to verify connection"),
 	};
 });
 
 export const discoverConnectionModelsMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-connections", "discover"],
 		mutationFn: (id: number) => modelConnectionsApiService.discoverModels(id),
@@ -118,7 +118,7 @@ export const discoverConnectionModelsMutationAtom = atomWithMutation((get) => {
 			toast.success(
 				models.length ? `${models.length} models discovered` : "No models found for this connection"
 			);
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to discover models"),
 	};
@@ -149,64 +149,64 @@ export const testPreviewModelMutationAtom = atomWithMutation(() => {
 });
 
 export const addManualModelMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["models", "add-manual"],
 		mutationFn: ({ connectionId, data }: { connectionId: number; data: ModelCreateRequest }) =>
 			modelConnectionsApiService.addManualModel(connectionId, data),
 		onSuccess: () => {
 			toast.success("Model added");
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to add model"),
 	};
 });
 
 export const updateModelMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["models", "update"],
 		mutationFn: ({ id, data }: { id: number; data: ModelUpdateRequest }) =>
 			modelConnectionsApiService.updateModel(id, data),
-		onSuccess: () => invalidateModelConnections(searchSpaceId),
+		onSuccess: () => invalidateModelConnections(workspaceId),
 		onError: (error: Error) => toast.error(error.message || "Failed to update model"),
 	};
 });
 
 export const bulkUpdateModelsMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["models", "bulk-update"],
 		mutationFn: ({ connectionId, data }: { connectionId: number; data: ModelsBulkUpdateRequest }) =>
 			modelConnectionsApiService.bulkUpdateModels(connectionId, data),
-		onSuccess: () => invalidateModelConnections(searchSpaceId),
+		onSuccess: () => invalidateModelConnections(workspaceId),
 		onError: (error: Error) => toast.error(error.message || "Failed to update models"),
 	};
 });
 
 export const testModelMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["models", "test"],
 		mutationFn: (id: number) => modelConnectionsApiService.testModel(id),
 		onSuccess: (result: VerifyConnectionResponse) => {
 			if (result.ok) toast.success("Model test succeeded");
 			else toast.error(result.message || "Model test failed");
-			invalidateModelConnections(searchSpaceId);
+			invalidateModelConnections(workspaceId);
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to test model"),
 	};
 });
 
 export const updateModelRolesMutationAtom = atomWithMutation((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
 		mutationKey: ["model-roles", "update"],
 		mutationFn: (roles: ModelRoles) =>
-			modelConnectionsApiService.updateModelRoles(searchSpaceId, roles),
+			modelConnectionsApiService.updateModelRoles(workspaceId, roles),
 		onSuccess: () => {
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.modelConnections.roles(searchSpaceId),
+				queryKey: cacheKeys.modelConnections.roles(workspaceId),
 			});
 		},
 		onError: (error: Error) => toast.error(error.message || "Failed to update model roles"),

surfsense_web/atoms/model-connections/model-connections-query.atoms.ts

@@ -26,21 +26,21 @@ export const modelProvidersAtom = atomWithQuery(() => ({
 }));
 
 export const modelConnectionsAtom = atomWithQuery((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
-		queryKey: cacheKeys.modelConnections.all(searchSpaceId),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.modelConnections.all(workspaceId),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000,
-		queryFn: () => modelConnectionsApiService.getConnections(searchSpaceId),
+		queryFn: () => modelConnectionsApiService.getConnections(workspaceId),
 	};
 });
 
 export const modelRolesAtom = atomWithQuery((get) => {
-	const searchSpaceId = Number(get(activeWorkspaceIdAtom));
+	const workspaceId = Number(get(activeWorkspaceIdAtom));
 	return {
-		queryKey: cacheKeys.modelConnections.roles(searchSpaceId),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.modelConnections.roles(workspaceId),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000,
-		queryFn: () => modelConnectionsApiService.getModelRoles(searchSpaceId),
+		queryFn: () => modelConnectionsApiService.getModelRoles(workspaceId),
 	};
 });

surfsense_web/atoms/public-chat-snapshots/public-chat-snapshots-query.atoms.ts

@@ -4,18 +4,18 @@ import { chatThreadsApiService } from "@/lib/apis/chat-threads-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
 export const publicChatSnapshotsAtom = atomWithQuery((get) => {
-	const searchSpaceId = get(activeWorkspaceIdAtom);
+	const workspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		queryKey: cacheKeys.publicChatSnapshots.bySearchSpace(Number(searchSpaceId) || 0),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.publicChatSnapshots.byWorkspace(Number(workspaceId) || 0),
+		enabled: !!workspaceId,
 		staleTime: 5 * 60 * 1000,
 		queryFn: async () => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				return { snapshots: [] };
 			}
-			return chatThreadsApiService.listPublicChatSnapshotsForSearchSpace({
-				workspace_id: Number(searchSpaceId),
+			return chatThreadsApiService.listPublicChatSnapshotsForWorkspace({
+				workspace_id: Number(workspaceId),
 			});
 		},
 	};

surfsense_web/atoms/tabs/migrate-tabs.test.ts

@@ -0,0 +1,21 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { migrateLegacyTabs } from "./migrate-tabs";
+
+// Run with: pnpm exec tsx --test atoms/tabs/migrate-tabs.test.ts
+test("maps legacy searchSpaceId to workspaceId on read", () => {
+	const migrated = migrateLegacyTabs({
+		tabs: [{ id: "chat-new", type: "chat", searchSpaceId: 7 } as never],
+		activeTabId: "chat-new",
+	});
+	const tab = migrated.tabs[0] as { workspaceId?: number };
+	assert.equal(tab.workspaceId, 7);
+});
+
+test("leaves an already-migrated workspaceId untouched", () => {
+	const migrated = migrateLegacyTabs({
+		tabs: [{ id: "d1", type: "document", workspaceId: 3, searchSpaceId: 9 } as never],
+	});
+	const tab = migrated.tabs[0] as { workspaceId?: number };
+	assert.equal(tab.workspaceId, 3);
+});

surfsense_web/atoms/tabs/migrate-tabs.ts

@@ -0,0 +1,19 @@
+/**
+ * One-time read-migration for persisted tabs: legacy state stored the workspace
+ * as `searchSpaceId`. Map it to `workspaceId` on read so already-open tabs keep
+ * their workspace association after the rename. Pure + dependency-free so it can
+ * be unit-checked without loading the atom module.
+ */
+export function migrateLegacyTabs<T extends { tabs: Array<{ workspaceId?: number }> }>(
+	state: T
+): T {
+	return {
+		...state,
+		tabs: state.tabs.map((t) => {
+			const legacy = t as { workspaceId?: number; searchSpaceId?: number };
+			return legacy.workspaceId === undefined && legacy.searchSpaceId !== undefined
+				? { ...t, workspaceId: legacy.searchSpaceId }
+				: t;
+		}),
+	};
+}

surfsense_web/atoms/tabs/tabs.atom.ts

@@ -1,6 +1,7 @@
 import { atom } from "jotai";
 import { atomWithStorage, createJSONStorage } from "jotai/utils";
 import type { ChatVisibility } from "@/lib/chat/thread-persistence";
+import { migrateLegacyTabs } from "./migrate-tabs";
 
 export type TabType = "chat" | "document";
 
@@ -15,7 +16,7 @@ export interface Tab {
 	hasComments?: boolean;
 	/** For document tabs */
 	documentId?: number;
-	searchSpaceId?: number;
+	workspaceId?: number;
 }
 
 interface TabsState {
@@ -40,11 +41,17 @@ const initialState: TabsState = {
 const deletedChatIdsAtom = atom<Set<number>>(new Set<number>());
 
 // Persist tabs in localStorage so they survive a hard refresh and let the user
-// keep tabs open across multiple search spaces (browser-like behavior).
+// keep tabs open across multiple workspaces (browser-like behavior).
 const localStorageAdapter = createJSONStorage<TabsState>(
 	() => (typeof window !== "undefined" ? localStorage : undefined) as Storage
 );
 
+// Wrap getItem in place so the adapter keeps its original (sync) type while
+// migrating legacy persisted state on read.
+const baseGetItem = localStorageAdapter.getItem.bind(localStorageAdapter);
+localStorageAdapter.getItem = (key, initialValue) =>
+	migrateLegacyTabs(baseGetItem(key, initialValue));
+
 export const tabsStateAtom = atomWithStorage<TabsState>(
 	"surfsense:tabs",
 	initialState,
@@ -81,14 +88,14 @@ export const syncChatTabAtom = atom(
 			chatId,
 			title,
 			chatUrl,
-			searchSpaceId,
+			workspaceId,
 			visibility,
 			hasComments,
 		}: {
 			chatId: number | null;
 			title?: string;
 			chatUrl?: string;
-			searchSpaceId: number;
+			workspaceId: number;
 			visibility?: ChatVisibility;
 			hasComments?: boolean;
 		}
@@ -111,7 +118,7 @@ export const syncChatTabAtom = atom(
 								...t,
 								title: title || t.title,
 								chatUrl: chatUrl || t.chatUrl,
-								searchSpaceId: searchSpaceId ?? t.searchSpaceId,
+								workspaceId: workspaceId ?? t.workspaceId,
 								...(visibility !== undefined ? { visibility } : {}),
 								...(hasComments !== undefined ? { hasComments } : {}),
 							}
@@ -122,18 +129,18 @@ export const syncChatTabAtom = atom(
 		}
 
 		// If navigating to a new chat (no chatId), ensure there's a "new chat" tab
-		// scoped to the current search space.
+		// scoped to the current workspace.
 		if (!chatId) {
 			const hasNewChatTab = state.tabs.some((t) => t.id === "chat-new");
 			if (hasNewChatTab) {
 				set(tabsStateAtom, {
 					...state,
 					activeTabId: "chat-new",
-					tabs: state.tabs.map((t) => (t.id === "chat-new" ? { ...t, searchSpaceId, chatUrl } : t)),
+					tabs: state.tabs.map((t) => (t.id === "chat-new" ? { ...t, workspaceId, chatUrl } : t)),
 				});
 			} else {
 				set(tabsStateAtom, {
-					tabs: [...state.tabs, { ...INITIAL_CHAT_TAB, searchSpaceId, chatUrl }],
+					tabs: [...state.tabs, { ...INITIAL_CHAT_TAB, workspaceId, chatUrl }],
 					activeTabId: "chat-new",
 				});
 			}
@@ -148,7 +155,7 @@ export const syncChatTabAtom = atom(
 			title: title || "New Chat",
 			chatId,
 			chatUrl,
-			searchSpaceId,
+			workspaceId,
 			...(visibility !== undefined ? { visibility } : {}),
 			...(hasComments !== undefined ? { hasComments } : {}),
 		};
@@ -197,11 +204,7 @@ export const openDocumentTabAtom = atom(
 	(
 		get,
 		set,
-		{
-			documentId,
-			searchSpaceId,
-			title,
-		}: { documentId: number; searchSpaceId: number; title?: string }
+		{ documentId, workspaceId, title }: { documentId: number; workspaceId: number; title?: string }
 	) => {
 		const state = get(tabsStateAtom);
 		const tabId = makeDocumentTabId(documentId);
@@ -221,7 +224,7 @@ export const openDocumentTabAtom = atom(
 			type: "document",
 			title: title || `Document ${documentId}`,
 			documentId,
-			searchSpaceId,
+			workspaceId,
 		};
 
 		set(tabsStateAtom, {
@@ -300,7 +303,7 @@ export const removeChatTabAtom = atom(null, (get, set, chatId: number) => {
 	return remaining.find((t) => t.id === newActiveId) ?? null;
 });
 
-/** Reset tabs when switching search spaces. */
+/** Reset tabs when switching workspaces. */
 export const resetTabsAtom = atom(null, (_get, set) => {
 	set(tabsStateAtom, { ...initialState });
 	set(deletedChatIdsAtom, new Set<number>());

surfsense_web/atoms/workspaces/workspace-mutation.atoms.ts

@@ -1,96 +1,96 @@
 import { atomWithMutation } from "jotai-tanstack-query";
 import { toast } from "sonner";
 import type {
-	CreateSearchSpaceRequest,
-	DeleteSearchSpaceRequest,
-	UpdateSearchSpaceApiAccessRequest,
-	UpdateSearchSpaceRequest,
+	CreateWorkspaceRequest,
+	DeleteWorkspaceRequest,
+	UpdateWorkspaceApiAccessRequest,
+	UpdateWorkspaceRequest,
 } from "@/contracts/types/workspace.types";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 import { queryClient } from "@/lib/query-client/client";
 import { activeWorkspaceIdAtom } from "./workspace-query.atoms";
 
-export const createSearchSpaceMutationAtom = atomWithMutation(() => {
+export const createWorkspaceMutationAtom = atomWithMutation(() => {
 	return {
-		mutationKey: ["create-search-space"],
-		mutationFn: async (request: CreateSearchSpaceRequest) => {
-			return searchSpacesApiService.createSearchSpace(request);
+		mutationKey: ["create-workspace"],
+		mutationFn: async (request: CreateWorkspaceRequest) => {
+			return workspacesApiService.createWorkspace(request);
 		},
 
 		onSuccess: () => {
 			toast.success("Search space created successfully");
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.searchSpaces.all,
+				queryKey: cacheKeys.workspaces.all,
 			});
 		},
 	};
 });
 
-export const updateSearchSpaceMutationAtom = atomWithMutation((get) => {
-	const activeSearchSpaceId = get(activeWorkspaceIdAtom);
+export const updateWorkspaceMutationAtom = atomWithMutation((get) => {
+	const activeWorkspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: ["update-search-space", activeSearchSpaceId],
-		enabled: !!activeSearchSpaceId,
-		mutationFn: async (request: UpdateSearchSpaceRequest) => {
-			return searchSpacesApiService.updateSearchSpace(request);
+		mutationKey: ["update-workspace", activeWorkspaceId],
+		enabled: !!activeWorkspaceId,
+		mutationFn: async (request: UpdateWorkspaceRequest) => {
+			return workspacesApiService.updateWorkspace(request);
 		},
 
-		onSuccess: (_, request: UpdateSearchSpaceRequest) => {
+		onSuccess: (_, request: UpdateWorkspaceRequest) => {
 			toast.success("Search space updated successfully");
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.searchSpaces.all,
+				queryKey: cacheKeys.workspaces.all,
 			});
 			if (request.id) {
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.searchSpaces.detail(String(request.id)),
+					queryKey: cacheKeys.workspaces.detail(String(request.id)),
 				});
 			}
 		},
 	};
 });
 
-export const updateSearchSpaceApiAccessMutationAtom = atomWithMutation((get) => {
-	const activeSearchSpaceId = get(activeWorkspaceIdAtom);
+export const updateWorkspaceApiAccessMutationAtom = atomWithMutation((get) => {
+	const activeWorkspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: ["update-search-space-api-access", activeSearchSpaceId],
-		enabled: !!activeSearchSpaceId,
-		mutationFn: async (request: UpdateSearchSpaceApiAccessRequest) => {
-			return searchSpacesApiService.updateSearchSpaceApiAccess(request);
+		mutationKey: ["update-workspace-api-access", activeWorkspaceId],
+		enabled: !!activeWorkspaceId,
+		mutationFn: async (request: UpdateWorkspaceApiAccessRequest) => {
+			return workspacesApiService.updateWorkspaceApiAccess(request);
 		},
 
-		onSuccess: (_, request: UpdateSearchSpaceApiAccessRequest) => {
+		onSuccess: (_, request: UpdateWorkspaceApiAccessRequest) => {
 			toast.success("API access updated successfully");
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.searchSpaces.all,
+				queryKey: cacheKeys.workspaces.all,
 			});
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.searchSpaces.detail(String(request.id)),
+				queryKey: cacheKeys.workspaces.detail(String(request.id)),
 			});
 		},
 	};
 });
 
-export const deleteSearchSpaceMutationAtom = atomWithMutation((get) => {
-	const activeSearchSpaceId = get(activeWorkspaceIdAtom);
+export const deleteWorkspaceMutationAtom = atomWithMutation((get) => {
+	const activeWorkspaceId = get(activeWorkspaceIdAtom);
 
 	return {
-		mutationKey: ["delete-search-space", activeSearchSpaceId],
-		enabled: !!activeSearchSpaceId,
-		mutationFn: async (request: DeleteSearchSpaceRequest) => {
-			return searchSpacesApiService.deleteSearchSpace(request);
+		mutationKey: ["delete-workspace", activeWorkspaceId],
+		enabled: !!activeWorkspaceId,
+		mutationFn: async (request: DeleteWorkspaceRequest) => {
+			return workspacesApiService.deleteWorkspace(request);
 		},
 
-		onSuccess: (_, request: DeleteSearchSpaceRequest) => {
+		onSuccess: (_, request: DeleteWorkspaceRequest) => {
 			toast.success("Search space deleted successfully");
 			queryClient.invalidateQueries({
-				queryKey: cacheKeys.searchSpaces.all,
+				queryKey: cacheKeys.workspaces.all,
 			});
 			if (request.id) {
 				queryClient.removeQueries({
-					queryKey: cacheKeys.searchSpaces.detail(String(request.id)),
+					queryKey: cacheKeys.workspaces.detail(String(request.id)),
 				});
 			}
 		},

surfsense_web/atoms/workspaces/workspace-query.atoms.ts

@@ -1,25 +1,25 @@
 import { atom } from "jotai";
 import { atomWithQuery } from "jotai-tanstack-query";
-import type { GetSearchSpacesRequest } from "@/contracts/types/workspace.types";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import type { GetWorkspacesRequest } from "@/contracts/types/workspace.types";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
 export const activeWorkspaceIdAtom = atom<string | null>(null);
 
-export const searchSpacesQueryParamsAtom = atom<GetSearchSpacesRequest["queryParams"]>({
+export const workspacesQueryParamsAtom = atom<GetWorkspacesRequest["queryParams"]>({
 	skip: 0,
 	limit: 10,
 	owned_only: false,
 });
 
-export const searchSpacesAtom = atomWithQuery((get) => {
-	const queryParams = get(searchSpacesQueryParamsAtom);
+export const workspacesAtom = atomWithQuery((get) => {
+	const queryParams = get(workspacesQueryParamsAtom);
 
 	return {
-		queryKey: cacheKeys.searchSpaces.withQueryParams(queryParams),
+		queryKey: cacheKeys.workspaces.withQueryParams(queryParams),
 		staleTime: 5 * 60 * 1000,
 		queryFn: async () => {
-			return searchSpacesApiService.getSearchSpaces({
+			return workspacesApiService.getWorkspaces({
 				queryParams,
 			});
 		},

surfsense_web/changelog/content/2026-01-26.mdx

@@ -14,7 +14,7 @@ This release brings major improvements to **collaboration and user experience**.
 #### New Chat-First Interface
 
 - **Dashboard Removed**: Users now land directly in a chat for faster access
-- **Redesigned Search Spaces**: Moved to a left column with color-coded icons and hover tooltips
+- **Redesigned Workspaces**: Moved to a left column with color-coded icons and hover tooltips
 - **Collapsible Sidebar**: New sidebar design with collapsible sections for private and group chats
 - **Streamlined Settings**: Accessible through intuitive dropdown menus
 - **Mobile-Responsive Design**: Better experience on all devices

surfsense_web/changelog/content/2026-02-09.mdx

@@ -16,8 +16,8 @@ This update brings **public sharing, image generation**, a redesigned Documents
 #### Public Sharing
 
 - **Public Chats**: Share snapshots of chats via public links.
-- **Sharing Permissions**: Search Space owners control who can create and manage public links.
-- **Link Management Page**: View and revoke all public chats from Search Space Settings.
+- **Sharing Permissions**: Workspace owners control who can create and manage public links.
+- **Link Management Page**: View and revoke all public chats from Workspace Settings.
 
 #### Auto (Load Balanced) Mode
 

surfsense_web/changelog/content/2026-03-31.mdx

@@ -80,7 +80,7 @@ SurfSense now treats every sensitive AI action as an explicit, reviewable step.
 
 - **Mobile-First Polish**: Mobile citation drawer, long-press actions in chats and documents, a responsive documents sidebar, and a mobile-friendly onboarding tour.
 - **Reworked Composer**: Tool actions are grouped into a cleaner menu with better icons, plus a helpful "connect tools" banner.
-- **Settings & Team**: New tabbed user settings page (profile + API keys), team roles management with pagination, and a search space settings dialog.
+- **Settings & Team**: New tabbed user settings page (profile + API keys), team roles management with pagination, and a workspace settings dialog.
 - **Right Panel & Docked Sidebar**: A tabbed Sources/Report panel with smooth transitions, plus an optional docked documents sidebar.
 - **Community Prompts**: Public prompt library with copy support, inline share toggles, and a see-more/less toggle for long prompts.
 - **New Homepage**: Smooth scrolling, a use-cases grid, an updated walkthrough hero, a GitHub stars badge, and a new carousel for AI-generated video.

surfsense_web/changelog/content/2026-04-08.mdx

@@ -44,7 +44,7 @@ The SurfSense desktop app becomes a serious always-on **AI like ChatGPT** that a
 - **Multi-Suggestion UI**: The suggestion popup now offers up to **3 options** to pick from, with clean cards and quick-assist detection.
 - **Knowledge Base Grounding**: Suggestions are grounded in your connected knowledge base, not just generic model output.
 - **macOS Permission Onboarding**: A clearer onboarding page walks macOS users through the permissions the app needs, only when they're actually needed.
-- **Switch Search Spaces from the Overlay**: Change the active search space without opening the main app.
+- **Switch Workspaces from the Overlay**: Change the active workspace without opening the main app.
 - **General Assist**: A new general-purpose assist mode with cleaner shortcut icons and descriptions.
 - **Stay Signed In Everywhere**: Sign-in is now synchronized between the desktop app and the web app.
 - **Vision Model Settings**: A dedicated Vision Models tab in Settings lets you pick and manage vision models, including a dynamic model list from OpenRouter.

surfsense_web/changelog/content/2026-04-21.mdx

@@ -21,7 +21,7 @@ Turn your knowledge and profile details into export-ready resume documents.
 
 - **Cross-Site Anonymous Chat Cookies**: Anonymous chat cookies now adapt their SameSite and Secure settings based on deployment context, making hosted and cross-domain setups more reliable.
 - **Better Anonymous Chat History**: Message history handling in anonymous chat is more dependable, especially when users move between public chat states.
-- **Safer Form Inputs**: Login, registration, profile, search space, and role forms now enforce sensible max-length limits directly in the UI.
+- **Safer Form Inputs**: Login, registration, profile, workspace, and role forms now enforce sensible max-length limits directly in the UI.
 - **Cleaner Page Landmarks**: Home and free-chat pages no longer nest main landmarks, improving HTML semantics and screen-reader navigation.
 - **SEO Metadata Refresh**: Titles and descriptions across key pages now better communicate SurfSense's open-source, privacy-focused positioning.
 

surfsense_web/components/assistant-ui/assistant-message.tsx

@@ -491,7 +491,7 @@ export const AssistantMessage: FC = () => {
 	const commentPanelRef = useRef<HTMLDivElement>(null);
 	const commentTriggerRef = useRef<HTMLButtonElement>(null);
 	const messageId = useAuiState(({ message }) => message?.id);
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 	const dbMessageId = parseMessageId(messageId);
 	const commentsEnabled = useAtomValue(commentsEnabledAtom);
 
@@ -520,7 +520,7 @@ export const AssistantMessage: FC = () => {
 	const commentCount = commentsData?.total_count ?? 0;
 	const hasComments = commentCount > 0;
 
-	const showCommentTrigger = searchSpaceId && commentsEnabled && !isMessageStreaming && dbMessageId;
+	const showCommentTrigger = workspaceId && commentsEnabled && !isMessageStreaming && dbMessageId;
 
 	// Close floating panel when clicking outside (but not on portaled popover/dropdown content)
 	useEffect(() => {

surfsense_web/components/assistant-ui/connector-popup.tsx

@@ -36,10 +36,10 @@ interface ConnectorIndicatorProps {
 
 export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, ConnectorIndicatorProps>(
 	(_props, ref) => {
-		const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+		const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 
 		// Real-time document type counts via Zero (updates instantly as docs are indexed)
-		const documentTypeCounts = useZeroDocumentTypeCounts(searchSpaceId);
+		const documentTypeCounts = useZeroDocumentTypeCounts(workspaceId);
 		// Read status inbox items from shared atom (populated by LayoutDataProvider)
 		// instead of creating a duplicate useInbox("status") hook.
 		const statusInboxItems = useAtomValue(statusInboxItemsAtom);
@@ -124,7 +124,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			loading: connectorsLoading,
 			error: connectorsError,
 			refreshConnectors: refreshConnectorsSync,
-		} = useConnectorsSync(searchSpaceId);
+		} = useConnectorsSync(workspaceId);
 
 		const useSyncData = connectorsFromSync.length > 0 || (connectorsLoading && !connectorsError);
 		const connectors = useSyncData ? connectorsFromSync : allConnectors || [];
@@ -142,7 +142,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			inboxItems
 		);
 
-		// Get document types that have documents in the search space
+		// Get document types that have documents in the workspace
 		const activeDocumentTypes = documentTypeCounts
 			? Object.entries(documentTypeCounts).filter(([, count]) => count > 0)
 			: [];
@@ -163,7 +163,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			open: () => handleOpenChange(true),
 		}));
 
-		if (!searchSpaceId) return null;
+		if (!workspaceId) return null;
 
 		return (
 			<Dialog open={isOpen} modal={false} onOpenChange={handleOpenChange}>
@@ -191,8 +191,8 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 				>
 					<DialogTitle className="sr-only">Manage Connectors</DialogTitle>
 					{/* YouTube Crawler View - shown when adding YouTube videos */}
-					{isYouTubeView && searchSpaceId ? (
-						<YouTubeCrawlerView searchSpaceId={searchSpaceId} onBack={handleBackFromYouTube} />
+					{isYouTubeView && workspaceId ? (
+						<YouTubeCrawlerView workspaceId={workspaceId} onBack={handleBackFromYouTube} />
 					) : viewingMCPList ? (
 						<ConnectorAccountsListView
 							connectorType="MCP_CONNECTOR"
@@ -253,7 +253,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 							isSaving={isSaving}
 							isDisconnecting={isDisconnecting}
 							isIndexing={indexingConnectorIds.has(editingConnector.id)}
-							searchSpaceId={searchSpaceId?.toString()}
+							workspaceId={workspaceId?.toString()}
 							onStartDateChange={setStartDate}
 							onEndDateChange={setEndDate}
 							onPeriodicEnabledChange={setPeriodicEnabled}
@@ -346,7 +346,7 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 										<TabsContent value="all" className="m-0">
 											<AllConnectorsTab
 												searchQuery={searchQuery}
-												searchSpaceId={searchSpaceId}
+												workspaceId={workspaceId}
 												connectedTypes={connectedTypes}
 												connectingId={connectingId}
 												allConnectors={connectors}

surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/obsidian-connect-form.tsx

@@ -159,17 +159,17 @@ export const ObsidianConnectForm: FC<ConnectFormProps> = ({ onBack }) => {
 
 					<div className="h-px bg-border/60" />
 
-					{/* Step 4 — Pick search space */}
+					{/* Step 4 — Pick workspace */}
 					<article>
 						<header className="mb-3 flex items-center gap-2">
 							<div className="flex size-7 items-center justify-center rounded-md border border-slate-400/30 text-xs font-medium">
 								4
 							</div>
-							<h3 className="text-sm font-medium sm:text-base">Pick this search space</h3>
+							<h3 className="text-sm font-medium sm:text-base">Pick this workspace</h3>
 						</header>
 						<p className="text-[11px] text-muted-foreground sm:text-xs">
 							In the plugin's <span className="font-medium">Search space</span> setting, choose the
-							search space you want this vault to sync into. The connector will appear here
+							workspace you want this vault to sync into. The connector will appear here
 							automatically once the plugin makes its first sync.
 						</p>
 					</article>

surfsense_web/components/assistant-ui/connector-popup/connect-forms/connector-benefits.ts

@@ -7,7 +7,7 @@ export function getConnectorBenefits(connectorType: string): string[] | null {
 		LINEAR_CONNECTOR: [
 			"Search through all your Linear issues and comments",
 			"Access issue titles, descriptions, and full discussion threads",
-			"Connect your team's project management directly to your search space",
+			"Connect your team's project management directly to your workspace",
 			"Keep your search results up-to-date with latest Linear content",
 			"Index your Linear issues for enhanced search capabilities",
 		],
@@ -36,63 +36,63 @@ export function getConnectorBenefits(connectorType: string): string[] | null {
 		SLACK_CONNECTOR: [
 			"Search through all your Slack messages and conversations",
 			"Access messages from public and private channels",
-			"Connect your team's communications directly to your search space",
+			"Connect your team's communications directly to your workspace",
 			"Keep your search results up-to-date with latest Slack content",
 			"Index your Slack conversations for enhanced search capabilities",
 		],
 		DISCORD_CONNECTOR: [
 			"Search through all your Discord messages and conversations",
 			"Access messages from all accessible channels",
-			"Connect your community's communications directly to your search space",
+			"Connect your community's communications directly to your workspace",
 			"Keep your search results up-to-date with latest Discord content",
 			"Index your Discord conversations for enhanced search capabilities",
 		],
 		NOTION_CONNECTOR: [
 			"Search through all your Notion pages and databases",
 			"Access page content, properties, and metadata",
-			"Connect your knowledge base directly to your search space",
+			"Connect your knowledge base directly to your workspace",
 			"Keep your search results up-to-date with latest Notion content",
 			"Index your Notion workspace for enhanced search capabilities",
 		],
 		CONFLUENCE_CONNECTOR: [
 			"Search through all your Confluence pages and spaces",
 			"Access page content, comments, and attachments",
-			"Connect your team's documentation directly to your search space",
+			"Connect your team's documentation directly to your workspace",
 			"Keep your search results up-to-date with latest Confluence content",
 			"Index your Confluence workspace for enhanced search capabilities",
 		],
 		BOOKSTACK_CONNECTOR: [
 			"Search through all your BookStack pages and books",
 			"Access page content, chapters, and documentation",
-			"Connect your documentation directly to your search space",
+			"Connect your documentation directly to your workspace",
 			"Keep your search results up-to-date with latest BookStack content",
 			"Index your BookStack instance for enhanced search capabilities",
 		],
 		GITHUB_CONNECTOR: [
 			"Search through code, issues, and documentation from GitHub repositories",
 			"Access repository content, pull requests, and discussions",
-			"Connect your codebase directly to your search space",
+			"Connect your codebase directly to your workspace",
 			"Keep your search results up-to-date with latest GitHub content",
 			"Index your GitHub repositories for enhanced search capabilities",
 		],
 		JIRA_CONNECTOR: [
 			"Search through all your Jira issues and tickets",
 			"Access issue descriptions, comments, and project data",
-			"Connect your project management directly to your search space",
+			"Connect your project management directly to your workspace",
 			"Keep your search results up-to-date with latest Jira content",
 			"Index your Jira projects for enhanced search capabilities",
 		],
 		CLICKUP_CONNECTOR: [
 			"Search through all your ClickUp tasks and projects",
 			"Access task descriptions, comments, and project data",
-			"Connect your task management directly to your search space",
+			"Connect your task management directly to your workspace",
 			"Keep your search results up-to-date with latest ClickUp content",
 			"Index your ClickUp workspace for enhanced search capabilities",
 		],
 		LUMA_CONNECTOR: [
 			"Search through all your Luma events",
 			"Access event details, descriptions, and attendee information",
-			"Connect your events directly to your search space",
+			"Connect your events directly to your workspace",
 			"Keep your search results up-to-date with latest Luma content",
 			"Index your Luma events for enhanced search capabilities",
 		],

surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/circleback-config.tsx

@@ -165,7 +165,7 @@ export const CirclebackConfig: FC<CirclebackConfigProps> = ({ connector, onNameC
 						<AlertDescription>
 							Configure this URL in Circleback Settings → Automations → Create automation → Send
 							webhook request. The webhook will automatically send meeting notes, transcripts, and
-							action items to this search space.
+							action items to this workspace.
 						</AlertDescription>
 					</Alert>
 				)}

surfsense_web/components/assistant-ui/connector-popup/connector-configs/index.tsx

@@ -8,7 +8,7 @@ export interface ConnectorConfigProps {
 	connector: SearchSourceConnector;
 	onConfigChange?: (config: Record<string, unknown>) => void;
 	onNameChange?: (name: string) => void;
-	searchSpaceId?: string;
+	workspaceId?: string;
 }
 
 export type ConnectorConfigComponent = FC<ConnectorConfigProps>;

surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx

@@ -41,7 +41,7 @@ interface ConnectorEditViewProps {
 	isSaving: boolean;
 	isDisconnecting: boolean;
 	isIndexing?: boolean;
-	searchSpaceId?: string;
+	workspaceId?: string;
 	onStartDateChange: (date: Date | undefined) => void;
 	onEndDateChange: (date: Date | undefined) => void;
 	onPeriodicEnabledChange: (enabled: boolean) => void;
@@ -65,7 +65,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 	isSaving,
 	isDisconnecting,
 	isIndexing = false,
-	searchSpaceId,
+	workspaceId,
 	onStartDateChange,
 	onEndDateChange,
 	onPeriodicEnabledChange,
@@ -78,7 +78,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 	onConfigChange,
 	onNameChange,
 }) => {
-	const searchSpaceIdAtom = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceIdAtom = useAtomValue(activeWorkspaceIdAtom);
 	const isAuthExpired = connector.config?.auth_expired === true;
 	const reauthEndpoint = getReauthEndpoint(connector);
 	const [reauthing, setReauthing] = useState(false);
@@ -91,7 +91,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 		(connector.is_indexable || connector.connector_type === EnumConnectorName.OBSIDIAN_CONNECTOR);
 
 	const handleReauth = useCallback(async () => {
-		const spaceId = searchSpaceId ?? searchSpaceIdAtom;
+		const spaceId = workspaceId ?? workspaceIdAtom;
 		if (!spaceId || !reauthEndpoint) return;
 		setReauthing(true);
 		try {
@@ -119,7 +119,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 		} finally {
 			setReauthing(false);
 		}
-	}, [searchSpaceId, searchSpaceIdAtom, reauthEndpoint, connector.id]);
+	}, [workspaceId, workspaceIdAtom, reauthEndpoint, connector.id]);
 
 	// Get connector-specific config component (MCP-backed connectors use a generic view)
 	const ConnectorConfigComponent = useMemo(() => {
@@ -273,7 +273,7 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 								connector={connector}
 								onConfigChange={onConfigChange}
 								onNameChange={onNameChange}
-								searchSpaceId={searchSpaceId}
+								workspaceId={workspaceId}
 							/>
 						)}
 

surfsense_web/components/assistant-ui/connector-popup/hooks/use-connector-dialog.ts

@@ -58,7 +58,7 @@ function clearOAuthResultCookie(): void {
 }
 
 export const useConnectorDialog = () => {
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 	const { data: allConnectors, refetch: refetchAllConnectors } = useAtomValue(connectorsAtom);
 	const { mutateAsync: indexConnector } = useAtomValue(indexConnectorMutationAtom);
 	const { mutateAsync: updateConnector } = useAtomValue(updateConnectorMutationAtom);
@@ -140,7 +140,7 @@ export const useConnectorDialog = () => {
 
 	const handleAutoIndex = useCallback(
 		async (connector: SearchSourceConnector, connectorTitle: string, connectorType: string) => {
-			if (!searchSpaceId || isAutoIndexingRef.current) return;
+			if (!workspaceId || isAutoIndexingRef.current) return;
 			isAutoIndexingRef.current = true;
 
 			const defaults = AUTO_INDEX_DEFAULTS[connectorType];
@@ -165,13 +165,13 @@ export const useConnectorDialog = () => {
 				await indexConnector({
 					connector_id: connector.id,
 					queryParams: {
-						workspace_id: searchSpaceId,
+						workspace_id: workspaceId,
 						start_date: format(startDate, "yyyy-MM-dd"),
 						end_date: format(endDate, "yyyy-MM-dd"),
 					},
 				});
 
-				trackIndexWithDateRangeStarted(Number(searchSpaceId), connectorType, connector.id, {
+				trackIndexWithDateRangeStarted(Number(workspaceId), connectorType, connector.id, {
 					hasStartDate: true,
 					hasEndDate: true,
 				});
@@ -188,13 +188,13 @@ export const useConnectorDialog = () => {
 				});
 			} finally {
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+					queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 				});
 				await refetchAllConnectors();
 				isAutoIndexingRef.current = false;
 			}
 		},
-		[searchSpaceId, indexConnector, updateConnector, refetchAllConnectors]
+		[workspaceId, indexConnector, updateConnector, refetchAllConnectors]
 	);
 
 	// YouTube view state
@@ -206,7 +206,7 @@ export const useConnectorDialog = () => {
 	// Consume OAuth result from cookie (set by /connectors/callback route handler)
 	useEffect(() => {
 		const raw = readOAuthResultCookie();
-		if (!raw || !searchSpaceId) return;
+		if (!raw || !workspaceId) return;
 		clearOAuthResultCookie();
 
 		const result = parseOAuthCallbackResult(raw);
@@ -221,7 +221,7 @@ export const useConnectorDialog = () => {
 
 			if (oauthConnector) {
 				trackConnectorSetupFailure(
-					Number(searchSpaceId),
+					Number(workspaceId),
 					oauthConnector.connectorType,
 					result.error,
 					"oauth_callback"
@@ -292,7 +292,7 @@ export const useConnectorDialog = () => {
 					const connectorValidation = searchSourceConnector.safeParse(newConnector);
 					if (connectorValidation.success) {
 						trackConnectorConnected(
-							Number(searchSpaceId),
+							Number(workspaceId),
 							oauthConnector.connectorType,
 							newConnector.id
 						);
@@ -338,20 +338,20 @@ export const useConnectorDialog = () => {
 			});
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [searchSpaceId, handleAutoIndex, refetchAllConnectors, setIsOpen]);
+	}, [workspaceId, handleAutoIndex, refetchAllConnectors, setIsOpen]);
 
 	// Handle OAuth connection
 	const handleConnectOAuth = useCallback(
 		async (connector: (typeof OAUTH_CONNECTORS)[number] | (typeof COMPOSIO_CONNECTORS)[number]) => {
-			if (!searchSpaceId || !connector.authEndpoint) return;
+			if (!workspaceId || !connector.authEndpoint) return;
 
 			// Set connecting state immediately to disable button and show spinner
 			setConnectingId(connector.id);
 
-			trackConnectorSetupStarted(Number(searchSpaceId), connector.connectorType, "oauth_click");
+			trackConnectorSetupStarted(Number(workspaceId), connector.connectorType, "oauth_click");
 
 			try {
-				const url = buildBackendUrl(connector.authEndpoint, { space_id: searchSpaceId });
+				const url = buildBackendUrl(connector.authEndpoint, { space_id: workspaceId });
 
 				const response = await authenticatedFetch(url, { method: "GET" });
 
@@ -370,7 +370,7 @@ export const useConnectorDialog = () => {
 			} catch (error) {
 				console.error(`Error connecting to ${connector.title}:`, error);
 				trackConnectorSetupFailure(
-					Number(searchSpaceId),
+					Number(workspaceId),
 					connector.connectorType,
 					error instanceof Error ? error.message : "oauth_initiation_failed",
 					"oauth_init"
@@ -384,22 +384,22 @@ export const useConnectorDialog = () => {
 				setConnectingId(null);
 			}
 		},
-		[searchSpaceId]
+		[workspaceId]
 	);
 
 	// Handle creating YouTube crawler (not a connector, shows view in popup)
 	const handleCreateYouTubeCrawler = useCallback(() => {
-		if (!searchSpaceId) return;
+		if (!workspaceId) return;
 		setIsYouTubeView(true);
-	}, [searchSpaceId]);
+	}, [workspaceId]);
 
 	// Handle creating webcrawler connector
 	const handleCreateWebcrawler = useCallback(async () => {
-		if (!searchSpaceId) return;
+		if (!workspaceId) return;
 
 		setConnectingId("webcrawler-connector");
 		trackConnectorSetupStarted(
-			Number(searchSpaceId),
+			Number(workspaceId),
 			EnumConnectorName.WEBCRAWLER_CONNECTOR,
 			"webcrawler_quick_add"
 		);
@@ -418,7 +418,7 @@ export const useConnectorDialog = () => {
 					enable_vision_llm: false,
 				},
 				queryParams: {
-					workspace_id: searchSpaceId,
+					workspace_id: workspaceId,
 				},
 			});
 
@@ -433,7 +433,7 @@ export const useConnectorDialog = () => {
 					if (connectorValidation.success) {
 						// Track webcrawler connector connected
 						trackConnectorConnected(
-							Number(searchSpaceId),
+							Number(workspaceId),
 							EnumConnectorName.WEBCRAWLER_CONNECTOR,
 							connector.id
 						);
@@ -453,7 +453,7 @@ export const useConnectorDialog = () => {
 		} catch (error) {
 			console.error("Error creating webcrawler connector:", error);
 			trackConnectorSetupFailure(
-				Number(searchSpaceId),
+				Number(workspaceId),
 				EnumConnectorName.WEBCRAWLER_CONNECTOR,
 				error instanceof Error ? error.message : "webcrawler_create_failed",
 				"webcrawler_quick_add"
@@ -462,18 +462,18 @@ export const useConnectorDialog = () => {
 		} finally {
 			setConnectingId(null);
 		}
-	}, [searchSpaceId, createConnector, refetchAllConnectors, setIsOpen]);
+	}, [workspaceId, createConnector, refetchAllConnectors, setIsOpen]);
 
 	// Handle connecting non-OAuth connectors (like Tavily API, Obsidian plugin, etc.)
 	const handleConnectNonOAuth = useCallback(
 		(connectorType: string) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 
-			trackConnectorSetupStarted(Number(searchSpaceId), connectorType, "non_oauth_click");
+			trackConnectorSetupStarted(Number(workspaceId), connectorType, "non_oauth_click");
 
 			setConnectingConnectorType(connectorType);
 		},
-		[searchSpaceId]
+		[workspaceId]
 	);
 
 	// Handle submitting connect form
@@ -495,7 +495,7 @@ export const useConnectorDialog = () => {
 			},
 			onIndexingStart?: (connectorId: number) => void
 		) => {
-			if (!searchSpaceId || !connectingConnectorType) {
+			if (!workspaceId || !connectingConnectorType) {
 				return;
 			}
 
@@ -519,7 +519,7 @@ export const useConnectorDialog = () => {
 						enable_vision_llm: false,
 					},
 					queryParams: {
-						workspace_id: searchSpaceId,
+						workspace_id: workspaceId,
 					},
 				});
 				// Refetch connectors to get the new one
@@ -536,7 +536,7 @@ export const useConnectorDialog = () => {
 							const currentConnectorType = connectingConnectorType;
 
 							// Track connector connected event for non-OAuth connectors
-							trackConnectorConnected(Number(searchSpaceId), currentConnectorType, connector.id);
+							trackConnectorConnected(Number(workspaceId), currentConnectorType, connector.id);
 
 							// Find connector title from constants
 							const connectorInfo = OTHER_CONNECTORS.find(
@@ -612,7 +612,7 @@ export const useConnectorDialog = () => {
 								await indexConnector({
 									connector_id: connector.id,
 									queryParams: {
-										workspace_id: searchSpaceId,
+										workspace_id: workspaceId,
 										start_date: startDateStr,
 										end_date: endDateStr,
 									},
@@ -631,7 +631,7 @@ export const useConnectorDialog = () => {
 								setIndexingConnectorConfig(null);
 
 								queryClient.invalidateQueries({
-									queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+									queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 								});
 
 								await refetchAllConnectors();
@@ -684,7 +684,7 @@ export const useConnectorDialog = () => {
 			} catch (error) {
 				console.error("Error creating connector:", error);
 				trackConnectorSetupFailure(
-					Number(searchSpaceId),
+					Number(workspaceId),
 					connectingConnectorType ?? formData.connector_type,
 					error instanceof Error ? error.message : "connector_create_failed",
 					"non_oauth_form"
@@ -698,7 +698,7 @@ export const useConnectorDialog = () => {
 		},
 		[
 			connectingConnectorType,
-			searchSpaceId,
+			workspaceId,
 			createConnector,
 			refetchAllConnectors,
 			updateConnector,
@@ -724,7 +724,7 @@ export const useConnectorDialog = () => {
 	// Handle viewing accounts list for OAuth connector type
 	const handleViewAccountsList = useCallback(
 		(connectorType: string, _connectorTitle?: string) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 
 			const oauthConnector =
 				OAUTH_CONNECTORS.find((c) => c.connectorType === connectorType) ||
@@ -736,7 +736,7 @@ export const useConnectorDialog = () => {
 				});
 			}
 		},
-		[searchSpaceId]
+		[workspaceId]
 	);
 
 	// Handle going back from accounts list view
@@ -746,9 +746,9 @@ export const useConnectorDialog = () => {
 
 	// Handle viewing MCP list
 	const handleViewMCPList = useCallback(() => {
-		if (!searchSpaceId) return;
+		if (!workspaceId) return;
 		setViewingMCPList(true);
-	}, [searchSpaceId]);
+	}, [workspaceId]);
 
 	// Handle going back from MCP list view
 	const handleBackFromMCPList = useCallback(() => {
@@ -765,7 +765,7 @@ export const useConnectorDialog = () => {
 	// Handle starting indexing
 	const handleStartIndexing = useCallback(
 		async (refreshConnectors: () => void) => {
-			if (!indexingConfig || !searchSpaceId) return;
+			if (!indexingConfig || !workspaceId) return;
 
 			// Validate date range (skip for Google Drive, Composio Drive, OneDrive, Dropbox, and Webcrawler)
 			if (
@@ -847,7 +847,7 @@ export const useConnectorDialog = () => {
 						await indexConnector({
 							connector_id: indexingConfig.connectorId,
 							queryParams: {
-								workspace_id: searchSpaceId,
+								workspace_id: workspaceId,
 							},
 							body: {
 								folders: selectedFolders || [],
@@ -870,14 +870,14 @@ export const useConnectorDialog = () => {
 					await indexConnector({
 						connector_id: indexingConfig.connectorId,
 						queryParams: {
-							workspace_id: searchSpaceId,
+							workspace_id: workspaceId,
 						},
 					});
 				} else {
 					await indexConnector({
 						connector_id: indexingConfig.connectorId,
 						queryParams: {
-							workspace_id: searchSpaceId,
+							workspace_id: workspaceId,
 							start_date: startDateStr,
 							end_date: endDateStr,
 						},
@@ -886,7 +886,7 @@ export const useConnectorDialog = () => {
 
 				// Track index with date range started event
 				trackIndexWithDateRangeStarted(
-					Number(searchSpaceId),
+					Number(workspaceId),
 					indexingConfig.connectorType,
 					indexingConfig.connectorId,
 					{
@@ -898,7 +898,7 @@ export const useConnectorDialog = () => {
 				// Track periodic indexing started if enabled
 				if (periodicEnabled) {
 					trackPeriodicIndexingStarted(
-						Number(searchSpaceId),
+						Number(workspaceId),
 						indexingConfig.connectorType,
 						indexingConfig.connectorId,
 						parseInt(frequencyMinutes, 10)
@@ -915,7 +915,7 @@ export const useConnectorDialog = () => {
 
 				refreshConnectors();
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+					queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 				});
 			} catch (error) {
 				console.error("Error starting indexing:", error);
@@ -926,7 +926,7 @@ export const useConnectorDialog = () => {
 		},
 		[
 			indexingConfig,
-			searchSpaceId,
+			workspaceId,
 			startDate,
 			endDate,
 			indexConnector,
@@ -951,7 +951,7 @@ export const useConnectorDialog = () => {
 	// Handle starting edit mode
 	const handleStartEdit = useCallback(
 		(connector: SearchSourceConnector) => {
-			if (!searchSpaceId) return;
+			if (!workspaceId) return;
 
 			// For MCP connectors from "All Connectors" tab, show the list view instead of directly editing
 			// (unless we're already in the MCP list view or on the Active tab where individual MCPs are shown)
@@ -986,11 +986,7 @@ export const useConnectorDialog = () => {
 
 			// Track index with date range opened event
 			if (connector.is_indexable) {
-				trackIndexWithDateRangeOpened(
-					Number(searchSpaceId),
-					connector.connector_type,
-					connector.id
-				);
+				trackIndexWithDateRangeOpened(Number(workspaceId), connector.connector_type, connector.id);
 			}
 
 			setEditingConnector(connector);
@@ -1001,13 +997,13 @@ export const useConnectorDialog = () => {
 			setStartDate(undefined);
 			setEndDate(undefined);
 		},
-		[searchSpaceId, viewingAccountsType, viewingMCPList, handleViewMCPList, activeTab]
+		[workspaceId, viewingAccountsType, viewingMCPList, handleViewMCPList, activeTab]
 	);
 
 	// Handle saving connector changes
 	const handleSaveConnector = useCallback(
 		async (refreshConnectors: () => void) => {
-			if (!editingConnector || !searchSpaceId || isSaving) return;
+			if (!editingConnector || !workspaceId || isSaving) return;
 
 			// Validate date range (skip for Google Drive/OneDrive/Dropbox which uses folder selection, Webcrawler which uses config, and non-indexable connectors)
 			if (
@@ -1114,7 +1110,7 @@ export const useConnectorDialog = () => {
 						await indexConnector({
 							connector_id: editingConnector.id,
 							queryParams: {
-								workspace_id: searchSpaceId,
+								workspace_id: workspaceId,
 							},
 							body: {
 								folders: selectedFolders || [],
@@ -1134,7 +1130,7 @@ export const useConnectorDialog = () => {
 					await indexConnector({
 						connector_id: editingConnector.id,
 						queryParams: {
-							workspace_id: searchSpaceId,
+							workspace_id: workspaceId,
 						},
 					});
 					indexingDescription = "Re-indexing started with updated configuration.";
@@ -1143,7 +1139,7 @@ export const useConnectorDialog = () => {
 					await indexConnector({
 						connector_id: editingConnector.id,
 						queryParams: {
-							workspace_id: searchSpaceId,
+							workspace_id: workspaceId,
 							start_date: startDateStr,
 							end_date: endDateStr,
 						},
@@ -1157,7 +1153,7 @@ export const useConnectorDialog = () => {
 					(indexingDescription.includes("Re-indexing") || indexingDescription.includes("indexing"))
 				) {
 					trackIndexWithDateRangeStarted(
-						Number(searchSpaceId),
+						Number(workspaceId),
 						editingConnector.connector_type,
 						editingConnector.id,
 						{
@@ -1170,7 +1166,7 @@ export const useConnectorDialog = () => {
 				// Track periodic indexing if enabled
 				if (periodicEnabled && editingConnector.is_indexable) {
 					trackPeriodicIndexingStarted(
-						Number(searchSpaceId),
+						Number(workspaceId),
 						editingConnector.connector_type,
 						editingConnector.id,
 						frequency || parseInt(frequencyMinutes, 10)
@@ -1190,7 +1186,7 @@ export const useConnectorDialog = () => {
 
 				refreshConnectors();
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+					queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 				});
 			} catch (error) {
 				console.error("Error saving connector:", error);
@@ -1201,7 +1197,7 @@ export const useConnectorDialog = () => {
 		},
 		[
 			editingConnector,
-			searchSpaceId,
+			workspaceId,
 			isSaving,
 			startDate,
 			endDate,
@@ -1220,7 +1216,7 @@ export const useConnectorDialog = () => {
 	// Handle disconnecting connector
 	const handleDisconnectConnector = useCallback(
 		async (refreshConnectors: () => void) => {
-			if (!editingConnector || !searchSpaceId) return;
+			if (!editingConnector || !workspaceId) return;
 
 			setIsDisconnecting(true);
 			try {
@@ -1230,7 +1226,7 @@ export const useConnectorDialog = () => {
 
 				// Track connector deleted event
 				trackConnectorDeleted(
-					Number(searchSpaceId),
+					Number(workspaceId),
 					editingConnector.connector_type,
 					editingConnector.id
 				);
@@ -1255,7 +1251,7 @@ export const useConnectorDialog = () => {
 
 				refreshConnectors();
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+					queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 				});
 			} catch (error) {
 				console.error("Error disconnecting connector:", error);
@@ -1264,7 +1260,7 @@ export const useConnectorDialog = () => {
 				setIsDisconnecting(false);
 			}
 		},
-		[editingConnector, searchSpaceId, deleteConnector, cameFromMCPList, setIsOpen]
+		[editingConnector, workspaceId, deleteConnector, cameFromMCPList, setIsOpen]
 	);
 
 	// Handle quick index (index with selected date range, or backend defaults if none selected)
@@ -1276,7 +1272,7 @@ export const useConnectorDialog = () => {
 			startDate?: Date,
 			endDate?: Date
 		) => {
-			if (!searchSpaceId) {
+			if (!workspaceId) {
 				if (stopIndexing) {
 					stopIndexing(connectorId);
 				}
@@ -1285,7 +1281,7 @@ export const useConnectorDialog = () => {
 
 			// Track quick index clicked event
 			if (connectorType) {
-				trackQuickIndexClicked(Number(searchSpaceId), connectorType, connectorId);
+				trackQuickIndexClicked(Number(workspaceId), connectorType, connectorId);
 			}
 
 			try {
@@ -1296,7 +1292,7 @@ export const useConnectorDialog = () => {
 				await indexConnector({
 					connector_id: connectorId,
 					queryParams: {
-						workspace_id: searchSpaceId,
+						workspace_id: workspaceId,
 						start_date: startDateStr,
 						end_date: endDateStr,
 					},
@@ -1305,7 +1301,7 @@ export const useConnectorDialog = () => {
 
 				// Invalidate queries to refresh data
 				queryClient.invalidateQueries({
-					queryKey: cacheKeys.logs.summary(Number(searchSpaceId)),
+					queryKey: cacheKeys.logs.summary(Number(workspaceId)),
 				});
 				// Note: Don't call stopIndexing here - let useIndexingConnectors hook
 				// detect when last_indexed_at changes via real-time sync
@@ -1318,7 +1314,7 @@ export const useConnectorDialog = () => {
 				}
 			}
 		},
-		[searchSpaceId, indexConnector]
+		[workspaceId, indexConnector]
 	);
 
 	// Handle going back from edit view
@@ -1406,7 +1402,7 @@ export const useConnectorDialog = () => {
 		periodicEnabled,
 		frequencyMinutes,
 		enableVisionLlm,
-		searchSpaceId,
+		workspaceId,
 		allConnectors,
 		viewingAccountsType,
 		viewingMCPList,

surfsense_web/components/assistant-ui/connector-popup/tabs/all-connectors-tab.tsx

@@ -44,7 +44,7 @@ export function getConnectorDisplayName(fullName: string): string {
 
 interface AllConnectorsTabProps {
 	searchQuery: string;
-	searchSpaceId: string;
+	workspaceId: string;
 	connectedTypes: Set<string>;
 	connectingId: string | null;
 	allConnectors: SearchSourceConnector[] | undefined;

surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx

@@ -44,7 +44,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 	isConnecting = false,
 	addButtonText,
 }) => {
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 	const [reauthingId, setReauthingId] = useState<number | null>(null);
 	const [confirmDisconnectId, setConfirmDisconnectId] = useState<number | null>(null);
 	const [disconnectingId, setDisconnectingId] = useState<number | null>(null);
@@ -58,13 +58,13 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 	const handleReauth = useCallback(
 		async (connector: SearchSourceConnector) => {
 			const endpoint = getReauthEndpoint(connector);
-			if (!searchSpaceId || !endpoint) return;
+			if (!workspaceId || !endpoint) return;
 			setReauthingId(connector.id);
 			try {
 				const response = await authenticatedFetch(
 					buildBackendUrl(endpoint, {
 						connector_id: connector.id,
-						space_id: searchSpaceId,
+						space_id: workspaceId,
 						return_url: window.location.pathname,
 					})
 				);
@@ -86,7 +86,7 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 				setReauthingId(null);
 			}
 		},
-		[searchSpaceId]
+		[workspaceId]
 	);
 
 	// Filter connectors to only show those of this type

surfsense_web/components/assistant-ui/connector-popup/views/youtube-crawler-view.tsx

@@ -38,11 +38,11 @@ function extractYoutubeUrls(text: string): string[] {
 }
 
 interface YouTubeCrawlerViewProps {
-	searchSpaceId: string;
+	workspaceId: string;
 	onBack: () => void;
 }
 
-export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId, onBack }) => {
+export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ workspaceId, onBack }) => {
 	const t = useTranslations("add_youtube");
 	const [videoTags, setVideoTags] = useState<TagType[]>([]);
 	const [activeTagIndex, setActiveTagIndex] = useState<number | null>(null);
@@ -165,7 +165,7 @@ export const YouTubeCrawlerView: FC<YouTubeCrawlerViewProps> = ({ searchSpaceId,
 			{
 				document_type: "YOUTUBE_VIDEO",
 				content: videoUrls,
-				workspace_id: parseInt(searchSpaceId, 10),
+				workspace_id: parseInt(workspaceId, 10),
 			},
 			{
 				onSuccess: () => {

surfsense_web/components/assistant-ui/document-upload-popup.tsx

@@ -90,9 +90,9 @@ const DocumentUploadPopupContent: FC<{
 	isOpen: boolean;
 	onOpenChange: (open: boolean) => void;
 }> = ({ isOpen, onOpenChange }) => {
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 
-	if (!searchSpaceId) return null;
+	if (!workspaceId) return null;
 
 	const handleSuccess = () => {
 		onOpenChange(false);
@@ -112,12 +112,12 @@ const DocumentUploadPopupContent: FC<{
 							Upload Documents
 						</DialogTitle>
 						<DialogDescription className="text-xs sm:text-base text-muted-foreground/80 line-clamp-1">
-							Upload and sync your documents to your search space
+							Upload and sync your documents to your workspace
 						</DialogDescription>
 					</DialogHeader>
 
 					<div className="px-4 sm:px-6 pb-4 sm:pb-6">
-						<DocumentUploadTab searchSpaceId={searchSpaceId} onSuccess={handleSuccess} />
+						<DocumentUploadTab workspaceId={workspaceId} onSuccess={handleSuccess} />
 					</div>
 				</div>
 			</DialogContent>

surfsense_web/components/assistant-ui/markdown-text.tsx

@@ -189,7 +189,7 @@ function FilePathLink({ path, className }: { path: string; className?: string })
 	const openEditorPanel = useSetAtom(openEditorPanelAtom);
 	const params = useParams();
 	const electronAPI = useElectronAPI();
-	const resolvedSearchSpaceId = getWorkspaceIdNumber(params);
+	const resolvedWorkspaceId = getWorkspaceIdNumber(params);
 
 	const { displayName, isFolder } = getVirtualPathDisplay(path);
 	const icon = isFolder ? <FolderIcon className="size-3.5" /> : <FileIcon className="size-3.5" />;
@@ -204,7 +204,7 @@ function FilePathLink({ path, className }: { path: string; className?: string })
 					if (electronAPI.getAgentFilesystemMounts) {
 						try {
 							const mounts = (await electronAPI.getAgentFilesystemMounts(
-								resolvedSearchSpaceId
+								resolvedWorkspaceId
 							)) as AgentFilesystemMount[];
 							resolvedLocalPath = normalizeLocalVirtualPathForEditor(path, mounts);
 						} catch {
@@ -215,21 +215,21 @@ function FilePathLink({ path, className }: { path: string; className?: string })
 						kind: "local_file",
 						localFilePath: resolvedLocalPath,
 						title: resolvedLocalPath.split("/").pop() || resolvedLocalPath,
-						searchSpaceId: resolvedSearchSpaceId,
+						workspaceId: resolvedWorkspaceId,
 					});
 					return;
 				}
 
-				if (!resolvedSearchSpaceId || !path.startsWith("/documents/")) return;
+				if (!resolvedWorkspaceId || !path.startsWith("/documents/")) return;
 				try {
 					const doc = await documentsApiService.getDocumentByVirtualPath({
-						workspace_id: resolvedSearchSpaceId,
+						workspace_id: resolvedWorkspaceId,
 						virtual_path: path,
 					});
 					openEditorPanel({
 						kind: "document",
 						documentId: doc.id,
-						searchSpaceId: resolvedSearchSpaceId,
+						workspaceId: resolvedWorkspaceId,
 						title: doc.title,
 					});
 				} catch {
@@ -237,7 +237,7 @@ function FilePathLink({ path, className }: { path: string; className?: string })
 				}
 			})();
 		},
-		[electronAPI, openEditorPanel, path, resolvedSearchSpaceId]
+		[electronAPI, openEditorPanel, path, resolvedWorkspaceId]
 	);
 
 	// Folders cannot open in the editor panel — keep them as visual chips.

surfsense_web/components/assistant-ui/thread.tsx

@@ -895,7 +895,7 @@ const Composer: FC = () => {
 						<ComposerSuggestionPopoverContent side="top">
 							<DocumentMentionPicker
 								ref={documentPickerRef}
-								searchSpaceId={workspaceId ?? 0}
+								workspaceId={workspaceId ?? 0}
 								enableChatMentions
 								currentChatId={threadId}
 								onSelectionChange={handleDocumentsMention}
@@ -961,7 +961,7 @@ const Composer: FC = () => {
 					</div>
 					<ComposerAction
 						isBlockedByOtherUser={isBlockedByOtherUser}
-						searchSpaceId={workspaceId ?? 0}
+						workspaceId={workspaceId ?? 0}
 						onChatModelSelected={handleChatModelSelected}
 					/>
 					<ConnectorIndicator showTrigger={false} />
@@ -982,13 +982,13 @@ const Composer: FC = () => {
 
 interface ComposerActionProps {
 	isBlockedByOtherUser?: boolean;
-	searchSpaceId: number;
+	workspaceId: number;
 	onChatModelSelected?: () => void;
 }
 
 const ComposerAction: FC<ComposerActionProps> = ({
 	isBlockedByOtherUser = false,
-	searchSpaceId,
+	workspaceId,
 	onChatModelSelected,
 }) => {
 	const mentionedDocuments = useAtomValue(mentionedDocumentsAtom);
@@ -1564,7 +1564,7 @@ const ComposerAction: FC<ComposerActionProps> = ({
 			)}
 			<div className="ml-auto flex min-w-0 shrink-0 items-center gap-2">
 				<ChatHeader
-					searchSpaceId={searchSpaceId}
+					workspaceId={workspaceId}
 					className="h-9 max-w-[44vw] px-2 sm:max-w-[220px] sm:px-3"
 					onChatModelSelected={onChatModelSelected}
 				/>

surfsense_web/components/assistant-ui/user-message.tsx

@@ -76,33 +76,33 @@ const UserTextPart: FC = () => {
 	const openEditorPanel = useSetAtom(openEditorPanelAtom);
 	const router = useRouter();
 	const params = useParams();
-	const resolvedSearchSpaceId = getWorkspaceIdNumber(params);
+	const resolvedWorkspaceId = getWorkspaceIdNumber(params);
 
 	const handleOpenDoc = useCallback(
 		(docId: number, title: string) => {
-			if (!resolvedSearchSpaceId) {
-				toast.error("Cannot open document outside a search space.");
+			if (!resolvedWorkspaceId) {
+				toast.error("Cannot open document outside a workspace.");
 				return;
 			}
 			openEditorPanel({
 				kind: "document",
 				documentId: docId,
-				searchSpaceId: resolvedSearchSpaceId,
+				workspaceId: resolvedWorkspaceId,
 				title,
 			});
 		},
-		[openEditorPanel, resolvedSearchSpaceId]
+		[openEditorPanel, resolvedWorkspaceId]
 	);
 
 	const handleOpenThread = useCallback(
 		(threadId: number) => {
-			if (!resolvedSearchSpaceId) {
-				toast.error("Cannot open chat outside a search space.");
+			if (!resolvedWorkspaceId) {
+				toast.error("Cannot open chat outside a workspace.");
 				return;
 			}
-			router.push(`/dashboard/${resolvedSearchSpaceId}/new-chat/${threadId}`);
+			router.push(`/dashboard/${resolvedWorkspaceId}/new-chat/${threadId}`);
 		},
-		[resolvedSearchSpaceId, router]
+		[resolvedWorkspaceId, router]
 	);
 
 	const segments = parseMentionSegments(text, mentionedDocs);

surfsense_web/components/citation-panel/citation-panel.tsx

@@ -77,7 +77,7 @@ export const CitationPanelContent: FC<CitationPanelContentProps> = ({
 		if (!data) return;
 		openEditorPanel({
 			documentId: data.id,
-			searchSpaceId: data.workspace_id,
+			workspaceId: data.workspace_id,
 			title: data.title,
 		});
 	};

surfsense_web/components/documents/FolderNode.tsx

@@ -49,7 +49,7 @@ export interface FolderDisplay {
 	name: string;
 	position: string;
 	parentId: number | null;
-	searchSpaceId: number;
+	workspaceId: number;
 	metadata?: Record<string, unknown> | null;
 }
 

surfsense_web/components/editor-panel/editor-panel.tsx

@@ -146,7 +146,7 @@ export function EditorPanelContent({
 	documentId,
 	localFilePath,
 	memoryScope,
-	searchSpaceId,
+	workspaceId,
 	title,
 	onClose,
 }: {
@@ -154,7 +154,7 @@ export function EditorPanelContent({
 	documentId?: number;
 	localFilePath?: string;
 	memoryScope?: "user" | "team";
-	searchSpaceId?: number;
+	workspaceId?: number;
 	title: string | null;
 	onClose?: () => void;
 }) {
@@ -186,14 +186,14 @@ export function EditorPanelContent({
 			}
 			try {
 				const mounts = (await electronAPI.getAgentFilesystemMounts(
-					searchSpaceId
+					workspaceId
 				)) as AgentFilesystemMount[];
 				return normalizeLocalVirtualPathForEditor(candidatePath, mounts);
 			} catch {
 				return candidatePath;
 			}
 		},
-		[electronAPI, searchSpaceId]
+		[electronAPI, workspaceId]
 	);
 
 	const plateMaxBytes = editorDoc?.editor_plate_max_bytes ?? LARGE_DOCUMENT_THRESHOLD;
@@ -234,7 +234,7 @@ export function EditorPanelContent({
 					const resolvedLocalPath = await resolveLocalVirtualPath(localFilePath);
 					const readResult = await electronAPI.readAgentLocalFileText(
 						resolvedLocalPath,
-						searchSpaceId
+						workspaceId
 					);
 					if (!readResult.ok) {
 						throw new Error(readResult.error || "Failed to read local file");
@@ -257,7 +257,7 @@ export function EditorPanelContent({
 					if (!memoryScope) throw new Error("Missing memory context");
 					const { document, limits } = await fetchMemoryEditorDocument({
 						scope: memoryScope,
-						searchSpaceId,
+						workspaceId,
 						title,
 						signal: controller.signal,
 					});
@@ -271,12 +271,12 @@ export function EditorPanelContent({
 					return;
 				}
 
-				if (!documentId || !searchSpaceId) {
+				if (!documentId || !workspaceId) {
 					throw new Error("Missing document context");
 				}
 				const response = await authenticatedFetch(
 					buildBackendUrl(
-						`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/editor-content`
+						`/api/v1/workspaces/${workspaceId}/documents/${documentId}/editor-content`
 					),
 					{ method: "GET" }
 				);
@@ -323,7 +323,7 @@ export function EditorPanelContent({
 		localFilePath,
 		memoryScope,
 		resolveLocalVirtualPath,
-		searchSpaceId,
+		workspaceId,
 		title,
 	]);
 
@@ -382,7 +382,7 @@ export function EditorPanelContent({
 					const writeResult = await electronAPI.writeAgentLocalFileText(
 						resolvedLocalPath,
 						contentToSave,
-						searchSpaceId
+						workspaceId
 					);
 					if (!writeResult.ok) {
 						throw new Error(writeResult.error || "Failed to save local file");
@@ -395,7 +395,7 @@ export function EditorPanelContent({
 					if (!memoryScope) throw new Error("Missing memory context");
 					const { markdown: savedContent, limits } = await saveMemoryMarkdown({
 						scope: memoryScope,
-						searchSpaceId,
+						workspaceId,
 						markdown: markdownRef.current,
 					});
 					markdownRef.current = savedContent;
@@ -408,11 +408,11 @@ export function EditorPanelContent({
 					return true;
 				}
 
-				if (!searchSpaceId || !documentId) {
+				if (!workspaceId || !documentId) {
 					throw new Error("Missing document context");
 				}
 				const response = await authenticatedFetch(
-					buildBackendUrl(`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/save`),
+					buildBackendUrl(`/api/v1/workspaces/${workspaceId}/documents/${documentId}/save`),
 					{
 						method: "POST",
 						headers: { "Content-Type": "application/json" },
@@ -460,7 +460,7 @@ export function EditorPanelContent({
 			plateMaxBytes,
 			plateMaxLines,
 			resolveLocalVirtualPath,
-			searchSpaceId,
+			workspaceId,
 		]
 	);
 
@@ -515,12 +515,12 @@ export function EditorPanelContent({
 	}, [editorDoc?.source_markdown]);
 
 	const handleDownloadMarkdown = useCallback(async () => {
-		if (!searchSpaceId || !documentId) return;
+		if (!workspaceId || !documentId) return;
 		setDownloading(true);
 		try {
 			const response = await authenticatedFetch(
 				buildBackendUrl(
-					`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/download-markdown`
+					`/api/v1/workspaces/${workspaceId}/documents/${documentId}/download-markdown`
 				),
 				{ method: "GET" }
 			);
@@ -542,7 +542,7 @@ export function EditorPanelContent({
 		} finally {
 			setDownloading(false);
 		}
-	}, [documentId, editorDoc?.title, searchSpaceId]);
+	}, [documentId, editorDoc?.title, workspaceId]);
 
 	const largeDocAlert = viewerMode === "monaco" && !isLocalFileMode && editorDoc && (
 		<Alert className="m-4 shrink-0">
@@ -890,7 +890,7 @@ function DesktopEditorPanel() {
 
 	const hasTarget =
 		panelState.kind === "document"
-			? !!panelState.documentId && !!panelState.searchSpaceId
+			? !!panelState.documentId && !!panelState.workspaceId
 			: panelState.kind === "local_file"
 				? !!panelState.localFilePath
 				: !!panelState.memoryScope;
@@ -903,7 +903,7 @@ function DesktopEditorPanel() {
 				documentId={panelState.documentId ?? undefined}
 				localFilePath={panelState.localFilePath ?? undefined}
 				memoryScope={panelState.memoryScope ?? undefined}
-				searchSpaceId={panelState.searchSpaceId ?? undefined}
+				workspaceId={panelState.workspaceId ?? undefined}
 				title={panelState.title}
 				onClose={closePanel}
 			/>
@@ -919,7 +919,7 @@ function MobileEditorDrawer() {
 
 	const hasTarget =
 		panelState.kind === "document"
-			? !!panelState.documentId && !!panelState.searchSpaceId
+			? !!panelState.documentId && !!panelState.workspaceId
 			: !!panelState.memoryScope;
 	if (!hasTarget) return null;
 
@@ -943,7 +943,7 @@ function MobileEditorDrawer() {
 						documentId={panelState.documentId ?? undefined}
 						localFilePath={panelState.localFilePath ?? undefined}
 						memoryScope={panelState.memoryScope ?? undefined}
-						searchSpaceId={panelState.searchSpaceId ?? undefined}
+						workspaceId={panelState.workspaceId ?? undefined}
 						title={panelState.title}
 					/>
 				</div>
@@ -957,7 +957,7 @@ export function EditorPanel() {
 	const isDesktop = useMediaQuery("(min-width: 1024px)");
 	const hasTarget =
 		panelState.kind === "document"
-			? !!panelState.documentId && !!panelState.searchSpaceId
+			? !!panelState.documentId && !!panelState.workspaceId
 			: panelState.kind === "local_file"
 				? !!panelState.localFilePath
 				: !!panelState.memoryScope;
@@ -977,7 +977,7 @@ export function MobileEditorPanel() {
 	const isDesktop = useMediaQuery("(min-width: 1024px)");
 	const hasTarget =
 		panelState.kind === "document"
-			? !!panelState.documentId && !!panelState.searchSpaceId
+			? !!panelState.documentId && !!panelState.workspaceId
 			: panelState.kind === "local_file"
 				? !!panelState.localFilePath
 				: !!panelState.memoryScope;

surfsense_web/components/editor-panel/memory.ts

@@ -24,10 +24,10 @@ interface MemoryReadResponse {
 	limits?: MemoryLimits;
 }
 
-function getMemoryPath(scope: MemoryScope, searchSpaceId?: number | null) {
+function getMemoryPath(scope: MemoryScope, workspaceId?: number | null) {
 	if (scope === "user") return "/api/v1/users/me/memory";
-	if (!searchSpaceId) throw new Error("Missing search space context");
-	return `/api/v1/workspaces/${searchSpaceId}/memory`;
+	if (!workspaceId) throw new Error("Missing workspace context");
+	return `/api/v1/workspaces/${workspaceId}/memory`;
 }
 
 export function getMemoryLimitState(length: number, limits?: MemoryLimits | null) {
@@ -53,16 +53,16 @@ export function getMemoryLimitState(length: number, limits?: MemoryLimits | null
 
 export async function fetchMemoryEditorDocument({
 	scope,
-	searchSpaceId,
+	workspaceId,
 	title,
 	signal,
 }: {
 	scope: MemoryScope;
-	searchSpaceId?: number | null;
+	workspaceId?: number | null;
 	title?: string | null;
 	signal?: AbortSignal;
 }) {
-	const response = await authenticatedFetch(buildBackendUrl(getMemoryPath(scope, searchSpaceId)), {
+	const response = await authenticatedFetch(buildBackendUrl(getMemoryPath(scope, workspaceId)), {
 		method: "GET",
 		signal,
 	});
@@ -87,14 +87,14 @@ export async function fetchMemoryEditorDocument({
 
 export async function saveMemoryMarkdown({
 	scope,
-	searchSpaceId,
+	workspaceId,
 	markdown,
 }: {
 	scope: MemoryScope;
-	searchSpaceId?: number | null;
+	workspaceId?: number | null;
 	markdown: string;
 }) {
-	const response = await authenticatedFetch(buildBackendUrl(getMemoryPath(scope, searchSpaceId)), {
+	const response = await authenticatedFetch(buildBackendUrl(getMemoryPath(scope, workspaceId)), {
 		method: "PUT",
 		headers: { "Content-Type": "application/json" },
 		body: JSON.stringify({ memory_md: markdown }),

surfsense_web/components/layout/index.ts

@@ -5,13 +5,13 @@ export type {
 	IconRailProps,
 	NavItem,
 	PageUsage,
-	SearchSpace,
 	SidebarSectionProps,
 	User,
+	Workspace,
 } from "./types/layout.types";
 export {
 	ChatListItem,
-	CreateSearchSpaceDialog,
+	CreateWorkspaceDialog,
 	CreditBalanceDisplay,
 	Header,
 	IconRail,
@@ -20,10 +20,10 @@ export {
 	MobileSidebarTrigger,
 	NavIcon,
 	NavSection,
-	SearchSpaceAvatar,
 	Sidebar,
 	SidebarCollapseButton,
 	SidebarHeader,
 	SidebarSection,
 	SidebarUserProfile,
+	WorkspaceAvatar,
 } from "./ui";

surfsense_web/components/layout/providers/FreeLayoutDataProvider.tsx

@@ -9,14 +9,14 @@ import { useLoginGate } from "@/contexts/login-gate";
 import { useAnnouncements } from "@/hooks/use-announcements";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { anonymousChatApiService } from "@/lib/apis/anonymous-chat-api.service";
-import type { ChatItem, NavItem, PageUsage, SearchSpace } from "../types/layout.types";
+import type { ChatItem, NavItem, PageUsage, Workspace } from "../types/layout.types";
 import { LayoutShell } from "../ui/shell";
 
 interface FreeLayoutDataProviderProps {
 	children: ReactNode;
 }
 
-const GUEST_SPACE: SearchSpace = {
+const GUEST_SPACE: Workspace = {
 	id: 0,
 	name: "SurfSense Free",
 	description: "Free AI chat without login",
@@ -94,19 +94,16 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 
 	const handleAnnouncements = useCallback(() => gate("see what's new"), [gate]);
 
-	const handleSearchSpaceSelect = useCallback(
-		(_id: number) => gate("switch search spaces"),
-		[gate]
-	);
+	const handleWorkspaceSelect = useCallback((_id: number) => gate("switch workspaces"), [gate]);
 
 	return (
 		<LayoutShell
-			searchSpaces={[GUEST_SPACE]}
-			activeSearchSpaceId={0}
-			onSearchSpaceSelect={handleSearchSpaceSelect}
-			onSearchSpaceSettings={gatedAction("search space settings")}
-			onAddSearchSpace={gatedAction("create search spaces")}
-			searchSpace={GUEST_SPACE}
+			workspaces={[GUEST_SPACE]}
+			activeWorkspaceId={0}
+			onWorkspaceSelect={handleWorkspaceSelect}
+			onWorkspaceSettings={gatedAction("workspace settings")}
+			onAddWorkspace={gatedAction("create workspaces")}
+			workspace={GUEST_SPACE}
 			navItems={navItems}
 			onNavItemClick={handleNavItemClick}
 			chats={[]}
@@ -121,7 +118,7 @@ export function FreeLayoutDataProvider({ children }: FreeLayoutDataProviderProps
 				email: "Guest",
 				name: "Guest",
 			}}
-			onSettings={gatedAction("search space settings")}
+			onSettings={gatedAction("workspace settings")}
 			onManageMembers={gatedAction("team management")}
 			onUserSettings={gatedAction("account settings")}
 			onAnnouncements={handleAnnouncements}

surfsense_web/components/layout/providers/LayoutDataProvider.tsx

@@ -15,8 +15,8 @@ import { announcementsDialogAtom } from "@/atoms/layout/dialogs.atom";
 import { rightPanelCollapsedAtom } from "@/atoms/layout/right-panel.atom";
 import { removeChatTabAtom, syncChatTabAtom, type Tab } from "@/atoms/tabs/tabs.atom";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
-import { deleteSearchSpaceMutationAtom } from "@/atoms/workspaces/workspace-mutation.atoms";
-import { searchSpacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
+import { deleteWorkspaceMutationAtom } from "@/atoms/workspaces/workspace-mutation.atoms";
+import { workspacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
 import { ActionLogDialog } from "@/components/agent-action-log/action-log-dialog";
 import { AnnouncementSpotlight } from "@/components/announcements/AnnouncementSpotlight";
 import { AnnouncementsDialog } from "@/components/announcements/AnnouncementsDialog";
@@ -47,17 +47,17 @@ import { useInbox } from "@/hooks/use-inbox";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { useArchiveThread, useDeleteThread, useRenameThread } from "@/hooks/use-thread-mutations";
 import { notificationsApiService } from "@/lib/apis/notifications-api.service";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { getLoginPath, logout } from "@/lib/auth-utils";
 import { fetchThreads } from "@/lib/chat/thread-persistence";
 import { resetUser, trackLogout } from "@/lib/posthog/events";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
-import type { ChatItem, NavItem, SearchSpace } from "../types/layout.types";
-import { CreateSearchSpaceDialog } from "../ui/dialogs";
+import type { ChatItem, NavItem, Workspace } from "../types/layout.types";
+import { CreateWorkspaceDialog } from "../ui/dialogs";
 import { LayoutShell } from "../ui/shell";
 
 interface LayoutDataProviderProps {
-	searchSpaceId: string;
+	workspaceId: string;
 	children: React.ReactNode;
 }
 
@@ -72,7 +72,7 @@ function formatInboxCount(count: number): string {
 	return `${thousands}k+`;
 }
 
-export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProviderProps) {
+export function LayoutDataProvider({ workspaceId, children }: LayoutDataProviderProps) {
 	const t = useTranslations("dashboard");
 	const tCommon = useTranslations("common");
 	const tSidebar = useTranslations("sidebar");
@@ -88,19 +88,19 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	// Atoms
 	const { data: user } = useAtomValue(currentUserAtom);
 	const {
-		data: searchSpacesData,
-		refetch: refetchSearchSpaces,
-		isSuccess: searchSpacesLoaded,
-	} = useAtomValue(searchSpacesAtom);
-	const { mutateAsync: deleteSearchSpace } = useAtomValue(deleteSearchSpaceMutationAtom);
+		data: workspacesData,
+		refetch: refetchWorkspaces,
+		isSuccess: workspacesLoaded,
+	} = useAtomValue(workspacesAtom);
+	const { mutateAsync: deleteWorkspace } = useAtomValue(deleteWorkspaceMutationAtom);
 	const currentThreadState = useAtomValue(currentThreadAtom);
 	const resetCurrentThread = useSetAtom(resetCurrentThreadAtom);
 	const syncChatTab = useSetAtom(syncChatTabAtom);
 	const removeChatTab = useSetAtom(removeChatTabAtom);
 	const { activateChatThread, prefetchChatThread } = useActivateChatThread();
-	const { mutateAsync: archiveThread } = useArchiveThread(searchSpaceId);
-	const { mutateAsync: deleteThread } = useDeleteThread(searchSpaceId);
-	const { mutateAsync: renameThread } = useRenameThread(searchSpaceId);
+	const { mutateAsync: archiveThread } = useArchiveThread(workspaceId);
+	const { mutateAsync: deleteThread } = useDeleteThread(workspaceId);
+	const { mutateAsync: renameThread } = useRenameThread(workspaceId);
 
 	// Key used to force-remount the page component (e.g. after deleting the active chat
 	// when the router is out of sync due to replaceState)
@@ -113,16 +113,16 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 
 	// Fetch current workspace as a fallback for the selector while the full list catches up.
 	const { data: currentWorkspace } = useQuery({
-		queryKey: cacheKeys.searchSpaces.detail(searchSpaceId),
-		queryFn: () => searchSpacesApiService.getSearchSpace({ id: Number(searchSpaceId) }),
-		enabled: !!searchSpaceId,
+		queryKey: cacheKeys.workspaces.detail(workspaceId),
+		queryFn: () => workspacesApiService.getWorkspace({ id: Number(workspaceId) }),
+		enabled: !!workspaceId,
 	});
 
 	// Fetch threads (40 total to allow up to 20 per section - shared/private)
 	const { data: threadsData, isPending: isLoadingThreads } = useQuery({
-		queryKey: ["threads", searchSpaceId, { limit: 40 }],
-		queryFn: () => fetchThreads(Number(searchSpaceId), 40),
-		enabled: !!searchSpaceId,
+		queryKey: ["threads", workspaceId, { limit: 40 }],
+		queryFn: () => fetchThreads(Number(workspaceId), 40),
+		enabled: !!workspaceId,
 	});
 
 	// Unified slide-out panel state (only one can be open at a time)
@@ -147,10 +147,10 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	}, [setIsDocumentsSidebarOpen]);
 
 	// Search space dialog state
-	const [isCreateSearchSpaceDialogOpen, setIsCreateSearchSpaceDialogOpen] = useState(false);
+	const [isCreateWorkspaceDialogOpen, setIsCreateWorkspaceDialogOpen] = useState(false);
 
 	const userId = user?.id ? String(user.id) : null;
-	const numericSpaceId = Number(searchSpaceId) || null;
+	const numericSpaceId = Number(workspaceId) || null;
 
 	// Batch-fetch unread counts for all categories in a single request
 	// instead of 2 separate /unread-count calls.
@@ -218,11 +218,11 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				icon: <AlertTriangle className="h-5 w-5 text-amber-500" />,
 				action: {
 					label: "Buy credits",
-					onClick: () => router.push(`/dashboard/${searchSpaceId}/buy-more`),
+					onClick: () => router.push(`/dashboard/${workspaceId}/buy-more`),
 				},
 			});
 		}
-	}, [statusInbox.inboxItems, statusInbox.loading, searchSpaceId, router]);
+	}, [statusInbox.inboxItems, statusInbox.loading, workspaceId, router]);
 
 	// Delete dialogs state
 	const [showDeleteChatDialog, setShowDeleteChatDialog] = useState(false);
@@ -235,28 +235,28 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const [newChatTitle, setNewChatTitle] = useState("");
 	const [isRenamingChat, setIsRenamingChat] = useState(false);
 
-	// Delete/Leave search space dialog state
-	const [showDeleteSearchSpaceDialog, setShowDeleteSearchSpaceDialog] = useState(false);
-	const [showLeaveSearchSpaceDialog, setShowLeaveSearchSpaceDialog] = useState(false);
-	const [searchSpaceToDelete, setSearchSpaceToDelete] = useState<SearchSpace | null>(null);
-	const [searchSpaceToLeave, setSearchSpaceToLeave] = useState<SearchSpace | null>(null);
-	const [isDeletingSearchSpace, setIsDeletingSearchSpace] = useState(false);
-	const [isLeavingSearchSpace, setIsLeavingSearchSpace] = useState(false);
+	// Delete/Leave workspace dialog state
+	const [showDeleteWorkspaceDialog, setShowDeleteWorkspaceDialog] = useState(false);
+	const [showLeaveWorkspaceDialog, setShowLeaveWorkspaceDialog] = useState(false);
+	const [workspaceToDelete, setWorkspaceToDelete] = useState<Workspace | null>(null);
+	const [workspaceToLeave, setWorkspaceToLeave] = useState<Workspace | null>(null);
+	const [isDeletingWorkspace, setIsDeletingWorkspace] = useState(false);
+	const [isLeavingWorkspace, setIsLeavingWorkspace] = useState(false);
 
-	// Reset transient slide-out panels when switching search spaces.
+	// Reset transient slide-out panels when switching workspaces.
 	// Tabs intentionally persist across spaces — opening tabs from multiple
-	// search spaces is a supported flow (browser-tab semantics).
-	const prevSearchSpaceIdRef = useRef(searchSpaceId);
+	// workspaces is a supported flow (browser-tab semantics).
+	const prevWorkspaceIdRef = useRef(workspaceId);
 	useEffect(() => {
-		if (prevSearchSpaceIdRef.current !== searchSpaceId) {
-			prevSearchSpaceIdRef.current = searchSpaceId;
+		if (prevWorkspaceIdRef.current !== workspaceId) {
+			prevWorkspaceIdRef.current = workspaceId;
 			setActiveSlideoutPanel(null);
 		}
-	}, [searchSpaceId]);
+	}, [workspaceId]);
 
-	const searchSpaces: SearchSpace[] = useMemo(() => {
-		if (!searchSpacesData || !Array.isArray(searchSpacesData)) return [];
-		return searchSpacesData.map((space) => ({
+	const workspaces: Workspace[] = useMemo(() => {
+		if (!workspacesData || !Array.isArray(workspacesData)) return [];
+		return workspacesData.map((space) => ({
 			id: space.id,
 			name: space.name,
 			description: space.description,
@@ -264,15 +264,15 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			memberCount: space.member_count || 0,
 			createdAt: space.created_at,
 		}));
-	}, [searchSpacesData]);
+	}, [workspacesData]);
 
 	// Find active workspace from list, falling back to the route-scoped detail query.
-	const activeSearchSpace: SearchSpace | null = useMemo(() => {
-		if (!searchSpaceId) return null;
-		const searchSpaceIdNumber = Number(searchSpaceId);
-		const listedSpace = searchSpaces.find((s) => s.id === searchSpaceIdNumber);
+	const activeWorkspace: Workspace | null = useMemo(() => {
+		if (!workspaceId) return null;
+		const workspaceIdNumber = Number(workspaceId);
+		const listedSpace = workspaces.find((s) => s.id === workspaceIdNumber);
 		if (listedSpace) return listedSpace;
-		if (!currentWorkspace || currentWorkspace.id !== searchSpaceIdNumber) return null;
+		if (!currentWorkspace || currentWorkspace.id !== workspaceIdNumber) return null;
 		return {
 			id: currentWorkspace.id,
 			name: currentWorkspace.name,
@@ -281,25 +281,24 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			memberCount: 0,
 			createdAt: currentWorkspace.created_at,
 		};
-	}, [currentWorkspace, searchSpaceId, searchSpaces]);
+	}, [currentWorkspace, workspaceId, workspaces]);
 
-	// Safety redirect: if the current search space is no longer in the user's list
+	// Safety redirect: if the current workspace is no longer in the user's list
 	// (e.g. deleted by background task, membership revoked), redirect to a valid space.
 	useEffect(() => {
-		if (!searchSpacesLoaded || !searchSpaceId || isDeletingSearchSpace || isLeavingSearchSpace)
-			return;
-		if (searchSpaces.length > 0 && !activeSearchSpace) {
-			router.replace(`/dashboard/${searchSpaces[0].id}/new-chat`);
-		} else if (searchSpaces.length === 0 && searchSpacesLoaded && !activeSearchSpace) {
+		if (!workspacesLoaded || !workspaceId || isDeletingWorkspace || isLeavingWorkspace) return;
+		if (workspaces.length > 0 && !activeWorkspace) {
+			router.replace(`/dashboard/${workspaces[0].id}/new-chat`);
+		} else if (workspaces.length === 0 && workspacesLoaded && !activeWorkspace) {
 			router.replace("/dashboard");
 		}
 	}, [
-		searchSpacesLoaded,
-		searchSpaceId,
-		searchSpaces,
-		activeSearchSpace,
-		isDeletingSearchSpace,
-		isLeavingSearchSpace,
+		workspacesLoaded,
+		workspaceId,
+		workspaces,
+		activeWorkspace,
+		isDeletingWorkspace,
+		isLeavingWorkspace,
 		router,
 	]);
 
@@ -307,18 +306,18 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	useEffect(() => {
 		const chatId = currentChatId ?? null;
 		const chatUrl = chatId
-			? `/dashboard/${searchSpaceId}/new-chat/${chatId}`
-			: `/dashboard/${searchSpaceId}/new-chat`;
+			? `/dashboard/${workspaceId}/new-chat/${chatId}`
+			: `/dashboard/${workspaceId}/new-chat`;
 		const thread = threadsData?.threads?.find((t) => t.id === chatId);
 		syncChatTab({
 			chatId,
 			// Avoid overwriting live SSE-updated tab titles with fallback values.
 			title: chatId ? (thread?.title ?? undefined) : "New Chat",
 			chatUrl,
-			searchSpaceId: Number(searchSpaceId),
+			workspaceId: Number(workspaceId),
 			...(thread?.visibility !== undefined ? { visibility: thread.visibility } : {}),
 		});
-	}, [currentChatId, searchSpaceId, threadsData?.threads, syncChatTab]);
+	}, [currentChatId, workspaceId, threadsData?.threads, syncChatTab]);
 
 	const chats = useMemo(() => {
 		if (!threadsData?.threads) return [];
@@ -326,12 +325,12 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 		return threadsData.threads.map<ChatItem>((thread) => ({
 			id: thread.id,
 			name: thread.title || `Chat ${thread.id}`,
-			url: `/dashboard/${searchSpaceId}/new-chat/${thread.id}`,
+			url: `/dashboard/${workspaceId}/new-chat/${thread.id}`,
 			visibility: thread.visibility,
 			isOwnThread: thread.is_own_thread,
 			archived: thread.archived,
 		}));
-	}, [threadsData, searchSpaceId]);
+	}, [threadsData, workspaceId]);
 
 	// Navigation items
 	// Inbox, Automations, and Artifacts are rendered explicitly below "New chat"
@@ -352,13 +351,13 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 					},
 					{
 						title: "Automations",
-						url: `/dashboard/${searchSpaceId}/automations`,
+						url: `/dashboard/${workspaceId}/automations`,
 						icon: AlarmClock,
 						isActive: isAutomationsActive,
 					},
 					{
 						title: "Artifacts",
-						url: `/dashboard/${searchSpaceId}/artifacts`,
+						url: `/dashboard/${workspaceId}/artifacts`,
 						icon: Boxes,
 						isActive: isArtifactsActive,
 					},
@@ -377,63 +376,63 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 			isInboxSidebarOpen,
 			isDocumentsSidebarOpen,
 			totalUnreadCount,
-			searchSpaceId,
+			workspaceId,
 			isAutomationsActive,
 			isArtifactsActive,
 		]
 	);
 
 	// Handlers
-	const handleSearchSpaceSelect = useCallback(
+	const handleWorkspaceSelect = useCallback(
 		(id: number) => {
 			router.push(`/dashboard/${id}/new-chat`);
 		},
 		[router]
 	);
 
-	const handleAddSearchSpace = useCallback(() => {
-		setIsCreateSearchSpaceDialogOpen(true);
+	const handleAddWorkspace = useCallback(() => {
+		setIsCreateWorkspaceDialogOpen(true);
 	}, []);
 
 	const setAnnouncementsDialog = useSetAtom(announcementsDialogAtom);
 
 	const handleUserSettings = useCallback(() => {
-		router.push(`/dashboard/${searchSpaceId}/user-settings/profile`);
-	}, [router, searchSpaceId]);
+		router.push(`/dashboard/${workspaceId}/user-settings/profile`);
+	}, [router, workspaceId]);
 
 	const handleAnnouncements = useCallback(() => {
 		setAnnouncementsDialog(true);
 	}, [setAnnouncementsDialog]);
 
-	const handleSearchSpaceSettings = useCallback(
-		(space: SearchSpace) => {
+	const handleWorkspaceSettings = useCallback(
+		(space: Workspace) => {
 			router.push(`/dashboard/${space.id}/workspace-settings`);
 		},
 		[router]
 	);
 
-	const handleSearchSpaceDeleteClick = useCallback((space: SearchSpace) => {
+	const handleWorkspaceDeleteClick = useCallback((space: Workspace) => {
 		// If user is owner, show delete dialog; otherwise show leave dialog
 		if (space.isOwner) {
-			setSearchSpaceToDelete(space);
-			setShowDeleteSearchSpaceDialog(true);
+			setWorkspaceToDelete(space);
+			setShowDeleteWorkspaceDialog(true);
 		} else {
-			setSearchSpaceToLeave(space);
-			setShowLeaveSearchSpaceDialog(true);
+			setWorkspaceToLeave(space);
+			setShowLeaveWorkspaceDialog(true);
 		}
 	}, []);
 
-	const confirmDeleteSearchSpace = useCallback(async () => {
-		if (!searchSpaceToDelete) return;
-		setIsDeletingSearchSpace(true);
+	const confirmDeleteWorkspace = useCallback(async () => {
+		if (!workspaceToDelete) return;
+		setIsDeletingWorkspace(true);
 		try {
-			await deleteSearchSpace({ id: searchSpaceToDelete.id });
+			await deleteWorkspace({ id: workspaceToDelete.id });
 
-			const isCurrentSpace = Number(searchSpaceId) === searchSpaceToDelete.id;
+			const isCurrentSpace = Number(workspaceId) === workspaceToDelete.id;
 
 			// Await refetch so we have the freshest list (backend now hides [DELETING] spaces)
-			const result = await refetchSearchSpaces();
-			const updatedSpaces = (result.data ?? []).filter((s) => s.id !== searchSpaceToDelete.id);
+			const result = await refetchWorkspaces();
+			const updatedSpaces = (result.data ?? []).filter((s) => s.id !== workspaceToDelete.id);
 
 			if (isCurrentSpace) {
 				if (updatedSpaces.length > 0) {
@@ -443,27 +442,27 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				}
 			}
 		} catch (error) {
-			console.error("Error deleting search space:", error);
+			console.error("Error deleting workspace:", error);
 			toast.error(
-				t.has("delete_space_error") ? t("delete_space_error") : "Failed to delete search space"
+				t.has("delete_space_error") ? t("delete_space_error") : "Failed to delete workspace"
 			);
 		} finally {
-			setIsDeletingSearchSpace(false);
-			setShowDeleteSearchSpaceDialog(false);
-			setSearchSpaceToDelete(null);
+			setIsDeletingWorkspace(false);
+			setShowDeleteWorkspaceDialog(false);
+			setWorkspaceToDelete(null);
 		}
-	}, [searchSpaceToDelete, deleteSearchSpace, refetchSearchSpaces, searchSpaceId, router, t]);
+	}, [workspaceToDelete, deleteWorkspace, refetchWorkspaces, workspaceId, router, t]);
 
-	const confirmLeaveSearchSpace = useCallback(async () => {
-		if (!searchSpaceToLeave) return;
-		setIsLeavingSearchSpace(true);
+	const confirmLeaveWorkspace = useCallback(async () => {
+		if (!workspaceToLeave) return;
+		setIsLeavingWorkspace(true);
 		try {
-			await searchSpacesApiService.leaveSearchSpace(searchSpaceToLeave.id);
+			await workspacesApiService.leaveWorkspace(workspaceToLeave.id);
 
-			const isCurrentSpace = Number(searchSpaceId) === searchSpaceToLeave.id;
+			const isCurrentSpace = Number(workspaceId) === workspaceToLeave.id;
 
-			const result = await refetchSearchSpaces();
-			const updatedSpaces = (result.data ?? []).filter((s) => s.id !== searchSpaceToLeave.id);
+			const result = await refetchWorkspaces();
+			const updatedSpaces = (result.data ?? []).filter((s) => s.id !== workspaceToLeave.id);
 
 			if (isCurrentSpace) {
 				if (updatedSpaces.length > 0) {
@@ -473,14 +472,14 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				}
 			}
 		} catch (error) {
-			console.error("Error leaving search space:", error);
-			toast.error(t.has("leave_error") ? t("leave_error") : "Failed to leave search space");
+			console.error("Error leaving workspace:", error);
+			toast.error(t.has("leave_error") ? t("leave_error") : "Failed to leave workspace");
 		} finally {
-			setIsLeavingSearchSpace(false);
-			setShowLeaveSearchSpaceDialog(false);
-			setSearchSpaceToLeave(null);
+			setIsLeavingWorkspace(false);
+			setShowLeaveWorkspaceDialog(false);
+			setWorkspaceToLeave(null);
 		}
-	}, [searchSpaceToLeave, refetchSearchSpaces, searchSpaceId, router, t]);
+	}, [workspaceToLeave, refetchWorkspaces, workspaceId, router, t]);
 
 	const handleTabSwitch = useCallback(
 		(tab: Tab) => {
@@ -489,14 +488,14 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 					id: tab.chatId ?? null,
 					title: tab.title,
 					url: tab.chatUrl,
-					searchSpaceId: tab.searchSpaceId ?? searchSpaceId,
+					workspaceId: tab.workspaceId ?? workspaceId,
 					...(tab.visibility !== undefined ? { visibility: tab.visibility } : {}),
 					...(tab.hasComments !== undefined ? { hasComments: tab.hasComments } : {}),
 				});
 			}
 			// Document tabs are handled in-place by LayoutShell — no navigation needed
 		},
-		[activateChatThread, searchSpaceId]
+		[activateChatThread, workspaceId]
 	);
 
 	const handleTabPrefetch = useCallback(
@@ -542,15 +541,15 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 		if (isOutOfSync) {
 			resetCurrentThread();
 			// Immediately set the browser URL so the page remounts with a clean /new-chat path
-			window.history.replaceState(null, "", `/dashboard/${searchSpaceId}/new-chat`);
+			window.history.replaceState(null, "", `/dashboard/${workspaceId}/new-chat`);
 			// Force-remount the page component to reset all React state synchronously
 			setChatResetKey((k) => k + 1);
 			// Sync Next.js router internals so useParams/usePathname stay correct going forward
-			router.replace(`/dashboard/${searchSpaceId}/new-chat`);
+			router.replace(`/dashboard/${workspaceId}/new-chat`);
 		} else {
-			router.push(`/dashboard/${searchSpaceId}/new-chat`);
+			router.push(`/dashboard/${workspaceId}/new-chat`);
 		}
-	}, [router, searchSpaceId, currentThreadState.id, params?.chat_id, resetCurrentThread]);
+	}, [router, workspaceId, currentThreadState.id, params?.chat_id, resetCurrentThread]);
 
 	const handleChatSelect = useCallback(
 		(chat: ChatItem) => {
@@ -558,11 +557,11 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				id: chat.id,
 				title: chat.name,
 				url: chat.url,
-				searchSpaceId,
+				workspaceId,
 				...(chat.visibility !== undefined ? { visibility: chat.visibility } : {}),
 			});
 		},
-		[activateChatThread, searchSpaceId]
+		[activateChatThread, workspaceId]
 	);
 
 	const handleChatDelete = useCallback((chat: ChatItem) => {
@@ -595,12 +594,12 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	);
 
 	const handleSettings = useCallback(() => {
-		router.push(`/dashboard/${searchSpaceId}/workspace-settings`);
-	}, [router, searchSpaceId]);
+		router.push(`/dashboard/${workspaceId}/workspace-settings`);
+	}, [router, workspaceId]);
 
 	const handleManageMembers = useCallback(() => {
-		router.push(`/dashboard/${searchSpaceId}/team`);
-	}, [router, searchSpaceId]);
+		router.push(`/dashboard/${workspaceId}/team`);
+	}, [router, workspaceId]);
 
 	const handleLogout = useCallback(async () => {
 		try {
@@ -634,7 +633,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 						id: fallbackTab.chatId ?? null,
 						title: fallbackTab.title,
 						url: fallbackTab.chatUrl,
-						searchSpaceId: fallbackTab.searchSpaceId ?? searchSpaceId,
+						workspaceId: fallbackTab.workspaceId ?? workspaceId,
 						...(fallbackTab.visibility !== undefined ? { visibility: fallbackTab.visibility } : {}),
 						...(fallbackTab.hasComments !== undefined
 							? { hasComments: fallbackTab.hasComments }
@@ -643,10 +642,10 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				} else {
 					const isOutOfSync = currentThreadState.id !== null && !params?.chat_id;
 					if (isOutOfSync) {
-						window.history.replaceState(null, "", `/dashboard/${searchSpaceId}/new-chat`);
+						window.history.replaceState(null, "", `/dashboard/${workspaceId}/new-chat`);
 						setChatResetKey((k) => k + 1);
 					} else {
-						router.push(`/dashboard/${searchSpaceId}/new-chat`);
+						router.push(`/dashboard/${workspaceId}/new-chat`);
 					}
 				}
 			}
@@ -660,7 +659,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	}, [
 		chatToDelete,
 		deleteThread,
-		searchSpaceId,
+		workspaceId,
 		resetCurrentThread,
 		currentChatId,
 		currentThreadState.id,
@@ -695,7 +694,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	// Detect if we're on the chat page (needs overflow-hidden for chat's own scroll)
 	const isChatPage = pathname?.includes("/new-chat") ?? false;
 	const isUserSettingsPage = pathname?.includes("/user-settings") === true;
-	const isSearchSpaceSettingsPage = pathname?.includes("/workspace-settings") === true;
+	const isWorkspaceSettingsPage = pathname?.includes("/workspace-settings") === true;
 	const isTeamPage = pathname?.endsWith("/team") === true;
 	const isAutomationsPage = pathname?.includes("/automations") === true;
 	const isArtifactsPage = pathname?.endsWith("/artifacts") === true;
@@ -703,15 +702,15 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	const handleViewAllChats = useCallback(() => {
 		setActiveSlideoutPanel(null);
 		router.push(
-			isAllChatsPage ? `/dashboard/${searchSpaceId}/new-chat` : `/dashboard/${searchSpaceId}/chats`
+			isAllChatsPage ? `/dashboard/${workspaceId}/new-chat` : `/dashboard/${workspaceId}/chats`
 		);
-	}, [isAllChatsPage, router, searchSpaceId]);
+	}, [isAllChatsPage, router, workspaceId]);
 	const useWorkspacePanel =
 		pathname?.endsWith("/buy-more") === true ||
 		pathname?.endsWith("/earn-credits") === true ||
 		pathname?.endsWith("/more-pages") === true ||
 		isUserSettingsPage ||
-		isSearchSpaceSettingsPage ||
+		isWorkspaceSettingsPage ||
 		isTeamPage ||
 		isAutomationsPage ||
 		isArtifactsPage ||
@@ -720,13 +719,13 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 	return (
 		<>
 			<LayoutShell
-				searchSpaces={searchSpaces}
-				activeSearchSpaceId={Number(searchSpaceId)}
-				onSearchSpaceSelect={handleSearchSpaceSelect}
-				onSearchSpaceDelete={handleSearchSpaceDeleteClick}
-				onSearchSpaceSettings={handleSearchSpaceSettings}
-				onAddSearchSpace={handleAddSearchSpace}
-				searchSpace={activeSearchSpace}
+				workspaces={workspaces}
+				activeWorkspaceId={Number(workspaceId)}
+				onWorkspaceSelect={handleWorkspaceSelect}
+				onWorkspaceDelete={handleWorkspaceDeleteClick}
+				onWorkspaceSettings={handleWorkspaceSettings}
+				onAddWorkspace={handleAddWorkspace}
+				workspace={activeWorkspace}
 				navItems={navItems}
 				onNavItemClick={handleNavItemClick}
 				chats={chats}
@@ -756,7 +755,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				useWorkspacePanel={useWorkspacePanel}
 				workspacePanelViewportClassName={
 					isUserSettingsPage ||
-					isSearchSpaceSettingsPage ||
+					isWorkspaceSettingsPage ||
 					isTeamPage ||
 					isAutomationsPage ||
 					isArtifactsPage ||
@@ -769,7 +768,7 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 						? "max-w-none select-none"
 						: isAllChatsPage
 							? "max-w-5xl"
-							: isUserSettingsPage || isSearchSpaceSettingsPage || isTeamPage || isArtifactsPage
+							: isUserSettingsPage || isWorkspaceSettingsPage || isTeamPage || isArtifactsPage
 								? "max-w-5xl"
 								: undefined
 				}
@@ -888,66 +887,64 @@ export function LayoutDataProvider({ searchSpaceId, children }: LayoutDataProvid
 				</DialogContent>
 			</Dialog>
 
-			{/* Delete Search Space Dialog */}
-			<AlertDialog open={showDeleteSearchSpaceDialog} onOpenChange={setShowDeleteSearchSpaceDialog}>
+			{/* Delete Workspace Dialog */}
+			<AlertDialog open={showDeleteWorkspaceDialog} onOpenChange={setShowDeleteWorkspaceDialog}>
 				<AlertDialogContent className="sm:max-w-md">
 					<AlertDialogHeader>
-						<AlertDialogTitle>{t("delete_search_space")}</AlertDialogTitle>
+						<AlertDialogTitle>{t("delete_workspace")}</AlertDialogTitle>
 						<AlertDialogDescription>
-							{t("delete_space_confirm", { name: searchSpaceToDelete?.name || "" })}
+							{t("delete_space_confirm", { name: workspaceToDelete?.name || "" })}
 						</AlertDialogDescription>
 					</AlertDialogHeader>
 					<AlertDialogFooter>
-						<AlertDialogCancel disabled={isDeletingSearchSpace}>
+						<AlertDialogCancel disabled={isDeletingWorkspace}>
 							{tCommon("cancel")}
 						</AlertDialogCancel>
 						<AlertDialogAction
 							onClick={(e) => {
 								e.preventDefault();
-								confirmDeleteSearchSpace();
+								confirmDeleteWorkspace();
 							}}
-							disabled={isDeletingSearchSpace}
+							disabled={isDeletingWorkspace}
 							className="relative bg-destructive text-destructive-foreground hover:bg-destructive/90"
 						>
-							<span className={isDeletingSearchSpace ? "opacity-0" : ""}>{tCommon("delete")}</span>
-							{isDeletingSearchSpace && <Spinner size="sm" className="absolute" />}
+							<span className={isDeletingWorkspace ? "opacity-0" : ""}>{tCommon("delete")}</span>
+							{isDeletingWorkspace && <Spinner size="sm" className="absolute" />}
 						</AlertDialogAction>
 					</AlertDialogFooter>
 				</AlertDialogContent>
 			</AlertDialog>
 
-			{/* Leave Search Space Dialog */}
-			<AlertDialog open={showLeaveSearchSpaceDialog} onOpenChange={setShowLeaveSearchSpaceDialog}>
+			{/* Leave Workspace Dialog */}
+			<AlertDialog open={showLeaveWorkspaceDialog} onOpenChange={setShowLeaveWorkspaceDialog}>
 				<AlertDialogContent className="sm:max-w-md">
 					<AlertDialogHeader>
 						<AlertDialogTitle>{t("leave_title")}</AlertDialogTitle>
 						<AlertDialogDescription>
-							{t("leave_confirm", { name: searchSpaceToLeave?.name || "" })}
+							{t("leave_confirm", { name: workspaceToLeave?.name || "" })}
 						</AlertDialogDescription>
 					</AlertDialogHeader>
 					<AlertDialogFooter>
-						<AlertDialogCancel disabled={isLeavingSearchSpace}>
-							{tCommon("cancel")}
-						</AlertDialogCancel>
+						<AlertDialogCancel disabled={isLeavingWorkspace}>{tCommon("cancel")}</AlertDialogCancel>
 						<AlertDialogAction
 							onClick={(e) => {
 								e.preventDefault();
-								confirmLeaveSearchSpace();
+								confirmLeaveWorkspace();
 							}}
-							disabled={isLeavingSearchSpace}
+							disabled={isLeavingWorkspace}
 							className="relative bg-destructive text-destructive-foreground hover:bg-destructive/90"
 						>
-							<span className={isLeavingSearchSpace ? "opacity-0" : ""}>{t("leave")}</span>
-							{isLeavingSearchSpace && <Spinner size="sm" className="absolute" />}
+							<span className={isLeavingWorkspace ? "opacity-0" : ""}>{t("leave")}</span>
+							{isLeavingWorkspace && <Spinner size="sm" className="absolute" />}
 						</AlertDialogAction>
 					</AlertDialogFooter>
 				</AlertDialogContent>
 			</AlertDialog>
 
-			{/* Create Search Space Dialog */}
-			<CreateSearchSpaceDialog
-				open={isCreateSearchSpaceDialogOpen}
-				onOpenChange={setIsCreateSearchSpaceDialogOpen}
+			{/* Create Workspace Dialog */}
+			<CreateWorkspaceDialog
+				open={isCreateWorkspaceDialogOpen}
+				onOpenChange={setIsCreateWorkspaceDialogOpen}
 			/>
 
 			<AnnouncementsDialog />

surfsense_web/components/layout/types/layout.types.ts

@@ -1,7 +1,7 @@
 import type { LucideIcon } from "lucide-react";
 import type { DocumentsProcessingStatus } from "@/hooks/use-documents-processing";
 
-export interface SearchSpace {
+export interface Workspace {
 	id: number;
 	name: string;
 	description?: string | null;
@@ -41,15 +41,15 @@ export interface PageUsage {
 }
 
 export interface IconRailProps {
-	searchSpaces: SearchSpace[];
-	activeSearchSpaceId: number | null;
-	onSearchSpaceSelect: (id: number) => void;
-	onAddSearchSpace: () => void;
+	workspaces: Workspace[];
+	activeWorkspaceId: number | null;
+	onWorkspaceSelect: (id: number) => void;
+	onAddWorkspace: () => void;
 	className?: string;
 }
 
 export interface SidebarHeaderProps {
-	searchSpace: SearchSpace | null;
+	workspace: Workspace | null;
 	onSettings?: () => void;
 }
 
@@ -71,23 +71,23 @@ export interface ChatsSectionProps {
 	onChatSelect: (chat: ChatItem) => void;
 	onChatDelete?: (chat: ChatItem) => void;
 	onViewAllChats?: () => void;
-	searchSpaceId?: string;
+	workspaceId?: string;
 }
 
 export interface SidebarUserProfileProps {
 	user: User;
-	searchSpaceId?: string;
+	workspaceId?: string;
 	onSettings?: () => void;
 	onManageMembers?: () => void;
-	onSwitchSearchSpace?: () => void;
+	onSwitchWorkspace?: () => void;
 	onToggleTheme?: () => void;
 	onLogout?: () => void;
 	theme?: string;
 }
 
 export interface SidebarProps {
-	searchSpace: SearchSpace | null;
-	searchSpaceId?: string;
+	workspace: Workspace | null;
+	workspaceId?: string;
 	navItems: NavItem[];
 	chats: ChatItem[];
 	activeChatId?: number | null;
@@ -106,10 +106,10 @@ export interface SidebarProps {
 }
 
 export interface LayoutShellProps {
-	searchSpaces: SearchSpace[];
-	activeSearchSpaceId: number | null;
-	onSearchSpaceSelect: (id: number) => void;
-	onAddSearchSpace: () => void;
+	workspaces: Workspace[];
+	activeWorkspaceId: number | null;
+	onWorkspaceSelect: (id: number) => void;
+	onAddWorkspace: () => void;
 	sidebarProps: Omit<SidebarProps, "className">;
 	children: React.ReactNode;
 	className?: string;

surfsense_web/components/layout/ui/dialogs/CreateWorkspaceDialog.tsx

@@ -7,7 +7,7 @@ import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { useForm } from "react-hook-form";
 import * as z from "zod";
-import { createSearchSpaceMutationAtom } from "@/atoms/workspaces/workspace-mutation.atoms";
+import { createWorkspaceMutationAtom } from "@/atoms/workspaces/workspace-mutation.atoms";
 import { Button } from "@/components/ui/button";
 import {
 	Dialog,
@@ -27,7 +27,7 @@ import {
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Spinner } from "@/components/ui/spinner";
-import { trackSearchSpaceCreated } from "@/lib/posthog/events";
+import { trackWorkspaceCreated } from "@/lib/posthog/events";
 
 const formSchema = z.object({
 	name: z.string().min(1, "Name is required"),
@@ -36,18 +36,18 @@ const formSchema = z.object({
 
 type FormValues = z.infer<typeof formSchema>;
 
-interface CreateSearchSpaceDialogProps {
+interface CreateWorkspaceDialogProps {
 	open: boolean;
 	onOpenChange: (open: boolean) => void;
 }
 
-export function CreateSearchSpaceDialog({ open, onOpenChange }: CreateSearchSpaceDialogProps) {
-	const t = useTranslations("searchSpace");
+export function CreateWorkspaceDialog({ open, onOpenChange }: CreateWorkspaceDialogProps) {
+	const t = useTranslations("workspace");
 	const tCommon = useTranslations("common");
 	const router = useRouter();
 	const [isSubmitting, setIsSubmitting] = useState(false);
 
-	const { mutateAsync: createSearchSpace } = useAtomValue(createSearchSpaceMutationAtom);
+	const { mutateAsync: createWorkspace } = useAtomValue(createWorkspaceMutationAtom);
 
 	const form = useForm<FormValues>({
 		resolver: zodResolver(formSchema),
@@ -60,16 +60,16 @@ export function CreateSearchSpaceDialog({ open, onOpenChange }: CreateSearchSpac
 	const handleSubmit = async (values: FormValues) => {
 		setIsSubmitting(true);
 		try {
-			const result = await createSearchSpace({
+			const result = await createWorkspace({
 				name: values.name,
 				description: values.description || "",
 			});
 
-			trackSearchSpaceCreated(result.id, values.name);
+			trackWorkspaceCreated(result.id, values.name);
 
 			router.push(`/dashboard/${result.id}/new-chat`);
 		} catch (error) {
-			console.error("Failed to create search space:", error);
+			console.error("Failed to create workspace:", error);
 			setIsSubmitting(false);
 		}
 	};

surfsense_web/components/layout/ui/dialogs/index.ts

@@ -1 +1 @@
-export { CreateSearchSpaceDialog } from "./CreateWorkspaceDialog";
+export { CreateWorkspaceDialog } from "./CreateWorkspaceDialog";

surfsense_web/components/layout/ui/header/Header.tsx

@@ -16,7 +16,7 @@ interface HeaderProps {
 
 export function Header({ mobileMenuTrigger }: HeaderProps) {
 	const pathname = usePathname();
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 	const activeTab = useAtomValue(activeTabAtom);
 
 	const isFreePage = pathname?.startsWith("/free") ?? false;
@@ -26,14 +26,14 @@ export function Header({ mobileMenuTrigger }: HeaderProps) {
 	const currentThreadState = useAtomValue(currentThreadAtom);
 
 	const hasThread = isChatPage && !isDocumentTab && currentThreadState.id !== null;
-	const activeSearchSpaceId = searchSpaceId ? Number(searchSpaceId) : null;
+	const activeWorkspaceId = workspaceId ? Number(workspaceId) : null;
 	const canRenderShareButton =
 		hasThread &&
 		currentThreadState.id !== null &&
 		currentThreadState.visibility !== null &&
-		currentThreadState.searchSpaceId !== null &&
-		activeSearchSpaceId !== null &&
-		currentThreadState.searchSpaceId === activeSearchSpaceId;
+		currentThreadState.workspaceId !== null &&
+		activeWorkspaceId !== null &&
+		currentThreadState.workspaceId === activeWorkspaceId;
 
 	// Free chat pages have their own header with model selector; only render mobile trigger
 	if (isFreePage) {
@@ -50,13 +50,13 @@ export function Header({ mobileMenuTrigger }: HeaderProps) {
 		canRenderShareButton &&
 		currentThreadState.id !== null &&
 		currentThreadState.visibility !== null &&
-		currentThreadState.searchSpaceId !== null
+		currentThreadState.workspaceId !== null
 	) {
 		threadForButton = {
 			id: currentThreadState.id,
 			visibility: currentThreadState.visibility,
 			created_by_id: null,
-			workspace_id: currentThreadState.searchSpaceId,
+			workspace_id: currentThreadState.workspaceId,
 			title: "",
 			archived: false,
 			created_at: "",

surfsense_web/components/layout/ui/icon-rail/IconRail.tsx

@@ -5,17 +5,17 @@ import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
-import type { NavItem, SearchSpace, User } from "../../types/layout.types";
+import type { NavItem, User, Workspace } from "../../types/layout.types";
 import { SidebarUserProfile } from "../sidebar/SidebarUserProfile";
-import { SearchSpaceAvatar } from "./WorkspaceAvatar";
+import { WorkspaceAvatar } from "./WorkspaceAvatar";
 
 interface IconRailProps {
-	searchSpaces: SearchSpace[];
-	activeSearchSpaceId: number | null;
-	onSearchSpaceSelect: (id: number) => void;
-	onSearchSpaceDelete?: (searchSpace: SearchSpace) => void;
-	onSearchSpaceSettings?: (searchSpace: SearchSpace) => void;
-	onAddSearchSpace: () => void;
+	workspaces: Workspace[];
+	activeWorkspaceId: number | null;
+	onWorkspaceSelect: (id: number) => void;
+	onWorkspaceDelete?: (workspace: Workspace) => void;
+	onWorkspaceSettings?: (workspace: Workspace) => void;
+	onAddWorkspace: () => void;
 	isSingleRailMode?: boolean;
 	onNewChat?: () => void;
 	navItems?: NavItem[];
@@ -31,12 +31,12 @@ interface IconRailProps {
 }
 
 export function IconRail({
-	searchSpaces,
-	activeSearchSpaceId,
-	onSearchSpaceSelect,
-	onSearchSpaceDelete,
-	onSearchSpaceSettings,
-	onAddSearchSpace,
+	workspaces,
+	activeWorkspaceId,
+	onWorkspaceSelect,
+	onWorkspaceDelete,
+	onWorkspaceSettings,
+	onAddWorkspace,
 	isSingleRailMode = false,
 	onNewChat,
 	navItems = [],
@@ -77,18 +77,16 @@ export function IconRail({
 		<div className={cn("flex h-full w-14 min-h-0 flex-col items-center", className)}>
 			<ScrollArea className="w-full min-h-0 flex-1">
 				<div className="flex flex-col items-center gap-2 px-1.5 py-3">
-					{searchSpaces.map((searchSpace) => (
-						<SearchSpaceAvatar
-							key={searchSpace.id}
-							name={searchSpace.name}
-							isActive={searchSpace.id === activeSearchSpaceId}
-							isShared={searchSpace.memberCount > 1}
-							isOwner={searchSpace.isOwner}
-							onClick={() => onSearchSpaceSelect(searchSpace.id)}
-							onDelete={onSearchSpaceDelete ? () => onSearchSpaceDelete(searchSpace) : undefined}
-							onSettings={
-								onSearchSpaceSettings ? () => onSearchSpaceSettings(searchSpace) : undefined
-							}
+					{workspaces.map((workspace) => (
+						<WorkspaceAvatar
+							key={workspace.id}
+							name={workspace.name}
+							isActive={workspace.id === activeWorkspaceId}
+							isShared={workspace.memberCount > 1}
+							isOwner={workspace.isOwner}
+							onClick={() => onWorkspaceSelect(workspace.id)}
+							onDelete={onWorkspaceDelete ? () => onWorkspaceDelete(workspace) : undefined}
+							onSettings={onWorkspaceSettings ? () => onWorkspaceSettings(workspace) : undefined}
 							size="md"
 						/>
 					))}
@@ -98,7 +96,7 @@ export function IconRail({
 							<Button
 								variant="ghost"
 								size="icon"
-								onClick={onAddSearchSpace}
+								onClick={onAddWorkspace}
 								className="h-10 w-10 rounded-lg border-2 border-dashed border-muted-foreground/30 hover:border-muted-foreground/50"
 							>
 								<Plus className="h-5 w-5 text-muted-foreground" />

surfsense_web/components/layout/ui/icon-rail/WorkspaceAvatar.tsx

@@ -14,7 +14,7 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 
-interface SearchSpaceAvatarProps {
+interface WorkspaceAvatarProps {
 	name: string;
 	isActive?: boolean;
 	isShared?: boolean;
@@ -27,7 +27,7 @@ interface SearchSpaceAvatarProps {
 }
 
 /**
- * Generates a consistent color based on search space name
+ * Generates a consistent color based on workspace name
  */
 function stringToColor(str: string): string {
 	let hash = 0;
@@ -48,7 +48,7 @@ function stringToColor(str: string): string {
 }
 
 /**
- * Gets initials from search space name (max 2 chars)
+ * Gets initials from workspace name (max 2 chars)
  */
 function getInitials(name: string): string {
 	const words = name.trim().split(/\s+/);
@@ -58,7 +58,7 @@ function getInitials(name: string): string {
 	return name.slice(0, 2).toUpperCase();
 }
 
-export function SearchSpaceAvatar({
+export function WorkspaceAvatar({
 	name,
 	isActive,
 	isShared,
@@ -68,8 +68,8 @@ export function SearchSpaceAvatar({
 	onSettings,
 	size = "md",
 	disableTooltip = false,
-}: SearchSpaceAvatarProps) {
-	const t = useTranslations("searchSpace");
+}: WorkspaceAvatarProps) {
+	const t = useTranslations("workspace");
 	const tCommon = useTranslations("common");
 	const bgColor = stringToColor(name);
 	const initials = getInitials(name);

surfsense_web/components/layout/ui/icon-rail/index.ts

@@ -1,3 +1,3 @@
 export { IconRail } from "./IconRail";
 export { NavIcon } from "./NavIcon";
-export { SearchSpaceAvatar } from "./WorkspaceAvatar";
+export { WorkspaceAvatar } from "./WorkspaceAvatar";

surfsense_web/components/layout/ui/index.ts

@@ -1,6 +1,6 @@
-export { CreateSearchSpaceDialog } from "./dialogs";
+export { CreateWorkspaceDialog } from "./dialogs";
 export { Header } from "./header";
-export { IconRail, NavIcon, SearchSpaceAvatar } from "./icon-rail";
+export { IconRail, NavIcon, WorkspaceAvatar } from "./icon-rail";
 export { LayoutShell } from "./shell";
 export {
 	ChatListItem,

surfsense_web/components/layout/ui/right-panel/RightPanel.tsx

@@ -274,7 +274,7 @@ export function RightPanel({ showTopBorder = false }: RightPanelProps) {
 							documentId={editorState.documentId ?? undefined}
 							localFilePath={editorState.localFilePath ?? undefined}
 							memoryScope={editorState.memoryScope ?? undefined}
-							searchSpaceId={editorState.searchSpaceId ?? undefined}
+							workspaceId={editorState.workspaceId ?? undefined}
 							title={editorState.title}
 							onClose={closeEditor}
 						/>

surfsense_web/components/layout/ui/shell/LayoutShell.tsx

@@ -18,7 +18,7 @@ import {
 	SIDEBAR_MIN_WIDTH,
 	useSidebarResize,
 } from "../../hooks/useSidebarResize";
-import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
+import type { ChatItem, NavItem, PageUsage, User, Workspace } from "../../types/layout.types";
 import { Header } from "../header";
 import { IconRail } from "../icon-rail";
 import {
@@ -102,13 +102,13 @@ interface InboxProps {
 }
 
 interface LayoutShellProps {
-	searchSpaces: SearchSpace[];
-	activeSearchSpaceId: number | null;
-	onSearchSpaceSelect: (id: number) => void;
-	onSearchSpaceDelete?: (searchSpace: SearchSpace) => void;
-	onSearchSpaceSettings?: (searchSpace: SearchSpace) => void;
-	onAddSearchSpace: () => void;
-	searchSpace: SearchSpace | null;
+	workspaces: Workspace[];
+	activeWorkspaceId: number | null;
+	onWorkspaceSelect: (id: number) => void;
+	onWorkspaceDelete?: (workspace: Workspace) => void;
+	onWorkspaceSettings?: (workspace: Workspace) => void;
+	onAddWorkspace: () => void;
+	workspace: Workspace | null;
 	navItems: NavItem[];
 	onNavItemClick?: (item: NavItem) => void;
 	chats: ChatItem[];
@@ -186,12 +186,12 @@ function MainContentPanel({
 			<div className="relative flex flex-1 flex-col bg-panel overflow-hidden min-w-0">
 				<Header />
 
-				{isDocumentTab && activeTab.documentId && activeTab.searchSpaceId ? (
+				{isDocumentTab && activeTab.documentId && activeTab.workspaceId ? (
 					<div className="flex-1 overflow-hidden">
 						<DocumentTabContent
 							key={activeTab.documentId}
 							documentId={activeTab.documentId}
-							searchSpaceId={activeTab.searchSpaceId}
+							workspaceId={activeTab.workspaceId}
 							title={activeTab.title}
 						/>
 					</div>
@@ -210,13 +210,13 @@ function DesktopWorkspaceRegion({ children }: { children: React.ReactNode }) {
 }
 
 export function LayoutShell({
-	searchSpaces,
-	activeSearchSpaceId,
-	onSearchSpaceSelect,
-	onSearchSpaceDelete,
-	onSearchSpaceSettings,
-	onAddSearchSpace,
-	searchSpace,
+	workspaces,
+	activeWorkspaceId,
+	onWorkspaceSelect,
+	onWorkspaceDelete,
+	onWorkspaceSettings,
+	onAddWorkspace,
+	workspace,
 	navItems,
 	onNavItemClick,
 	chats,
@@ -295,11 +295,11 @@ export function LayoutShell({
 						<MobileSidebar
 							isOpen={mobileMenuOpen}
 							onOpenChange={setMobileMenuOpen}
-							searchSpaces={searchSpaces}
-							activeSearchSpaceId={activeSearchSpaceId}
-							onSearchSpaceSelect={onSearchSpaceSelect}
-							onAddSearchSpace={onAddSearchSpace}
-							searchSpace={searchSpace}
+							workspaces={workspaces}
+							activeWorkspaceId={activeWorkspaceId}
+							onWorkspaceSelect={onWorkspaceSelect}
+							onAddWorkspace={onAddWorkspace}
+							workspace={workspace}
 							navItems={navItems}
 							onNavItemClick={onNavItemClick}
 							chats={chats}
@@ -392,12 +392,12 @@ export function LayoutShell({
 							)}
 						>
 							<IconRail
-								searchSpaces={searchSpaces}
-								activeSearchSpaceId={activeSearchSpaceId}
-								onSearchSpaceSelect={onSearchSpaceSelect}
-								onSearchSpaceDelete={onSearchSpaceDelete}
-								onSearchSpaceSettings={onSearchSpaceSettings}
-								onAddSearchSpace={onAddSearchSpace}
+								workspaces={workspaces}
+								activeWorkspaceId={activeWorkspaceId}
+								onWorkspaceSelect={onWorkspaceSelect}
+								onWorkspaceDelete={onWorkspaceDelete}
+								onWorkspaceSettings={onWorkspaceSettings}
+								onAddWorkspace={onAddWorkspace}
 								isSingleRailMode={false}
 								user={user}
 								onUserSettings={onUserSettings}
@@ -417,7 +417,7 @@ export function LayoutShell({
 							)}
 						>
 							<Sidebar
-								searchSpace={searchSpace}
+								workspace={workspace}
 								isCollapsed={isCollapsed}
 								onToggleCollapse={toggleCollapsed}
 								navItems={navItems}

surfsense_web/components/layout/ui/sidebar/AllChatsSidebar.tsx

@@ -48,11 +48,11 @@ import { formatThreadTimestamp } from "@/lib/format-date";
 import { cn } from "@/lib/utils";
 
 interface AllChatsContentProps {
-	searchSpaceId: string;
+	workspaceId: string;
 	className?: string;
 }
 
-function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
+function AllChatsContent({ workspaceId, className }: AllChatsContentProps) {
 	const t = useTranslations("sidebar");
 	const router = useRouter();
 	const params = useParams();
@@ -60,9 +60,9 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 	const isMobile = useIsMobile();
 	const removeChatTab = useSetAtom(removeChatTabAtom);
 	const { activateChatThread, prefetchChatThread } = useActivateChatThread();
-	const { mutateAsync: deleteThread } = useDeleteThread(searchSpaceId);
-	const { mutateAsync: archiveThread } = useArchiveThread(searchSpaceId);
-	const { mutateAsync: renameThread } = useRenameThread(searchSpaceId);
+	const { mutateAsync: deleteThread } = useDeleteThread(workspaceId);
+	const { mutateAsync: archiveThread } = useArchiveThread(workspaceId);
+	const { mutateAsync: renameThread } = useRenameThread(workspaceId);
 
 	const currentChatId = Array.isArray(params.chat_id)
 		? Number(params.chat_id[0])
@@ -96,10 +96,10 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 		error: threadsError,
 		isLoading: isLoadingThreads,
 	} = useQuery({
-		queryKey: ["all-threads", searchSpaceId],
-		queryFn: () => fetchThreads(Number(searchSpaceId)),
-		enabled: !!searchSpaceId && !isSearchMode,
-		placeholderData: () => queryClient.getQueryData(["threads", searchSpaceId, { limit: 40 }]),
+		queryKey: ["all-threads", workspaceId],
+		queryFn: () => fetchThreads(Number(workspaceId)),
+		enabled: !!workspaceId && !isSearchMode,
+		placeholderData: () => queryClient.getQueryData(["threads", workspaceId, { limit: 40 }]),
 	});
 
 	const {
@@ -107,9 +107,9 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 		error: searchError,
 		isLoading: isLoadingSearch,
 	} = useQuery({
-		queryKey: ["search-threads", searchSpaceId, debouncedSearchQuery],
-		queryFn: () => searchThreads(Number(searchSpaceId), debouncedSearchQuery.trim()),
-		enabled: !!searchSpaceId && isSearchMode,
+		queryKey: ["search-threads", workspaceId, debouncedSearchQuery],
+		queryFn: () => searchThreads(Number(workspaceId), debouncedSearchQuery.trim()),
+		enabled: !!workspaceId && isSearchMode,
 	});
 
 	const threads = useMemo(() => {
@@ -127,11 +127,11 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 			activateChatThread({
 				id: thread.id,
 				title: thread.title || "New Chat",
-				searchSpaceId,
+				workspaceId,
 				visibility: thread.visibility,
 			});
 		},
-		[activateChatThread, searchSpaceId]
+		[activateChatThread, workspaceId]
 	);
 
 	const handleDeleteThread = useCallback(
@@ -153,7 +153,7 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 								id: fallbackTab.chatId ?? null,
 								title: fallbackTab.title,
 								url: fallbackTab.chatUrl,
-								searchSpaceId: fallbackTab.searchSpaceId ?? searchSpaceId,
+								workspaceId: fallbackTab.workspaceId ?? workspaceId,
 								...(fallbackTab.visibility !== undefined
 									? { visibility: fallbackTab.visibility }
 									: {}),
@@ -163,7 +163,7 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 							});
 							return;
 						}
-						router.push(`/dashboard/${searchSpaceId}/new-chat`);
+						router.push(`/dashboard/${workspaceId}/new-chat`);
 					}, 250);
 				}
 			} catch (error) {
@@ -173,7 +173,7 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 				setDeletingThreadId(null);
 			}
 		},
-		[activateChatThread, deleteThread, t, currentChatId, router, removeChatTab, searchSpaceId]
+		[activateChatThread, deleteThread, t, currentChatId, router, removeChatTab, workspaceId]
 	);
 
 	const handleToggleArchive = useCallback(
@@ -548,10 +548,10 @@ function AllChatsContent({ searchSpaceId, className }: AllChatsContentProps) {
 	);
 }
 
-export function AllChatsWorkspaceContent({ searchSpaceId }: { searchSpaceId: string }) {
+export function AllChatsWorkspaceContent({ workspaceId }: { workspaceId: string }) {
 	return (
 		<div className="flex h-full min-h-0 w-full overflow-hidden text-sidebar-foreground">
-			<AllChatsContent searchSpaceId={searchSpaceId} />
+			<AllChatsContent workspaceId={workspaceId} />
 		</div>
 	);
 }

surfsense_web/components/layout/ui/sidebar/DesktopLocalTabContent.tsx

@@ -25,7 +25,7 @@ interface DesktopLocalTabContentProps {
 	localRootPaths: string[];
 	canAddMoreLocalRoots: boolean;
 	maxLocalFilesystemRoots: number;
-	searchSpaceId: number;
+	workspaceId: number;
 	onPickFilesystemRoot: () => Promise<void> | void;
 	onRemoveFilesystemRoot: (rootPath: string) => Promise<void> | void;
 	onClearFilesystemRoots: () => Promise<void> | void;
@@ -37,7 +37,7 @@ export function DesktopLocalTabContent({
 	localRootPaths,
 	canAddMoreLocalRoots,
 	maxLocalFilesystemRoots,
-	searchSpaceId,
+	workspaceId,
 	onPickFilesystemRoot,
 	onRemoveFilesystemRoot,
 	onClearFilesystemRoots,
@@ -49,17 +49,17 @@ export function DesktopLocalTabContent({
 	const localSearchInputRef = useRef<HTMLInputElement>(null);
 	const [expandedFolderKeyMap, setExpandedFolderKeyMap] = useAtom(localExpandedFolderKeysAtom);
 	const expandedFolderKeys = useMemo(
-		() => new Set(expandedFolderKeyMap[searchSpaceId] ?? []),
-		[expandedFolderKeyMap, searchSpaceId]
+		() => new Set(expandedFolderKeyMap[workspaceId] ?? []),
+		[expandedFolderKeyMap, workspaceId]
 	);
 	const handleExpandedFolderKeysChange = useCallback(
 		(nextExpandedKeys: Set<string>) => {
 			setExpandedFolderKeyMap((prev) => ({
 				...prev,
-				[searchSpaceId]: Array.from(nextExpandedKeys),
+				[workspaceId]: Array.from(nextExpandedKeys),
 			}));
 		},
-		[searchSpaceId, setExpandedFolderKeyMap]
+		[workspaceId, setExpandedFolderKeyMap]
 	);
 
 	return (
@@ -199,7 +199,7 @@ export function DesktopLocalTabContent({
 			</div>
 			<LocalFilesystemBrowser
 				rootPaths={localRootPaths}
-				searchSpaceId={searchSpaceId}
+				workspaceId={workspaceId}
 				active
 				searchQuery={debouncedLocalSearch.trim() || undefined}
 				onOpenFile={onOpenLocalFile}

surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx

@@ -17,7 +17,7 @@ import {
 	folderWatchDialogOpenAtom,
 	folderWatchInitialFolderAtom,
 } from "@/atoms/folder-sync/folder-sync.atoms";
-import { searchSpacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
+import { workspacesAtom } from "@/atoms/workspaces/workspace-query.atoms";
 import { CreateFolderDialog } from "@/components/documents/CreateFolderDialog";
 import type { DocumentNodeDoc } from "@/components/documents/DocumentNode";
 import { getDocumentTypeIcon } from "@/components/documents/DocumentTypeIcon";
@@ -57,7 +57,7 @@ import type { DocumentTypeEnum } from "@/contracts/types/document.types";
 import { useElectronAPI, usePlatform } from "@/hooks/use-platform";
 import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { foldersApiService } from "@/lib/apis/folders-api.service";
-import { searchSpacesApiService } from "@/lib/apis/workspaces-api.service";
+import { workspacesApiService } from "@/lib/apis/workspaces-api.service";
 import { authenticatedFetch } from "@/lib/auth-fetch";
 import { getMentionDocKey } from "@/lib/chat/mention-doc-key";
 import { getDocumentTypeLabel } from "@/lib/documents/document-type-labels";
@@ -202,7 +202,7 @@ interface WatchedFolderEntry {
 	excludePatterns: string[];
 	fileExtensions: string[] | null;
 	rootFolderId: number | null;
-	searchSpaceId: number;
+	workspaceId: number;
 	active: boolean;
 }
 
@@ -264,7 +264,7 @@ function AuthenticatedDocumentsSidebarBase({
 						path: meta.folder_path as string,
 						name: bf.name,
 						rootFolderId: bf.id,
-						searchSpaceId: bf.workspace_id,
+						workspaceId: bf.workspace_id,
 						excludePatterns: (meta.exclude_patterns as string[]) ?? [],
 						fileExtensions: (meta.file_extensions as string[] | null) ?? null,
 						active: true,
@@ -322,10 +322,10 @@ function AuthenticatedDocumentsSidebarBase({
 
 	// Zero queries for tree data
 	const [zeroFolders, zeroFoldersResult] = useQuery(
-		queries.folders.bySpace({ searchSpaceId: workspaceId })
+		queries.folders.bySpace({ workspaceId: workspaceId })
 	);
 	const [zeroAllDocs, zeroAllDocsResult] = useQuery(
-		queries.documents.bySpace({ searchSpaceId: workspaceId })
+		queries.documents.bySpace({ workspaceId: workspaceId })
 	);
 	const [agentCreatedDocs, setAgentCreatedDocs] = useAtom(agentCreatedDocumentsAtom);
 
@@ -336,7 +336,7 @@ function AuthenticatedDocumentsSidebarBase({
 				name: f.name,
 				position: f.position,
 				parentId: f.parentId ?? null,
-				searchSpaceId: f.searchSpaceId,
+				workspaceId: f.workspaceId,
 				metadata: f.metadata as Record<string, unknown> | null | undefined,
 			})),
 		[zeroFolders]
@@ -361,7 +361,7 @@ function AuthenticatedDocumentsSidebarBase({
 		const zeroIds = new Set(zeroDocs.map((d) => d.id));
 
 		const pendingAgentDocs = agentCreatedDocs
-			.filter((d) => d.searchSpaceId === workspaceId && !zeroIds.has(d.id))
+			.filter((d) => d.workspaceId === workspaceId && !zeroIds.has(d.id))
 			.map((d) => ({
 				id: d.id,
 				title: d.title,
@@ -456,7 +456,7 @@ function AuthenticatedDocumentsSidebarBase({
 				await uploadFolderScan({
 					folderPath: matched.path,
 					folderName: matched.name,
-					searchSpaceId: workspaceId,
+					workspaceId: workspaceId,
 					excludePatterns: matched.excludePatterns ?? DEFAULT_EXCLUDE_PATTERNS,
 					fileExtensions:
 						matched.fileExtensions ?? Array.from(getSupportedExtensionsSet(undefined, etlService)),
@@ -842,7 +842,7 @@ function AuthenticatedDocumentsSidebarBase({
 				openEditorPanel({
 					kind: "memory",
 					memoryScope: "user",
-					searchSpaceId: workspaceId,
+					workspaceId: workspaceId,
 					title: doc.title,
 				});
 				return true;
@@ -851,7 +851,7 @@ function AuthenticatedDocumentsSidebarBase({
 				openEditorPanel({
 					kind: "memory",
 					memoryScope: "team",
-					searchSpaceId: workspaceId,
+					workspaceId: workspaceId,
 					title: doc.title,
 				});
 				return true;
@@ -1020,7 +1020,7 @@ function AuthenticatedDocumentsSidebarBase({
 						if (openMemoryDocument(doc)) return;
 						openEditorPanel({
 							documentId: doc.id,
-							searchSpaceId: workspaceId,
+							workspaceId: workspaceId,
 							title: doc.title,
 						});
 					}}
@@ -1028,7 +1028,7 @@ function AuthenticatedDocumentsSidebarBase({
 						if (openMemoryDocument(doc)) return;
 						openEditorPanel({
 							documentId: doc.id,
-							searchSpaceId: workspaceId,
+							workspaceId: workspaceId,
 							title: doc.title,
 						});
 					}}

surfsense_web/components/layout/ui/sidebar/InboxSidebar.tsx

@@ -166,7 +166,7 @@ export function InboxSidebarContent({
 	const router = useRouter();
 	const params = useParams();
 	const isMobile = !useMediaQuery("(min-width: 640px)");
-	const searchSpaceId = getWorkspaceIdNumber(params) ?? null;
+	const workspaceId = getWorkspaceIdNumber(params) ?? null;
 
 	const [, setTargetCommentId] = useAtom(setTargetCommentIdAtom);
 
@@ -204,11 +204,11 @@ export function InboxSidebarContent({
 	// Server-side search query
 	const searchTypeFilter = activeTab === "comments" ? ("new_mention" as const) : undefined;
 	const { data: searchResponse, isLoading: isSearchLoading } = useQuery({
-		queryKey: cacheKeys.notifications.search(searchSpaceId, debouncedSearch.trim(), activeTab),
+		queryKey: cacheKeys.notifications.search(workspaceId, debouncedSearch.trim(), activeTab),
 		queryFn: () =>
 			notificationsApiService.getNotifications({
 				queryParams: {
-					workspace_id: searchSpaceId ?? undefined,
+					workspace_id: workspaceId ?? undefined,
 					type: searchTypeFilter,
 					search: debouncedSearch.trim(),
 					limit: 50,
@@ -242,8 +242,8 @@ export function InboxSidebarContent({
 
 	// Fetch source types for the status tab filter
 	const { data: sourceTypesData } = useQuery({
-		queryKey: cacheKeys.notifications.sourceTypes(searchSpaceId),
-		queryFn: () => notificationsApiService.getSourceTypes(searchSpaceId ?? undefined),
+		queryKey: cacheKeys.notifications.sourceTypes(workspaceId),
+		queryFn: () => notificationsApiService.getSourceTypes(workspaceId ?? undefined),
 		staleTime: 60 * 1000,
 		enabled: activeTab === "status",
 	});
@@ -364,17 +364,17 @@ export function InboxSidebarContent({
 
 			if (item.type === "new_mention") {
 				if (isNewMentionMetadata(item.metadata)) {
-					const searchSpaceId = item.workspace_id;
+					const workspaceId = item.workspace_id;
 					const threadId = item.metadata.thread_id;
 					const commentId = item.metadata.comment_id;
 
-					if (searchSpaceId && threadId) {
+					if (workspaceId && threadId) {
 						if (commentId) {
 							setTargetCommentId(commentId);
 						}
 						const url = commentId
-							? `/dashboard/${searchSpaceId}/new-chat/${threadId}?commentId=${commentId}`
-							: `/dashboard/${searchSpaceId}/new-chat/${threadId}`;
+							? `/dashboard/${workspaceId}/new-chat/${threadId}?commentId=${commentId}`
+							: `/dashboard/${workspaceId}/new-chat/${threadId}`;
 						onOpenChange(false);
 						onCloseMobileSidebar?.();
 						router.push(url);
@@ -382,17 +382,17 @@ export function InboxSidebarContent({
 				}
 			} else if (item.type === "comment_reply") {
 				if (isCommentReplyMetadata(item.metadata)) {
-					const searchSpaceId = item.workspace_id;
+					const workspaceId = item.workspace_id;
 					const threadId = item.metadata.thread_id;
 					const replyId = item.metadata.reply_id;
 
-					if (searchSpaceId && threadId) {
+					if (workspaceId && threadId) {
 						if (replyId) {
 							setTargetCommentId(replyId);
 						}
 						const url = replyId
-							? `/dashboard/${searchSpaceId}/new-chat/${threadId}?commentId=${replyId}`
-							: `/dashboard/${searchSpaceId}/new-chat/${threadId}`;
+							? `/dashboard/${workspaceId}/new-chat/${threadId}?commentId=${replyId}`
+							: `/dashboard/${workspaceId}/new-chat/${threadId}`;
 						onOpenChange(false);
 						onCloseMobileSidebar?.();
 						router.push(url);

surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx

@@ -11,7 +11,7 @@ import { cn } from "@/lib/utils";
 
 interface LocalFilesystemBrowserProps {
 	rootPaths: string[];
-	searchSpaceId: number;
+	workspaceId: number;
 	active?: boolean;
 	searchQuery?: string;
 	onOpenFile: (fullPath: string) => void;
@@ -134,7 +134,7 @@ function getNormalizedExtension(pathValue: string): string {
 
 export function LocalFilesystemBrowser({
 	rootPaths,
-	searchSpaceId,
+	workspaceId,
 	active = true,
 	searchQuery,
 	onOpenFile,
@@ -184,7 +184,7 @@ export function LocalFilesystemBrowser({
 		}
 		const rootsToReload = rootEntries.filter(({ rootKey }) => {
 			const nonce = reloadNonceByRoot[rootKey] ?? 0;
-			const signature = `${searchSpaceId}:${rootKey}:${nonce}`;
+			const signature = `${workspaceId}:${rootKey}:${nonce}`;
 			return lastLoadedSignatureByRootRef.current.get(rootKey) !== signature;
 		});
 		if (rootsToReload.length === 0) {
@@ -192,7 +192,7 @@ export function LocalFilesystemBrowser({
 		}
 		for (const { rootKey } of rootsToReload) {
 			const nonce = reloadNonceByRoot[rootKey] ?? 0;
-			lastLoadedSignatureByRootRef.current.set(rootKey, `${searchSpaceId}:${rootKey}:${nonce}`);
+			lastLoadedSignatureByRootRef.current.set(rootKey, `${workspaceId}:${rootKey}:${nonce}`);
 		}
 		let cancelled = false;
 
@@ -212,7 +212,7 @@ export function LocalFilesystemBrowser({
 				try {
 					const files = (await electronAPI.listAgentFilesystemFiles({
 						rootPath,
-						searchSpaceId,
+						workspaceId,
 						excludePatterns: DEFAULT_EXCLUDE_PATTERNS,
 					})) as LocalFolderFileEntry[];
 					if (cancelled) return;
@@ -241,7 +241,7 @@ export function LocalFilesystemBrowser({
 		return () => {
 			cancelled = true;
 		};
-	}, [active, electronAPI, isWindowsPlatform, reloadNonceByRoot, rootPaths, searchSpaceId]);
+	}, [active, electronAPI, isWindowsPlatform, reloadNonceByRoot, rootPaths, workspaceId]);
 
 	useEffect(() => {
 		if (active) return;
@@ -254,19 +254,19 @@ export function LocalFilesystemBrowser({
 		if (!electronAPI?.onAgentFilesystemTreeDirty) return;
 		if (!active) return;
 		if (rootPaths.length === 0) {
-			void electronAPI.stopAgentFilesystemTreeWatch(searchSpaceId);
+			void electronAPI.stopAgentFilesystemTreeWatch(workspaceId);
 			return;
 		}
 
 		const unsubscribe = electronAPI.onAgentFilesystemTreeDirty(
 			(event: {
-				searchSpaceId: number | null;
+				workspaceId: number | null;
 				reason: "watcher_event" | "safety_poll";
 				rootPath: string;
 				changedPath: string | null;
 				timestamp: number;
 			}) => {
-				if ((event.searchSpaceId ?? null) !== (searchSpaceId ?? null)) {
+				if ((event.workspaceId ?? null) !== (workspaceId ?? null)) {
 					return;
 				}
 				const eventRootKey = normalizeRootPathForLookup(event.rootPath, isWindowsPlatform);
@@ -290,16 +290,16 @@ export function LocalFilesystemBrowser({
 			}
 		);
 		void electronAPI.startAgentFilesystemTreeWatch({
-			searchSpaceId,
+			workspaceId,
 			rootPaths,
 			excludePatterns: DEFAULT_EXCLUDE_PATTERNS,
 		});
 
 		return () => {
 			unsubscribe();
-			void electronAPI.stopAgentFilesystemTreeWatch(searchSpaceId);
+			void electronAPI.stopAgentFilesystemTreeWatch(workspaceId);
 		};
-	}, [active, electronAPI, isWindowsPlatform, rootPaths, searchSpaceId]);
+	}, [active, electronAPI, isWindowsPlatform, rootPaths, workspaceId]);
 
 	useEffect(() => {
 		if (!electronAPI?.getAgentFilesystemMounts) {
@@ -322,7 +322,7 @@ export function LocalFilesystemBrowser({
 			setMountRefreshInFlight(true);
 		}
 		void electronAPI
-			.getAgentFilesystemMounts(searchSpaceId)
+			.getAgentFilesystemMounts(workspaceId)
 			.then((mounts: LocalRootMount[]) => {
 				if (cancelled) return;
 				const next = new Map<string, string>();
@@ -348,7 +348,7 @@ export function LocalFilesystemBrowser({
 		return () => {
 			cancelled = true;
 		};
-	}, [electronAPI, isWindowsPlatform, rootPaths, searchSpaceId]);
+	}, [electronAPI, isWindowsPlatform, rootPaths, workspaceId]);
 
 	const treeByRoot = useMemo(() => {
 		const query = searchQuery?.trim().toLowerCase() ?? "";

surfsense_web/components/layout/ui/sidebar/MobileSidebar.tsx

@@ -4,18 +4,18 @@ import { PanelLeft, Plus } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet";
-import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
-import { SearchSpaceAvatar } from "../icon-rail/WorkspaceAvatar";
+import type { ChatItem, NavItem, PageUsage, User, Workspace } from "../../types/layout.types";
+import { WorkspaceAvatar } from "../icon-rail/WorkspaceAvatar";
 import { Sidebar } from "./Sidebar";
 
 interface MobileSidebarProps {
 	isOpen: boolean;
 	onOpenChange: (open: boolean) => void;
-	searchSpaces: SearchSpace[];
-	activeSearchSpaceId: number | null;
-	onSearchSpaceSelect: (id: number) => void;
-	onAddSearchSpace: () => void;
-	searchSpace: SearchSpace | null;
+	workspaces: Workspace[];
+	activeWorkspaceId: number | null;
+	onWorkspaceSelect: (id: number) => void;
+	onAddWorkspace: () => void;
+	workspace: Workspace | null;
 	navItems: NavItem[];
 	onNavItemClick?: (item: NavItem) => void;
 	chats: ChatItem[];
@@ -62,12 +62,12 @@ export function MobileSidebarTrigger({ onClick }: { onClick: () => void }) {
 export function MobileSidebar({
 	isOpen,
 	onOpenChange,
-	searchSpaces,
-	activeSearchSpaceId,
-	onSearchSpaceSelect,
+	workspaces,
+	activeWorkspaceId,
+	onWorkspaceSelect,
 
-	onAddSearchSpace,
-	searchSpace,
+	onAddWorkspace,
+	workspace,
 	navItems,
 	onNavItemClick,
 	chats,
@@ -93,8 +93,8 @@ export function MobileSidebar({
 	setTheme,
 	isLoadingChats = false,
 }: MobileSidebarProps) {
-	const handleSearchSpaceSelect = (id: number) => {
-		onSearchSpaceSelect(id);
+	const handleWorkspaceSelect = (id: number) => {
+		onWorkspaceSelect(id);
 	};
 
 	const handleNavItemClick = (item: NavItem) => {
@@ -118,18 +118,18 @@ export function MobileSidebar({
 			>
 				<SheetTitle className="sr-only">Navigation</SheetTitle>
 
-				{/* Vertical Search Spaces Rail - left side */}
+				{/* Vertical Workspaces Rail - left side */}
 				<div className="flex h-full w-14 shrink-0 flex-col items-center border-r bg-rail">
 					<ScrollArea className="w-full flex-1">
 						<div className="flex flex-col items-center gap-2 px-1.5 py-3">
-							{searchSpaces.map((space) => (
-								<SearchSpaceAvatar
+							{workspaces.map((space) => (
+								<WorkspaceAvatar
 									key={space.id}
 									name={space.name}
-									isActive={space.id === activeSearchSpaceId}
+									isActive={space.id === activeWorkspaceId}
 									isShared={space.memberCount > 1}
 									isOwner={space.isOwner}
-									onClick={() => handleSearchSpaceSelect(space.id)}
+									onClick={() => handleWorkspaceSelect(space.id)}
 									size="md"
 									disableTooltip
 								/>
@@ -137,7 +137,7 @@ export function MobileSidebar({
 							<Button
 								variant="ghost"
 								size="icon"
-								onClick={onAddSearchSpace}
+								onClick={onAddWorkspace}
 								className="h-10 w-10 shrink-0 rounded-lg border-2 border-dashed border-muted-foreground/30 hover:border-muted-foreground/50"
 							>
 								<Plus className="h-5 w-5 text-muted-foreground" />
@@ -150,7 +150,7 @@ export function MobileSidebar({
 				{/* Sidebar Content - right side */}
 				<div className="flex-1 overflow-hidden flex flex-col [&>*]:!w-full">
 					<Sidebar
-						searchSpace={searchSpace}
+						workspace={workspace}
 						isCollapsed={false}
 						onToggleCollapse={() => onOpenChange(false)}
 						navItems={navItems}

surfsense_web/components/layout/ui/sidebar/Sidebar.tsx

@@ -13,7 +13,7 @@ import { useIsAnonymous } from "@/contexts/anonymous-mode";
 import { getWorkspaceIdParam } from "@/lib/route-params";
 import { cn } from "@/lib/utils";
 import { SIDEBAR_MIN_WIDTH } from "../../hooks/useSidebarResize";
-import type { ChatItem, NavItem, PageUsage, SearchSpace, User } from "../../types/layout.types";
+import type { ChatItem, NavItem, PageUsage, User, Workspace } from "../../types/layout.types";
 import { ChatListItem } from "./ChatListItem";
 import { CreditBalanceDisplay } from "./CreditBalanceDisplay";
 import { DocumentsSidebar } from "./DocumentsSidebar";
@@ -62,7 +62,7 @@ function CollapsedInboxIcon({ item }: { item: NavItem }) {
 }
 
 interface SidebarProps {
-	searchSpace: SearchSpace | null;
+	workspace: Workspace | null;
 	isCollapsed?: boolean;
 	onToggleCollapse?: () => void;
 	navItems: NavItem[];
@@ -103,7 +103,7 @@ interface SidebarProps {
 }
 
 export function Sidebar({
-	searchSpace,
+	workspace,
 	isCollapsed = false,
 	onToggleCollapse,
 	navItems,
@@ -192,7 +192,7 @@ export function Sidebar({
 					aria-hidden={isCollapsed}
 				>
 					<SidebarHeader
-						searchSpace={searchSpace}
+						workspace={workspace}
 						isCollapsed={false}
 						onSettings={onSettings}
 						onManageMembers={onManageMembers}
@@ -400,7 +400,7 @@ function SidebarUsageFooter({
 	onNavigate?: () => void;
 }) {
 	const params = useParams();
-	const searchSpaceId = getWorkspaceIdParam(params) ?? "";
+	const workspaceId = getWorkspaceIdParam(params) ?? "";
 	const isAnonymous = useIsAnonymous();
 
 	if (isCollapsed) return null;
@@ -446,7 +446,7 @@ function SidebarUsageFooter({
 			<CreditBalanceDisplay />
 			<div className="space-y-0.5">
 				<Link
-					href={`/dashboard/${searchSpaceId}/earn-credits`}
+					href={`/dashboard/${workspaceId}/earn-credits`}
 					onClick={onNavigate}
 					className="group flex w-full items-center justify-between rounded-md px-1.5 py-1 transition-colors hover:bg-accent"
 				>
@@ -459,7 +459,7 @@ function SidebarUsageFooter({
 					</Badge>
 				</Link>
 				<Link
-					href={`/dashboard/${searchSpaceId}/buy-more`}
+					href={`/dashboard/${workspaceId}/buy-more`}
 					onClick={onNavigate}
 					className="group flex w-full items-center justify-between rounded-md px-1.5 py-1 transition-colors hover:bg-accent"
 				>

surfsense_web/components/layout/ui/sidebar/SidebarHeader.tsx

@@ -10,10 +10,10 @@ import {
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { cn } from "@/lib/utils";
-import type { SearchSpace } from "../../types/layout.types";
+import type { Workspace } from "../../types/layout.types";
 
 interface SidebarHeaderProps {
-	searchSpace: SearchSpace | null;
+	workspace: Workspace | null;
 	isCollapsed?: boolean;
 	onSettings?: () => void;
 	onManageMembers?: () => void;
@@ -21,7 +21,7 @@ interface SidebarHeaderProps {
 }
 
 export function SidebarHeader({
-	searchSpace,
+	workspace,
 	isCollapsed,
 	onSettings,
 	onManageMembers,
@@ -40,9 +40,7 @@ export function SidebarHeader({
 							isCollapsed && "w-10"
 						)}
 					>
-						<span className="truncate text-sm">
-							{searchSpace?.name ?? t("select_search_space")}
-						</span>
+						<span className="truncate text-sm">{workspace?.name ?? t("select_workspace")}</span>
 						<ChevronsUpDown className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
 					</Button>
 				</DropdownMenuTrigger>
@@ -53,7 +51,7 @@ export function SidebarHeader({
 					</DropdownMenuItem>
 					<DropdownMenuItem onClick={onSettings}>
 						<Settings className="h-4 w-4" />
-						{t("search_space_settings")}
+						{t("workspace_settings")}
 					</DropdownMenuItem>
 				</DropdownMenuContent>
 			</DropdownMenu>

surfsense_web/components/layout/ui/tabs/DocumentTabContent.tsx

@@ -48,7 +48,7 @@ function DocumentSkeleton() {
 
 interface DocumentTabContentProps {
 	documentId: number;
-	searchSpaceId: number;
+	workspaceId: number;
 	title?: string;
 }
 
@@ -69,7 +69,7 @@ function formatBytes(bytes: number): string {
 	return `${bytes}B`;
 }
 
-export function DocumentTabContent({ documentId, searchSpaceId, title }: DocumentTabContentProps) {
+export function DocumentTabContent({ documentId, workspaceId, title }: DocumentTabContentProps) {
 	const [doc, setDoc] = useState<DocumentContent | null>(null);
 	const [isLoading, setIsLoading] = useState(true);
 	const [error, setError] = useState<string | null>(null);
@@ -104,7 +104,7 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 			try {
 				const response = await authenticatedFetch(
 					buildBackendUrl(
-						`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/editor-content`
+						`/api/v1/workspaces/${workspaceId}/documents/${documentId}/editor-content`
 					),
 					{ method: "GET" }
 				);
@@ -140,7 +140,7 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 
 		doFetch().catch(() => {});
 		return () => controller.abort();
-	}, [documentId, searchSpaceId]);
+	}, [documentId, workspaceId]);
 
 	const handleMarkdownChange = useCallback((md: string) => {
 		markdownRef.current = md;
@@ -154,7 +154,7 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 		setSaving(true);
 		try {
 			const response = await authenticatedFetch(
-				buildBackendUrl(`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/save`),
+				buildBackendUrl(`/api/v1/workspaces/${workspaceId}/documents/${documentId}/save`),
 				{
 					method: "POST",
 					headers: { "Content-Type": "application/json" },
@@ -183,7 +183,7 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 		} finally {
 			setSaving(false);
 		}
-	}, [documentId, plateMaxBytes, searchSpaceId]);
+	}, [documentId, plateMaxBytes, workspaceId]);
 
 	if (isLoading) return <DocumentSkeleton />;
 
@@ -313,7 +313,7 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 										try {
 											const response = await authenticatedFetch(
 												buildBackendUrl(
-													`/api/v1/workspaces/${searchSpaceId}/documents/${documentId}/download-markdown`
+													`/api/v1/workspaces/${workspaceId}/documents/${documentId}/download-markdown`
 												),
 												{ method: "GET" }
 											);

surfsense_web/components/new-chat/chat-header.tsx

@@ -4,20 +4,20 @@ import { ImageModelSelector } from "./image-model-selector";
 import { ModelSelector } from "./model-selector";
 
 interface ChatHeaderProps {
-	searchSpaceId: number;
+	workspaceId: number;
 	className?: string;
 	onChatModelSelected?: () => void;
 }
 
-export function ChatHeader({ searchSpaceId, className, onChatModelSelected }: ChatHeaderProps) {
+export function ChatHeader({ workspaceId, className, onChatModelSelected }: ChatHeaderProps) {
 	return (
 		<div className="flex min-w-0 shrink-0 items-center gap-2">
 			<ModelSelector
-				searchSpaceId={searchSpaceId}
+				workspaceId={workspaceId}
 				className={className}
 				onChatModelSelected={onChatModelSelected}
 			/>
-			<ImageModelSelector searchSpaceId={searchSpaceId} className={className} mobileIconOnly />
+			<ImageModelSelector workspaceId={workspaceId} className={className} mobileIconOnly />
 		</div>
 	);
 }

surfsense_web/components/new-chat/chat-share-button.tsx

@@ -38,8 +38,8 @@ const visibilityOptions: {
 	},
 	{
 		value: "SEARCH_SPACE",
-		label: "Search Space",
-		description: "All members of this search space can access",
+		label: "Workspace",
+		description: "All members of this workspace can access",
 		icon: Users,
 	},
 ];
@@ -96,7 +96,7 @@ export function ChatShareButton({ thread, onVisibilityChange, className }: ChatS
 
 				onVisibilityChange?.(updatedThread.visibility);
 				toast.success(
-					newVisibility === "SEARCH_SPACE" ? "Chat shared with search space" : "Chat is now private"
+					newVisibility === "SEARCH_SPACE" ? "Chat shared with workspace" : "Chat is now private"
 				);
 				setOpen(false);
 			} catch (error) {

surfsense_web/components/new-chat/document-mention-picker.tsx

@@ -56,7 +56,7 @@ import { queries } from "@/zero/queries";
 export type DocumentMentionPickerRef = ComposerSuggestionNavigatorRef;
 
 interface DocumentMentionPickerProps {
-	searchSpaceId: number;
+	workspaceId: number;
 	onSelectionChange: (mentions: MentionedDocumentInfo[]) => void;
 	onDone: () => void;
 	initialSelectedDocuments?: MentionedDocumentInfo[];
@@ -105,14 +105,14 @@ function isMentionedContextItem(value: unknown): value is MentionedDocumentInfo
 	return false;
 }
 
-function getRecentsStorageKey(searchSpaceId: number) {
-	return `${RECENTS_STORAGE_PREFIX}${searchSpaceId}`;
+function getRecentsStorageKey(workspaceId: number) {
+	return `${RECENTS_STORAGE_PREFIX}${workspaceId}`;
 }
 
-function readRecentMentions(searchSpaceId: number): MentionedDocumentInfo[] {
+function readRecentMentions(workspaceId: number): MentionedDocumentInfo[] {
 	if (typeof window === "undefined") return [];
 	try {
-		const raw = window.localStorage.getItem(getRecentsStorageKey(searchSpaceId));
+		const raw = window.localStorage.getItem(getRecentsStorageKey(workspaceId));
 		if (!raw) return [];
 		const parsed: unknown = JSON.parse(raw);
 		if (!Array.isArray(parsed)) return [];
@@ -122,11 +122,11 @@ function readRecentMentions(searchSpaceId: number): MentionedDocumentInfo[] {
 	}
 }
 
-function writeRecentMentions(searchSpaceId: number, mentions: MentionedDocumentInfo[]) {
+function writeRecentMentions(workspaceId: number, mentions: MentionedDocumentInfo[]) {
 	if (typeof window === "undefined") return;
 	try {
 		window.localStorage.setItem(
-			getRecentsStorageKey(searchSpaceId),
+			getRecentsStorageKey(workspaceId),
 			JSON.stringify(mentions.slice(0, RECENTS_LIMIT))
 		);
 	} catch {
@@ -134,13 +134,13 @@ function writeRecentMentions(searchSpaceId: number, mentions: MentionedDocumentI
 	}
 }
 
-export function promoteRecentMention(searchSpaceId: number, mention: MentionedDocumentInfo) {
+export function promoteRecentMention(workspaceId: number, mention: MentionedDocumentInfo) {
 	const mentionKey = getMentionDocKey(mention);
 	const next = [
 		mention,
-		...readRecentMentions(searchSpaceId).filter((item) => getMentionDocKey(item) !== mentionKey),
+		...readRecentMentions(workspaceId).filter((item) => getMentionDocKey(item) !== mentionKey),
 	].slice(0, RECENTS_LIMIT);
-	writeRecentMentions(searchSpaceId, next);
+	writeRecentMentions(workspaceId, next);
 	return next;
 }
 
@@ -261,7 +261,7 @@ export const DocumentMentionPicker = forwardRef<
 	DocumentMentionPickerProps
 >(function DocumentMentionPicker(
 	{
-		searchSpaceId,
+		workspaceId,
 		onSelectionChange,
 		onDone,
 		initialSelectedDocuments = [],
@@ -286,15 +286,15 @@ export const DocumentMentionPicker = forwardRef<
 	const [hasMore, setHasMore] = useState(false);
 	const [isLoadingMore, setIsLoadingMore] = useState(false);
 	const [recentMentions, setRecentMentions] = useState<MentionedDocumentInfo[]>(() =>
-		readRecentMentions(searchSpaceId)
+		readRecentMentions(workspaceId)
 	);
 
-	const [zeroFolders] = useZeroQuery(queries.folders.bySpace({ searchSpaceId }));
+	const [zeroFolders] = useZeroQuery(queries.folders.bySpace({ workspaceId }));
 	const { data: connectors = [], isLoading: isConnectorsLoading } = useAtomValue(connectorsAtom);
 	const activeConnectors = useMemo(() => connectors.filter(isConnectorActive), [connectors]);
 	const paginationScopeKey = useMemo(
-		() => `${searchSpaceId}:${debouncedSearch}`,
-		[searchSpaceId, debouncedSearch]
+		() => `${workspaceId}:${debouncedSearch}`,
+		[workspaceId, debouncedSearch]
 	);
 	const previousPaginationScopeKeyRef = useRef<string | null>(null);
 
@@ -311,17 +311,17 @@ export const DocumentMentionPicker = forwardRef<
 	}, [hasSearch]);
 
 	useEffect(() => {
-		setRecentMentions(readRecentMentions(searchSpaceId));
-	}, [searchSpaceId]);
+		setRecentMentions(readRecentMentions(workspaceId));
+	}, [workspaceId]);
 
 	const titleSearchParams = useMemo(
 		() => ({
-			workspace_id: searchSpaceId,
+			workspace_id: workspaceId,
 			page: 0,
 			page_size: PAGE_SIZE,
 			...(isSearchValid ? { title: debouncedSearch.trim() } : {}),
 		}),
-		[searchSpaceId, debouncedSearch, isSearchValid]
+		[workspaceId, debouncedSearch, isSearchValid]
 	);
 
 	const { data: titleSearchResults, isLoading: isTitleSearchLoading } = useQuery({
@@ -329,7 +329,7 @@ export const DocumentMentionPicker = forwardRef<
 		queryFn: ({ signal }) =>
 			documentsApiService.searchDocumentTitles({ queryParams: titleSearchParams }, signal),
 		staleTime: 60 * 1000,
-		enabled: !!searchSpaceId && currentPage === 0 && (!hasSearch || isSearchValid),
+		enabled: !!workspaceId && currentPage === 0 && (!hasSearch || isSearchValid),
 		placeholderData: keepPreviousData,
 	});
 
@@ -362,7 +362,7 @@ export const DocumentMentionPicker = forwardRef<
 
 		try {
 			const queryParams = {
-				workspace_id: searchSpaceId,
+				workspace_id: workspaceId,
 				page: nextPage,
 				page_size: PAGE_SIZE,
 				...(isSearchValid ? { title: debouncedSearch.trim() } : {}),
@@ -381,7 +381,7 @@ export const DocumentMentionPicker = forwardRef<
 		} finally {
 			setIsLoadingMore(false);
 		}
-	}, [currentPage, hasMore, isLoadingMore, debouncedSearch, searchSpaceId, isSearchValid]);
+	}, [currentPage, hasMore, isLoadingMore, debouncedSearch, workspaceId, isSearchValid]);
 
 	const actualDocuments = useMemo(() => {
 		if (!isSingleCharSearch) return accumulatedDocuments;
@@ -406,10 +406,10 @@ export const DocumentMentionPicker = forwardRef<
 	// or types a search. An empty title returns recent threads (the
 	// backend ``ilike '%%'`` matches all, newest first).
 	const { data: threadResults = [], isLoading: isThreadsLoading } = useQuery({
-		queryKey: ["composer-mention-threads", searchSpaceId, debouncedSearch],
-		queryFn: () => searchThreads(searchSpaceId, debouncedSearch.trim()),
+		queryKey: ["composer-mention-threads", workspaceId, debouncedSearch],
+		queryFn: () => searchThreads(workspaceId, debouncedSearch.trim()),
 		staleTime: 60 * 1000,
-		enabled: enableChatMentions && !!searchSpaceId && (view.kind === "chats" || hasSearch),
+		enabled: enableChatMentions && !!workspaceId && (view.kind === "chats" || hasSearch),
 		placeholderData: keepPreviousData,
 	});
 	const threadMentions = useMemo(
@@ -425,7 +425,7 @@ export const DocumentMentionPicker = forwardRef<
 		[recentDocMentions]
 	);
 	const { data: hydratedRecentDocs = [], isFetched: hasHydratedRecentDocs } = useQuery({
-		queryKey: ["composer-mention-recent-docs", searchSpaceId, recentDocIdsKey],
+		queryKey: ["composer-mention-recent-docs", workspaceId, recentDocIdsKey],
 		queryFn: async () => {
 			const results = await Promise.allSettled(
 				recentDocMentions.map((mention) => documentsApiService.getDocument({ id: mention.id }))

surfsense_web/components/new-chat/image-model-selector.tsx

@@ -31,7 +31,7 @@ import { cn } from "@/lib/utils";
 import { providerDisplay } from "../settings/model-connections/provider-metadata";
 
 interface ImageModelSelectorProps {
-	searchSpaceId: number;
+	workspaceId: number;
 	className?: string;
 	mobileIconOnly?: boolean;
 }
@@ -97,7 +97,7 @@ function groupedModels(models: ImageModel[]) {
 }
 
 export function ImageModelSelector({
-	searchSpaceId,
+	workspaceId,
 	className,
 	mobileIconOnly = false,
 }: ImageModelSelectorProps) {
@@ -146,7 +146,7 @@ export function ImageModelSelector({
 
 	function manageModelConnections() {
 		setOpen(false);
-		router.push(`/dashboard/${searchSpaceId}/workspace-settings/models`);
+		router.push(`/dashboard/${workspaceId}/workspace-settings/models`);
 	}
 
 	const handleScroll = useCallback((event: UIEvent<HTMLDivElement>) => {

surfsense_web/components/new-chat/model-selector.tsx

@@ -31,7 +31,7 @@ import { cn } from "@/lib/utils";
 import { providerDisplay } from "../settings/model-connections/provider-metadata";
 
 interface ModelSelectorProps {
-	searchSpaceId: number;
+	workspaceId: number;
 	className?: string;
 	onChatModelSelected?: () => void;
 }
@@ -96,11 +96,7 @@ function groupedModels(models: ChatModel[]) {
 	}, {});
 }
 
-export function ModelSelector({
-	searchSpaceId,
-	className,
-	onChatModelSelected,
-}: ModelSelectorProps) {
+export function ModelSelector({ workspaceId, className, onChatModelSelected }: ModelSelectorProps) {
 	const router = useRouter();
 	const isMobile = useIsMobile();
 	const [open, setOpen] = useState(false);
@@ -149,7 +145,7 @@ export function ModelSelector({
 
 	function manageModelConnections() {
 		setOpen(false);
-		router.push(`/dashboard/${searchSpaceId}/workspace-settings/models`);
+		router.push(`/dashboard/${workspaceId}/workspace-settings/models`);
 	}
 
 	const handleScroll = useCallback((event: UIEvent<HTMLDivElement>) => {

surfsense_web/components/new-chat/prompt-picker.tsx

@@ -70,14 +70,14 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 
 	const createPromptIndex = filtered.length;
 	const totalItems = filtered.length + 1;
-	const searchSpaceId = getWorkspaceIdParam(params);
+	const workspaceId = getWorkspaceIdParam(params);
 
 	const handleSelect = useCallback(
 		(index: number) => {
 			if (index === createPromptIndex) {
 				onDone();
-				if (searchSpaceId) {
-					router.push(`/dashboard/${searchSpaceId}/user-settings/prompts`);
+				if (workspaceId) {
+					router.push(`/dashboard/${workspaceId}/user-settings/prompts`);
 				}
 				return;
 			}
@@ -85,7 +85,7 @@ export const PromptPicker = forwardRef<PromptPickerRef, PromptPickerProps>(funct
 			if (!action) return;
 			onSelect({ name: action.name, prompt: action.prompt, mode: action.mode });
 		},
-		[filtered, onSelect, createPromptIndex, onDone, router, searchSpaceId]
+		[filtered, onSelect, createPromptIndex, onDone, router, workspaceId]
 	);
 
 	useEffect(() => {

surfsense_web/components/onboarding-tour.tsx

@@ -31,7 +31,7 @@ const TOUR_STEPS: TourStep[] = [
 	{
 		target: '[data-joyride="upload-button"]',
 		title: "Upload documents",
-		content: "Upload files to your search space.",
+		content: "Upload files to your workspace.",
 		placement: "left",
 	},
 	{
@@ -391,17 +391,17 @@ export function OnboardingTour() {
 
 	// Get user data
 	const { data: user } = useAtomValue(currentUserAtom);
-	const searchSpaceId = useAtomValue(activeWorkspaceIdAtom);
+	const workspaceId = useAtomValue(activeWorkspaceIdAtom);
 
 	// Fetch threads data
 	const { data: threadsData } = useQuery({
-		queryKey: ["threads", searchSpaceId, { limit: 40 }], // Same key as layout
-		queryFn: () => fetchThreads(Number(searchSpaceId), 40),
-		enabled: !!searchSpaceId,
+		queryKey: ["threads", workspaceId, { limit: 40 }], // Same key as layout
+		queryFn: () => fetchThreads(Number(workspaceId), 40),
+		enabled: !!workspaceId,
 	});
 
 	// Real-time document type counts via Zero
-	const documentTypeCounts = useZeroDocumentTypeCounts(searchSpaceId);
+	const documentTypeCounts = useZeroDocumentTypeCounts(workspaceId);
 
 	// Get connectors
 	const { data: connectors = [] } = useAtomValue(connectorsAtom);
@@ -448,7 +448,7 @@ export function OnboardingTour() {
 	// Check if tour should run: localStorage + data validation with user ID tracking
 	useEffect(() => {
 		// Don't check if not mounted or no user
-		if (!mounted || !user?.id || !searchSpaceId) return;
+		if (!mounted || !user?.id || !workspaceId) return;
 
 		// Check if on new-chat page
 		const isNewChatPage = pathname?.includes("/new-chat");
@@ -459,7 +459,7 @@ export function OnboardingTour() {
 		// - threadsData is defined (query completed, even if empty)
 		// - documentTypeCounts is defined (query completed, even if empty object)
 		// - connectors is an array (always defined with default [])
-		// If searchSpaceId is not set, connectors query won't run, but that's okay
+		// If workspaceId is not set, connectors query won't run, but that's okay
 		const dataLoaded = threadsData !== undefined && documentTypeCounts !== undefined;
 		if (!dataLoaded) return;
 
@@ -542,7 +542,7 @@ export function OnboardingTour() {
 			cancelled = true;
 			if (startCheckTimerRef.current) clearTimeout(startCheckTimerRef.current);
 		};
-	}, [mounted, user?.id, searchSpaceId, pathname, threadsData, documentTypeCounts, connectors]);
+	}, [mounted, user?.id, workspaceId, pathname, threadsData, documentTypeCounts, connectors]);
 
 	// Update position on resize/scroll
 	useEffect(() => {

surfsense_web/components/public-chat-snapshots/public-chat-snapshots-manager.tsx

@@ -125,7 +125,7 @@ export function PublicChatSnapshotsManager({
 			<Alert>
 				<Info />
 				<AlertDescription>
-					You don't have permission to view public chats in this search space.
+					You don't have permission to view public chats in this workspace.
 				</AlertDescription>
 			</Alert>
 		);