@btst/stack 3.0.0-rc.2 → 3.0.0-rc.4

package/src/plugins/ai-chat/client/components/chat-layout.tsx

@@ -23,6 +23,7 @@ import type { UIMessage } from "ai";
 import { usePageAIContext } from "../context/page-ai-context";
 import { usePluginOverrides, useStack } from "@btst/stack/context";
 import type { AiChatPluginOverrides } from "../overrides";
+import { resolveAiChatMode } from "../overrides";
 import { useAiChatTranslation } from "../localization";
 
 interface ChatLayoutBaseProps {
@@ -80,7 +81,7 @@ export function ChatLayout(props: ChatLayoutProps) {
 		conversationId,
 		layout = "full",
 		className,
-		showSidebar = true,
+		showSidebar: requestedShowSidebar = true,
 		initialMessages,
 		onMessagesChange,
 		onClear,
@@ -88,8 +89,10 @@ export function ChatLayout(props: ChatLayoutProps) {
 	const { localization } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {});
-	const { api } = useStack();
+	>("aiChat", {});
+	const { plugins } = useStack();
+	const resolvedMode = resolveAiChatMode(plugins?.aiChat?.config);
+	const showSidebar = requestedShowSidebar && resolvedMode !== "public";
 	const tr = useAiChatTranslation(localization);
 
 	// Widget-specific props — TypeScript narrows props to ChatLayoutWidgetProps here
@@ -119,8 +122,6 @@ export function ChatLayout(props: ChatLayoutProps) {
 	// Read page AI context to show badge in header
 	const pageAIContext = usePageAIContext();
 
-	const apiPath = `${api?.baseURL ?? ""}${api?.basePath ?? ""}/chat`;
-
 	// Handler for "New chat" button - increments key to force remount
 	const handleNewChat = useCallback(() => {
 		// Only needed when we're already on the "new chat" route (/chat).
@@ -196,7 +197,6 @@ export function ChatLayout(props: ChatLayoutProps) {
 					{widgetEverOpened && (
 						<ChatInterface
 							key={`widget-${conversationId ?? "new"}-${widgetResetKey}`}
-							apiPath={apiPath}
 							id={conversationId}
 							variant="widget"
 							initialMessages={initialMessages}
@@ -361,7 +361,6 @@ export function ChatLayout(props: ChatLayoutProps) {
 
 				<ChatInterface
 					key={`chat-${conversationId ?? "new"}-${chatResetKey}`}
-					apiPath={apiPath}
 					id={conversationId}
 					variant="full"
 					initialMessages={initialMessages}

package/src/plugins/ai-chat/client/components/chat-message.tsx

@@ -135,7 +135,7 @@ export function ChatMessage({
 
 	const { localization: customLocalization, toolRenderers } =
 		usePluginOverrides<AiChatPluginOverrides, Partial<AiChatPluginOverrides>>(
-			"ai-chat",
+			"aiChat",
 			{},
 		);
 	const { router } = useStack();

package/src/plugins/ai-chat/client/components/chat-sidebar.tsx

@@ -37,14 +37,16 @@ import {
 } from "lucide-react";
 import { cn } from "@workspace/ui/lib/utils";
 import {
-	CanAccess,
-	useBasePath,
-	useCan,
+	PermissionAccess,
 	useNotify,
 	usePluginOverrides,
 	useStack,
 } from "@btst/stack/context";
-import type { AiChatPluginOverrides } from "../overrides";
+import { aiChatPermissions } from "../../permissions";
+import {
+	resolveAiChatSiteLocation,
+	type AiChatPluginOverrides,
+} from "../overrides";
 import type { SerializedConversation } from "../../types";
 import {
 	useConversations,
@@ -52,6 +54,7 @@ import {
 	useDeleteConversation,
 } from "../hooks/chat-hooks";
 import { useAiChatTranslation } from "../localization";
+import { navigateAiChatCrossOrigin } from "../navigation";
 
 interface ChatSidebarProps {
 	currentConversationId?: string;
@@ -67,19 +70,14 @@ export function ChatSidebar({
 	const { localization: customLocalization } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {});
-	const { router } = useStack();
+	>("aiChat", {});
+	const { basePath: stackBasePath, plugins, router } = useStack();
 	const navigate = router?.navigate;
-	const basePath = useBasePath();
+	const siteBaseURL = plugins?.aiChat?.site.baseURL;
+	const siteBasePath = plugins?.aiChat?.site.basePath ?? stackBasePath;
 	const notify = useNotify();
 	const tr = useAiChatTranslation(customLocalization);
-	const { can: canRead, isPending: isReadPermissionPending } = useCan({
-		resource: "ai-chat:conversation",
-		action: "read",
-	});
-	const { conversations, isLoading } = useConversations({
-		enabled: !isReadPermissionPending && canRead,
-	});
+	const { conversations, isLoading } = useConversations();
 	const deleteMutation = useDeleteConversation();
 
 	const [renameDialogOpen, setRenameDialogOpen] = useState(false);
@@ -95,22 +93,31 @@ export function ChatSidebar({
 			setNewTitle("");
 		},
 	});
+	const navigateToChat = (...segments: string[]) => {
+		const location = resolveAiChatSiteLocation(
+			{ baseURL: siteBaseURL, basePath: siteBasePath },
+			typeof window === "undefined" ? undefined : window.location.origin,
+			"chat",
+			...segments,
+		);
+		if (location.crossOrigin && typeof window !== "undefined") {
+			navigateAiChatCrossOrigin(location.href);
+			return;
+		}
+		return navigate?.(location.path);
+	};
 
 	const handleNewChat = () => {
 		// Use the StackProvider router when available.
 		// Also run onNewChat to support "reset chat" behavior when already on /chat.
-		if (navigate) {
-			navigate(`${basePath}/chat`);
-		}
+		void navigateToChat();
 		if (onNewChat) {
 			onNewChat();
 		}
 	};
 
 	const handleConversationClick = (conversation: SerializedConversation) => {
-		if (navigate) {
-			navigate(`${basePath}/chat/${conversation.id}`);
-		}
+		void navigateToChat(conversation.id);
 	};
 
 	const handleRenameClick = (conversation: SerializedConversation) => {
@@ -134,7 +141,16 @@ export function ChatSidebar({
 	const handleDeleteConfirm = async () => {
 		if (selectedConversation) {
 			try {
-				await deleteMutation.mutateAsync({ id: selectedConversation.id });
+				const deletingCurrentConversation =
+					selectedConversation.id === currentConversationId;
+				if (deletingCurrentConversation) {
+					await deleteMutation.mutateAsync(
+						{ id: selectedConversation.id },
+						{ onSuccess: () => navigateToChat() },
+					);
+				} else {
+					await deleteMutation.mutateAsync({ id: selectedConversation.id });
+				}
 				notify.success(
 					tr(
 						"CONVERSATION_DELETE_SUCCESS",
@@ -144,10 +160,6 @@ export function ChatSidebar({
 				);
 				setDeleteDialogOpen(false);
 				setSelectedConversation(null);
-				// Navigate away if deleted current conversation
-				if (selectedConversation.id === currentConversationId && navigate) {
-					await navigate(`${basePath}/chat`);
-				}
 			} catch {
 				notify.error(
 					tr(
@@ -200,7 +212,7 @@ export function ChatSidebar({
 		>
 			{/* Header */}
 			<div className="p-4 border-b">
-				<CanAccess resource="ai-chat:conversation" action="create">
+				<PermissionAccess permission={aiChatPermissions.conversation.create()}>
 					<Button
 						onClick={handleNewChat}
 						className="w-full justify-start gap-2"
@@ -209,7 +221,7 @@ export function ChatSidebar({
 						<MessageSquarePlus className="h-4 w-4" />
 						{tr("SIDEBAR_NEW_CHAT", "aiChat.sidebar.newChat", "New chat")}
 					</Button>
-				</CanAccess>
+				</PermissionAccess>
 			</div>
 
 			{/* Conversations List */}
@@ -268,10 +280,14 @@ export function ChatSidebar({
 											</Button>
 										</DropdownMenuTrigger>
 										<DropdownMenuContent align="end">
-											<CanAccess
-												resource="ai-chat:conversation"
-												action="update"
-												params={{ id: conversation.id }}
+											<PermissionAccess
+												permission={aiChatPermissions.conversation.update({
+													conversationId: conversation.id,
+													exists: true,
+													...(conversation.userId
+														? { ownerId: conversation.userId }
+														: {}),
+												})}
 											>
 												<DropdownMenuItem
 													onClick={(e) => {
@@ -286,11 +302,15 @@ export function ChatSidebar({
 														"Rename",
 													)}
 												</DropdownMenuItem>
-											</CanAccess>
-											<CanAccess
-												resource="ai-chat:conversation"
-												action="delete"
-												params={{ id: conversation.id }}
+											</PermissionAccess>
+											<PermissionAccess
+												permission={aiChatPermissions.conversation.delete({
+													conversationId: conversation.id,
+													exists: true,
+													...(conversation.userId
+														? { ownerId: conversation.userId }
+														: {}),
+												})}
 											>
 												<DropdownMenuItem
 													onClick={(e) => {
@@ -306,7 +326,7 @@ export function ChatSidebar({
 														"Delete",
 													)}
 												</DropdownMenuItem>
-											</CanAccess>
+											</PermissionAccess>
 										</DropdownMenuContent>
 									</DropdownMenu>
 								</div>

package/src/plugins/ai-chat/client/components/pages/404-page.tsx

@@ -9,7 +9,7 @@ export function NotFoundPage({ message }: { message?: string }) {
 	const { localization } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {
+	>("aiChat", {
 		localization: {},
 	});
 	const tr = useAiChatTranslation(localization);

package/src/plugins/ai-chat/client/components/pages/chat-page.internal.tsx

@@ -2,8 +2,9 @@
 
 import { useMemo } from "react";
 import { ChatLayout } from "../chat-layout";
-import { usePluginOverrides } from "@btst/stack/context";
+import { usePluginOverrides, useStack } from "@btst/stack/context";
 import type { AiChatPluginOverrides } from "../../overrides";
+import { resolveAiChatMode } from "../../overrides";
 import { useRouteLifecycle } from "@workspace/ui/hooks/use-route-lifecycle";
 
 export interface ChatPageProps {
@@ -17,8 +18,9 @@ export function ChatPage({ conversationId }: ChatPageProps) {
 	const overrides = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {});
-	const { mode } = overrides;
+	>("aiChat", {});
+	const { plugins } = useStack();
+	const mode = resolveAiChatMode(plugins?.aiChat?.config);
 	const routeName = conversationId ? "chatConversation" : "chat";
 	const context = useMemo(
 		() => ({

package/src/plugins/ai-chat/client/components/pages/chat-page.tsx

@@ -1,12 +1,18 @@
 "use client";
 
 import { lazy } from "react";
-import { usePluginOverrides } from "@btst/stack/context";
+import { usePluginOverrides, useStack } from "@btst/stack/context";
 import type { AiChatPluginOverrides } from "../../overrides";
-import { ComposedRoute } from "@btst/stack/client/components";
+import { resolveAiChatMode } from "../../overrides";
+import {
+	ComposedRoute,
+	PermissionRouteAccess,
+} from "@btst/stack/client/components";
 import { DefaultError } from "../shared/default-error";
 import { ChatLoading } from "../loading";
 import { NotFoundPage } from "./404-page";
+import { aiChatPermissions } from "../../../permissions";
+import { useConversation } from "../../hooks/chat-hooks";
 
 // Lazy load the internal component with actual page content
 const ChatPage = lazy(() =>
@@ -19,24 +25,14 @@ export interface ChatPageComponentProps {
 
 // Exported wrapped component with error and loading boundaries
 export function ChatPageComponent({ conversationId }: ChatPageComponentProps) {
-	const { mode, onRouteError } = usePluginOverrides<
+	const { onRouteError } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {});
-
+	>("aiChat", {});
 	return (
 		<ComposedRoute
 			path={conversationId ? `/chat/${conversationId}` : "/chat"}
-			permission={
-				mode === "public"
-					? undefined
-					: {
-							resource: "ai-chat:conversation",
-							action: "read",
-							params: conversationId ? { id: conversationId } : undefined,
-						}
-			}
-			PageComponent={ChatPage}
+			PageComponent={AuthorizedChatPage}
 			ErrorComponent={DefaultError}
 			LoadingComponent={ChatLoading}
 			NotFoundComponent={NotFoundPage}
@@ -53,3 +49,48 @@ export function ChatPageComponent({ conversationId }: ChatPageComponentProps) {
 		/>
 	);
 }
+
+function AuthorizedChatPage({ conversationId }: ChatPageComponentProps) {
+	const { plugins } = useStack();
+	const mode = resolveAiChatMode(plugins?.aiChat?.config);
+	if (mode === "public") {
+		return <ChatPage conversationId={conversationId} />;
+	}
+	if (!conversationId) {
+		return (
+			<PermissionRouteAccess
+				permission={aiChatPermissions.conversation.read({
+					scope: "collection",
+				})}
+				LoadingComponent={ChatLoading}
+			>
+				<ChatPage />
+			</PermissionRouteAccess>
+		);
+	}
+	return <AuthorizedConversationPage conversationId={conversationId} />;
+}
+
+function AuthorizedConversationPage({
+	conversationId,
+}: {
+	conversationId: string;
+}) {
+	const { conversation, error, isLoading } = useConversation(conversationId);
+	if (error) throw error;
+	if (isLoading) return <ChatLoading />;
+	if (!conversation) return <NotFoundPage />;
+	return (
+		<PermissionRouteAccess
+			permission={aiChatPermissions.conversation.read({
+				scope: "record",
+				conversationId: conversation.id,
+				exists: true,
+				...(conversation.userId ? { ownerId: conversation.userId } : {}),
+			})}
+			LoadingComponent={ChatLoading}
+		>
+			<ChatPage conversationId={conversationId} />
+		</PermissionRouteAccess>
+	);
+}

package/src/plugins/ai-chat/client/components/shared/default-error.tsx

@@ -11,7 +11,7 @@ export function DefaultError({ error }: FallbackProps) {
 	const { localization } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {
+	>("aiChat", {
 		localization: {},
 	});
 	const tr = useAiChatTranslation(localization);

package/src/plugins/ai-chat/client/components/tool-call-display.tsx

@@ -104,7 +104,7 @@ export function ToolCallDisplay({
 	const { localization } = usePluginOverrides<
 		AiChatPluginOverrides,
 		Partial<AiChatPluginOverrides>
-	>("ai-chat", {});
+	>("aiChat", {});
 	const tr = useAiChatTranslation(localization);
 	const displayName = formatToolName(toolName);
 	const statusLabel =

package/src/plugins/ai-chat/client/hooks/ai-chat-resource.ts

@@ -5,6 +5,6 @@ import { aiChatResources } from "../../query-keys";
 
 /** Factory-generated hooks shared by the public AI Chat hook wrappers. */
 export const aiChat = createResource({
-	plugin: "ai-chat",
+	plugin: "aiChat",
 	resources: aiChatResources,
 });