Compare commits

...

3 Commits

3 changed files with 33 additions and 12 deletions

View File

@ -135,10 +135,16 @@ export default function ChatPage() {
setHistoryCutoff(null); setHistoryCutoff(null);
return; return;
} }
if (historyCutoff === null && !thread.isThreadLoading) { if (hasSubmitted) return;
setHistoryCutoff(thread.messages.length); // Welcome 态下、未提交前,把当前已有消息都当作“历史”切掉。
} // 这样即使历史消息是后续异步补齐,也不会重新露出。
setHistoryCutoff((prev) => {
const next = thread.messages.length;
if (prev === null) return next;
return next > prev ? next : prev;
});
}, [ }, [
hasSubmitted,
historyCutoff, historyCutoff,
shouldRenderHistory, shouldRenderHistory,
thread.isThreadLoading, thread.isThreadLoading,
@ -200,9 +206,9 @@ export default function ChatPage() {
return; return;
} }
setHasSubmitted(true); setHasSubmitted(true);
void sendMessage(threadId, message); void sendMessage(safeThreadId, message);
}, },
[isSelectedSkillBootstrapping, sendMessage, threadId], [isSelectedSkillBootstrapping, safeThreadId, sendMessage],
); );
const handleStop = useCallback(async () => { const handleStop = useCallback(async () => {
await thread.stop(); await thread.stop();
@ -331,8 +337,10 @@ export default function ChatPage() {
threadId={threadId} threadId={threadId}
thread={thread} thread={thread}
messagesOverride={ messagesOverride={
shouldRenderHistory || historyCutoff === null shouldRenderHistory
? undefined ? undefined
: historyCutoff === null
? []
: thread.messages.slice(historyCutoff) : thread.messages.slice(historyCutoff)
} }
paddingBottom={todoListCollapsed ? 160 : 280} paddingBottom={todoListCollapsed ? 160 : 280}

View File

@ -691,13 +691,13 @@ function IframeSkillDialogButton({
<Tag key={`${skill.skill_id}-${skill.title}-${index}`} className="shrink-0"> <Tag key={`${skill.skill_id}-${skill.title}-${index}`} className="shrink-0">
{skill.title} {skill.title}
{/* TODO: 因为后端接口不支持取消选择skill所以暂时禁用取消选择按钮 */} {/* TODO: 因为后端接口不支持取消选择skill所以暂时禁用取消选择按钮 */}
{/* <button <button
onClick={() => clearSkill(skill.skill_id)} onClick={() => clearSkill(skill.skill_id)}
className="hover:bg-muted-foreground/20 ml-1 rounded-full" className="hover:bg-muted-foreground/20 ml-1 rounded-full"
type="button" type="button"
> >
<XIcon className="size-3" /> <XIcon className="size-3" />
</button> */} </button>
</Tag> </Tag>
))} ))}
</div> </div>

View File

@ -69,6 +69,15 @@ function getStreamErrorMessage(error: unknown): string {
return "Request failed."; return "Request failed.";
} }
function normalizeThreadId(
value: string | null | undefined,
): string | undefined {
if (!value) return undefined;
const normalized = value.trim();
if (!normalized || normalized === "new") return undefined;
return normalized;
}
export function useThreadStreamLegacy({ export function useThreadStreamLegacy({
threadId, threadId,
isNewThread, isNewThread,
@ -155,12 +164,14 @@ export function useThreadStream({
}, [onStart, onFinish, onToolEnd]); }, [onStart, onFinish, onToolEnd]);
useEffect(() => { useEffect(() => {
const normalizedThreadId = threadId ?? null; const normalizedThreadId = normalizeThreadId(threadId) ?? null;
if (!normalizedThreadId) { if (!normalizedThreadId) {
// Just reset for new thread creation when threadId becomes null/undefined // Just reset for new thread creation when threadId becomes null/undefined
startedRef.current = false; startedRef.current = false;
setOnStreamThreadId(normalizedThreadId);
} }
setOnStreamThreadId((prev) =>
prev === normalizedThreadId ? prev : normalizedThreadId,
);
threadIdRef.current = normalizedThreadId; threadIdRef.current = normalizedThreadId;
}, [threadId]); }, [threadId]);
@ -288,7 +299,9 @@ export function useThreadStream({
const text = message.text.trim(); const text = message.text.trim();
const resolvedThreadId = const resolvedThreadId =
threadId ?? threadIdRef.current ?? undefined; normalizeThreadId(threadId) ??
normalizeThreadId(threadIdRef.current) ??
undefined;
if (resolvedThreadId === "new") { if (resolvedThreadId === "new") {
toast.error("Invalid thread id 'new'. Please refresh and retry."); toast.error("Invalid thread id 'new'. Please refresh and retry.");
sendInFlightRef.current = false; sendInFlightRef.current = false;