Skip to content

fix: correct system prompt handling to prevent display in user messages #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnthonyRonning merged 1 commit into from
Jul 29, 2025
Merged

fix: correct system prompt handling to prevent display in user messages #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions frontend/src/hooks/useChatSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ export function useChatSession(
content: string,
images?: File[],
documentText?: string,
documentMetadata?: { filename: string; fullContent: string }
documentMetadata?: { filename: string; fullContent: string },
systemPrompt?: string
) => {
if (phase !== "idle") {
return;
Expand Down Expand Up @@ -209,7 +210,12 @@ export function useChatSession(
processingRef.current = true;
setPhase("streaming");

const newMessages = [...chat.messages, userMessage];
// Add system message first if provided
const newMessages = [...chat.messages];
if (systemPrompt && systemPrompt.trim()) {
newMessages.push({ role: "system", content: systemPrompt.trim() } as ChatMessage);
}
newMessages.push(userMessage);
Comment thread
AnthonyRonning marked this conversation as resolved.

// Update optimistic state immediately
setOptimisticChat({
Expand Down
14 changes: 4 additions & 10 deletions frontend/src/routes/_auth.chat.$chatId.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,8 @@ function ChatComponent() {
setSystemPrompt(null);
setUserImages([]);

// Combine prompts
const finalPrompt = sysPrompt ? `[System: ${sysPrompt}]\n\n${prompt}` : prompt;

// Send message
appendUserMessage(finalPrompt, images).catch((error) => {
// Send message with system prompt as separate parameter
appendUserMessage(prompt, images, undefined, undefined, sysPrompt || undefined).catch((error) => {
// Only reset if it wasn't an abort
if (!(error instanceof Error) || error.message !== "Stream aborted") {
console.error("[ChatComponent] Failed to append message:", error);
Expand Down Expand Up @@ -361,11 +358,8 @@ function ChatComponent() {
documentText?: string,
documentMetadata?: { filename: string; fullContent: string }
) => {
// Handle system prompt if provided
const messageContent = systemPrompt ? `[System: ${systemPrompt}]\n\n${input}` : input;

// Use the appendUserMessage from the hook
await appendUserMessage(messageContent, images, documentText, documentMetadata);
// Use the appendUserMessage from the hook with system prompt as separate parameter
await appendUserMessage(input, images, documentText, documentMetadata, systemPrompt);

// Scroll to bottom after sending
requestAnimationFrame(() => {
Expand Down
Loading