Compare commits

..

No commits in common. "08e8de5e3e180718ecfa725862bc6e0950fba24f" and "1fd7a5d4f703aa47ecc588f8323df5399458245d" have entirely different histories.

8 changed files with 40 additions and 109 deletions

View File

@ -81,23 +81,16 @@ export default function ChatPage() {
() => isNewThread && !safeThreadId,
[isNewThread, safeThreadId],
);
const [isThreadInitReady, setIsThreadInitReady] = useState(false);
const streamThreadId = useMemo(() => {
if (!safeThreadId) {
return undefined;
}
// In /new flow, defer history loading until thread init is finished:
// delete -> create -> history.
if (isNewThread && !isThreadInitReady) {
if (isNewThread && createNewSession) {
return undefined;
}
return safeThreadId;
}, [isNewThread, isThreadInitReady, safeThreadId]);
}, [createNewSession, isNewThread, safeThreadId]);
const apiClient = useMemo(() => getAPIClient(isMock), [isMock]);
const warnedMissingThreadIdRef = useRef(false);
const initializedThreadRef = useRef<string | null>(null);
const threadInitPromiseRef = useRef<Promise<void> | null>(null);
const { showNotification } = useNotification();
const currentSlogan = motivationSlogans[
@ -137,7 +130,6 @@ export default function ChatPage() {
useEffect(() => {
if (!isNewThread) {
warnedMissingThreadIdRef.current = false;
setIsThreadInitReady(true);
return;
}
if (!safeThreadId) {
@ -145,38 +137,29 @@ export default function ChatPage() {
warnedMissingThreadIdRef.current = true;
toast.error(t.chatPage.missingThreadIdForCreate);
}
setIsThreadInitReady(false);
return;
}
warnedMissingThreadIdRef.current = false;
if (initializedThreadRef.current === safeThreadId) return;
initializedThreadRef.current = safeThreadId;
setIsThreadInitReady(false);
const initPromise = apiClient.threads
.delete(safeThreadId)
.catch(() => undefined)
.then(() =>
apiClient.threads.create({
void apiClient.threads
// TODO: 先注释先删除再创建的逻辑
// .delete(safeThreadId)
// .catch(() => undefined)
// .then(() =>
// apiClient.threads.create({
// threadId: safeThreadId,
// ifExists: "raise",
// }),
// )
.create({
threadId: safeThreadId,
ifExists: "do_nothing",
}),
)
.then(() => {
setIsThreadInitReady(true);
})
.catch(() => {
initializedThreadRef.current = null;
setIsThreadInitReady(false);
toast.error(t.chatPage.createSessionFailed);
});
threadInitPromiseRef.current = initPromise;
void initPromise.finally(() => {
if (threadInitPromiseRef.current === initPromise) {
threadInitPromiseRef.current = null;
}
});
}, [
apiClient,
isNewThread,
@ -308,7 +291,7 @@ export default function ChatPage() {
const [showExitDialog, setShowExitDialog] = useState(false);
const isStreaming = isUploading || thread.isLoading;
const handleSubmit = useCallback(
async (message: Parameters<typeof sendMessage>[1]) => {
(message: Parameters<typeof sendMessage>[1]) => {
if (isSelectedSkillBootstrapping) {
return;
}
@ -316,12 +299,6 @@ export default function ChatPage() {
toast.error(t.chatPage.missingThreadIdForSend);
return;
}
if (isNewThread && safeThreadId) {
await threadInitPromiseRef.current;
}
if (isNewThread && safeThreadId && !isThreadInitReady) {
return;
}
setHasSubmitted(true);
if (safeThreadId && (isNewThread || showWelcomeStyle)) {
router.replace(`/workspace/chats/${safeThreadId}?is_chatting=true`);
@ -330,7 +307,6 @@ export default function ChatPage() {
},
[
isNewThread,
isThreadInitReady,
isSelectedSkillBootstrapping,
router,
safeThreadId,
@ -657,14 +633,14 @@ export default function ChatPage() {
type: POST_MESSAGE_TYPES.IS_CHATTING,
isChatting: false,
});
resetNewSessionState();
// 始终复用 query 中的 thread_id。
const nextQuery = new URLSearchParams();
if (threadId && threadId !== "new") {
nextQuery.set("thread_id", threadId);
}
// /workspace/chats/${threadId}?is_chatting=false
router.replace(
`/workspace/chats/new?thread_id=${threadId}`,
`/workspace/chats/${threadId}?is_chatting=false`,
);
}}
>

View File

@ -970,14 +970,6 @@ export function InputBox({
/>
</div>
)}
{!showWelcomeStyle && (
<div className="shrink-0 h-full">
<ExitChattingButton
router={router}
threadId={threadIdFromProps}
/>
</div>
)}
<div ref={attachmentsButtonTourRef} className="shrink-0 h-full">
<AddAttachmentsButton />
</div>
@ -1300,53 +1292,6 @@ function HistoryButton({
</Tooltip>
);
}
function ExitChattingButton({
className,
router,
threadId,
}: {
className?: string;
router: AppRouterInstance;
threadId: string;
}) {
const { t } = useI18n();
return (
<Tooltip content={t.inputBox.welcome}>
<WorkspaceToolButton
className={cn(
"text-ws-base-1 hover:text-ws-interactive-primary",
className,
)}
onClick={() =>
router.replace(`/workspace/chats/${threadId}?is_chatting=false`)
}
>
<svg
className="transition-[color] duration-200"
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle
className="stroke-current transition-[stroke] duration-200"
cx="9"
cy="9"
r="8.5"
/>
<path
className="stroke-current transition-[stroke] duration-200"
d="M6 9H12"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
</WorkspaceToolButton>
</Tooltip>
);
}
// 启动iframeSkillDialog
function IframeSkillDialogButton({
className,

View File

@ -39,6 +39,7 @@ import {
} from "@/core/messages/utils";
import { useRehypeSplitWordsIntoSpans } from "@/core/rehype";
import { materializeSkillYaml } from "@/core/skills";
import { humanMessagePlugins } from "@/core/streamdown";
import { dispatchMentionReference } from "@/core/threads/reference-events";
import { cn } from "@/lib/utils";
@ -224,9 +225,13 @@ function MessageContent_({
if (isHuman) {
const shouldRenderSummaryCollapse = isSummaryMessage && summaryBody;
const messageResponse = contentToDisplay ? (
<div className="whitespace-break-spaces break-words">
<AIElementMessageResponse
remarkPlugins={humanMessagePlugins.remarkPlugins}
rehypePlugins={humanMessagePlugins.rehypePlugins}
components={components}
>
{contentToDisplay}
</div>
</AIElementMessageResponse>
) : null;
return (
<div className={cn("ml-auto flex flex-col gap-2", className)}>
@ -245,9 +250,13 @@ function MessageContent_({
: t.toolCalls.expandContent}
</summary>
<AIElementMessageContent className="w-fit border-t">
<div className="whitespace-break-spaces break-words">
<AIElementMessageResponse
remarkPlugins={humanMessagePlugins.remarkPlugins}
rehypePlugins={humanMessagePlugins.rehypePlugins}
components={components}
>
{summaryBody}
</div>
</AIElementMessageResponse>
</AIElementMessageContent>
</details>
)}

View File

@ -32,6 +32,7 @@ export function useReferenceFiles(threadId: string | undefined) {
queryKey: ["references", "list", threadId],
queryFn: () => listReferenceFiles(threadId ?? ""),
enabled: Boolean(threadId),
refetchOnWindowFocus: false,
refetchInterval: 5000,
refetchOnWindowFocus: true,
});
}

View File

@ -86,7 +86,6 @@ export const enUS: Translations = {
"Please note, this feature will consume tokens. Ensure your account balance is greater than 200 credits.",
addAttachments: "Add attachments",
history: "History",
welcome:"Welcome",
selectSkill: "Select Skill",
mode: "Mode",
flashMode: "Flash",

View File

@ -75,7 +75,6 @@ export interface Translations {
createSkillPrompt: string;
addAttachments: string;
history: string;
welcome:string;
selectSkill: string;
mode: string;
flashMode: string;

View File

@ -87,7 +87,6 @@ export const zhCN: Translations = {
"请注意此功能将消耗token请保证账户余额大于200可学豆。",
addAttachments: "添加附件",
history: "历史记录",
welcome:"欢迎页",
selectSkill: "选择Skill",
mode: "模式",
flashMode: "闪速",
@ -263,7 +262,7 @@ export const zhCN: Translations = {
noArtifactSelectedDescription: "请选择一个生成文件以查看详情",
exitDialogTitle: "提示",
exitDialogDescription:
"每七天自动删除。现在将返回欢迎页且清空聊天消息,是否继续?",
"历史记录每七天自动删除,现在将返回欢迎页,是否继续?",
exitDialogConfirm: "确定",
selectedSkillLoadFailed: "技能加载失败",
unknownErrorRetry: "发生了未知错误,请稍后重试。",

View File

@ -414,9 +414,12 @@ export function stripPriorityHintSuffix(content: string): string {
* - Split Chinese-numbered items (e.g. "1...") into separate paragraphs.
*/
export function normalizeHumanMessageDisplayText(content: string): string {
// Preserve human input as-is for display; only decode escaped newlines
// and normalize CRLF/CR to LF so line breaks render consistently.
return content.replace(/\\n/g, "\n").replace(/\r\n?/g, "\n");
return content
.replace(/\\n/g, "\n")
.replace(/\r\n?/g, "\n")
.replace(/\n(?=\d+[)]\s*)/g, "\n\n")
.replace(/\n{3,}/g, "\n\n")
.trim();
}
export function parseUploadedFiles(content: string): FileInMessage[] {