{JSON.stringify(
{ args: toolCall.args, result: toolCall.result },
diff --git a/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx b/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx
index c91e045f..f4200e5b 100644
--- a/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx
+++ b/apps/client/src/ee/ai-chat/components/enable-ai-chat.tsx
@@ -1,12 +1,13 @@
-import { Group, Text, Switch } from "@mantine/core";
+import { Badge, Group, Text, Switch, Tooltip } from "@mantine/core";
import { useAtom } from "jotai";
import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
import { notifications } from "@mantine/notifications";
-import { isCloud } from "@/lib/config.ts";
-import useLicense from "@/ee/hooks/use-license.tsx";
+import { useHasFeature } from "@/ee/hooks/use-feature";
+import { Feature } from "@/ee/features";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label";
export default function EnableAiChat() {
const { t } = useTranslation();
@@ -14,7 +15,12 @@ export default function EnableAiChat() {
return (
-
{t("AI Chat")}
+
+ {t("AI Chat")}
+
+ {t("Beta")}
+
+
{t(
"Enable AI Chat to allow users to have multi-turn conversations with AI about your workspace content.",
@@ -31,9 +37,8 @@ function AiChatToggle() {
const { t } = useTranslation();
const [workspace, setWorkspace] = useAtom(workspaceAtom);
const [checked, setChecked] = useState(workspace?.settings?.ai?.chat);
- const { hasLicenseKey } = useLicense();
-
- const hasAccess = isCloud() || (!isCloud() && hasLicenseKey);
+ const hasAccess = useHasFeature(Feature.AI);
+ const upgradeLabel = useUpgradeLabel();
const handleChange = async (event: React.ChangeEvent) => {
const value = event.currentTarget.checked;
@@ -50,11 +55,13 @@ function AiChatToggle() {
};
return (
-
+
+
+
);
}
diff --git a/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts b/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts
index 0a23b713..65a93a97 100644
--- a/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts
+++ b/apps/client/src/ee/ai-chat/hooks/use-chat-stream.ts
@@ -1,4 +1,4 @@
-import { useState, useCallback, useRef } from "react";
+import { useState, useCallback, useEffect, useRef } from "react";
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate } from "react-router-dom";
import { sendChatMessage } from "../services/ai-chat-service";
@@ -10,7 +10,14 @@ import type {
PageMention,
} from "../types/ai-chat.types";
-export function useChatStream(chatId: string | undefined) {
+type ChatStreamOptions = {
+ onChatCreated?: (chatId: string) => void;
+};
+
+export function useChatStream(
+ chatId: string | undefined,
+ options?: ChatStreamOptions,
+) {
const [messages, setMessages] = useState([]);
const [streamingContent, setStreamingContent] = useState("");
const [streamingToolCalls, setStreamingToolCalls] = useState(
@@ -18,21 +25,46 @@ export function useChatStream(chatId: string | undefined) {
);
const [isStreaming, setIsStreaming] = useState(false);
const [error, setError] = useState(null);
+ const [errorCode, setErrorCode] = useState(null);
+ const [isRetryable, setIsRetryable] = useState(false);
const abortRef = useRef(null);
const queryClient = useQueryClient();
const navigate = useNavigate();
const currentChatIdRef = useRef(chatId);
currentChatIdRef.current = chatId;
+ // Tracks which chatId the local `messages` state currently represents.
+ // Set when we seed from a server fetch AND when we optimistically own a
+ // freshly-created chat after `chat_created`. This is the single authority
+ // marker that keeps server-state effects from clobbering in-flight streams.
+ const hydratedChatIdRef = useRef(undefined);
- const initMessages = useCallback((msgs: AiChatMessage[]) => {
+ // Reset local state when the consumer switches to a different chat.
+ // Skip the reset if the new chatId is one the hook itself already claimed
+ // during a new-chat flow — in that case our optimistic state is the truth.
+ useEffect(() => {
+ if (chatId && chatId === hydratedChatIdRef.current) return;
+ hydratedChatIdRef.current = undefined;
+ setMessages([]);
+ setError(null);
+ setErrorCode(null);
+ setIsRetryable(false);
+ }, [chatId]);
+
+ const hydrateFromServer = useCallback((msgs: AiChatMessage[]) => {
+ const forId = currentChatIdRef.current;
+ if (!forId) return;
+ if (hydratedChatIdRef.current === forId) return;
+ hydratedChatIdRef.current = forId;
setMessages(msgs);
}, []);
const sendMessage = useCallback(
- (content: string, mentions: PageMention[] = [], attachments: ChatAttachment[] = []) => {
+ (content: string, mentions: PageMention[] = [], attachments: ChatAttachment[] = [], contextPageId?: string) => {
if (isStreaming || (!content.trim() && attachments.length === 0)) return;
setError(null);
+ setErrorCode(null);
+ setIsRetryable(false);
setIsStreaming(true);
setStreamingContent("");
setStreamingToolCalls([]);
@@ -68,13 +100,22 @@ export function useChatStream(chatId: string | undefined) {
chatId: currentChatIdRef.current,
content,
mentionedPageIds: mentions.map((m) => m.id),
+ ...(contextPageId && { contextPageId }),
...(attachmentIds.length && { attachmentIds }),
},
(event: AiChatStreamEvent) => {
switch (event.type) {
case "chat_created":
currentChatIdRef.current = event.chatId;
- navigate(`/ai/chat/${event.chatId}`, { replace: true });
+ // Claim authority over this new chatId so when the consumer's
+ // prop catches up via navigation/onChatCreated, the reset effect
+ // sees a match and preserves our optimistic messages.
+ hydratedChatIdRef.current = event.chatId;
+ if (options?.onChatCreated) {
+ options.onChatCreated(event.chatId);
+ } else {
+ navigate(`/ai/chat/${event.chatId}`, { replace: true });
+ }
queryClient.invalidateQueries({ queryKey: ["ai-chats"] });
break;
case "content":
@@ -125,6 +166,8 @@ export function useChatStream(chatId: string | undefined) {
}
case "error":
setError(event.message);
+ setErrorCode(event.code || null);
+ setIsRetryable(event.retryable || false);
setIsStreaming(false);
break;
}
@@ -175,8 +218,10 @@ export function useChatStream(chatId: string | undefined) {
streamingToolCalls,
isStreaming,
error,
+ errorCode,
+ isRetryable,
sendMessage,
stopGeneration,
- initMessages,
+ hydrateFromServer,
};
}
diff --git a/apps/client/src/ee/ai-chat/pages/ai-chat.tsx b/apps/client/src/ee/ai-chat/pages/ai-chat.tsx
index f9b751d0..bb264b73 100644
--- a/apps/client/src/ee/ai-chat/pages/ai-chat.tsx
+++ b/apps/client/src/ee/ai-chat/pages/ai-chat.tsx
@@ -1,10 +1,39 @@
+import { useParams } from "react-router-dom";
+import { ErrorBoundary } from "react-error-boundary";
+import { Button } from "@mantine/core";
+import { IconAlertTriangle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
import AiChatLayout from "../components/ai-chat-layout";
+import { EmptyState } from "@/components/ui/empty-state.tsx";
import classes from "../styles/ai-chat.module.css";
export default function AiChat() {
+ const { t } = useTranslation();
+ const { chatId } = useParams<{ chatId: string }>();
+
return (
-
+
(
+
+ {t("Try again")}
+
+ }
+ />
+ )}
+ >
+
+
+
+ {t("Welcome to {{name}}", { name: workspace?.name ?? "Docmost" })}
+
+
+ {t("Ask anything or search your workspace")}
+
+
+
+ {}}
+ placeholder={t("Ask anything... Use @ to mention pages")}
+ autofocus={false}
+ />
+
+
+