fix(agent): chat console keeps its thread across turns and reloads (#1859)
Three user-reported failures in the assistant panel, one root cause each: 1. "The chat asks what I'm referring to" when continuing a thread. The single-call console (general.help, AskConsole -> /api/agent/ask) was stateless since the 08-20 model-agnostic cutover: conversationId was only the tool actor id, so every turn was answered blind, reload or not. The provider-agnostic GenerateTextRequest gains an optional `history` (real message turns before the prompt, in both the Anthropic-family and the OpenAI-compatible adapter; absent/empty leaves the request byte-identical to the single-turn call). The route loads the thread's earlier turns server-side (loadChatHistory: text only, hidden and tool rows dropped, alternation repaired, newest 16 rows / 10k chars) before writing the new question, and hands them to the model. 2. A full page reload (the deploy prompt's "Ladda om") closed the docked panel and dropped the thread from view. The panel now remembers its open thread per tab in sessionStorage (lib/agent-panel/session-restore) and the provider reopens it on mount; the sheet loads it exactly like a pick from "Tidigare konversationer". Close and "Ny konversation" forget it; a thread that no longer opens is dropped instead of retried on every reload. 3. "Can't type any more" once the update banner shows. DeployReloadPrompt's full-width wrapper sits at z-[60] after the panel in DOM order and swallowed clicks on the panel's composer; only the card takes input now. Claude-Session: https://claude.ai/code/session_01VjoXN3xdNZrHZeYA6qMi3g Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Jakob Wennberg
Claude Fable 5
parent
f75ea2384d
commit
3edbf0a2e3
@@ -133,6 +133,30 @@ describe('answerAssistantQuestion', () => {
|
||||
await expect(promise).rejects.toMatchObject({ code: 'empty_model_answer' })
|
||||
})
|
||||
|
||||
it('forwards the earlier turns as history so a follow-up can refer back', async () => {
|
||||
const history = [
|
||||
{ role: 'user' as const, text: 'Vad är min största utgift?' },
|
||||
{ role: 'assistant' as const, text: '12 345 kr på 5010.' },
|
||||
]
|
||||
await answerAssistantQuestion({
|
||||
supabase: supabaseWith(null),
|
||||
companyId: 'c1',
|
||||
userId: 'u1',
|
||||
conversationId: 'conv-1',
|
||||
question: 'Och förra månaden?',
|
||||
history,
|
||||
})
|
||||
const call = generateText.mock.calls[0][0]
|
||||
expect(call.history).toEqual(history)
|
||||
// The question itself stays the final prompt, not folded into history.
|
||||
expect(call.prompt).toContain('Fråga: Och förra månaden?')
|
||||
})
|
||||
|
||||
it('sends no history key at all for a fresh thread or a one-off ask', async () => {
|
||||
await answerAssistantQuestion({ supabase: supabaseWith(null), companyId: 'c1', question: 'Hej?', history: [] })
|
||||
expect('history' in generateText.mock.calls[0][0]).toBe(false)
|
||||
})
|
||||
|
||||
it('honours a custom maxSteps', async () => {
|
||||
buildLedgerTools.mockReturnValue([
|
||||
{ name: 'gnubok_get_vat_report', description: 'd', jsonSchema: {}, execute: vi.fn() },
|
||||
|
||||
@@ -2,9 +2,12 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import {
|
||||
resolveChatConversation,
|
||||
loadChatHistory,
|
||||
persistUserTurn,
|
||||
persistAssistantTurn,
|
||||
CHAT_INTENT_ID,
|
||||
HISTORY_MAX_CHARS,
|
||||
HISTORY_MAX_MESSAGES,
|
||||
} from '../persist'
|
||||
|
||||
interface Recorded {
|
||||
@@ -179,3 +182,107 @@ describe('persistAssistantTurn', () => {
|
||||
expect(preview.endsWith('…')).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('loadChatHistory', () => {
|
||||
type Row = { role: string; content: unknown; hidden?: boolean | null }
|
||||
// agent_messages read: select → eq → order → order → limit resolves rows.
|
||||
// Rows are handed over newest-first, exactly as the query returns them.
|
||||
function supabaseWithRows(newestFirst: Row[], opts: { error?: unknown; limitSeen?: number[] } = {}) {
|
||||
const chain = {
|
||||
select: () => chain,
|
||||
eq: () => chain,
|
||||
order: () => chain,
|
||||
limit: async (n: number) => {
|
||||
opts.limitSeen?.push(n)
|
||||
return { data: opts.error ? null : newestFirst, error: opts.error ?? null }
|
||||
},
|
||||
}
|
||||
return { from: () => chain } as unknown as SupabaseClient
|
||||
}
|
||||
const text = (t: string) => [{ type: 'text', text: t }]
|
||||
|
||||
it('returns the thread oldest-first as user/assistant text turns', async () => {
|
||||
const supabase = supabaseWithRows([
|
||||
{ role: 'assistant', content: text('12 345 kr på 5010.') },
|
||||
{ role: 'user', content: text('Vad är min största utgift?') },
|
||||
])
|
||||
expect(await loadChatHistory(supabase, 'conv-1')).toEqual([
|
||||
{ role: 'user', text: 'Vad är min största utgift?' },
|
||||
{ role: 'assistant', text: '12 345 kr på 5010.' },
|
||||
])
|
||||
})
|
||||
|
||||
it('drops hidden scaffolding, tool rows and empty tool-only turns from the old streaming runtime', async () => {
|
||||
const supabase = supabaseWithRows([
|
||||
{ role: 'assistant', content: text('Klart.') },
|
||||
{ role: 'tool', content: [{ type: 'tool_result', tool_use_id: 'tu_1', content: '{}' }] },
|
||||
{ role: 'assistant', content: [{ type: 'tool_use', id: 'tu_1', name: 'x', input: {} }] },
|
||||
{ role: 'user', content: text('Kolla momsen.') },
|
||||
{ role: 'user', content: text('[prompt template]'), hidden: true },
|
||||
])
|
||||
expect(await loadChatHistory(supabase, 'conv-1')).toEqual([
|
||||
{ role: 'user', text: 'Kolla momsen.' },
|
||||
{ role: 'assistant', text: 'Klart.' },
|
||||
])
|
||||
})
|
||||
|
||||
it('merges consecutive same-role turns (a question whose answer failed, then its retry)', async () => {
|
||||
const supabase = supabaseWithRows([
|
||||
{ role: 'assistant', content: text('Svar.') },
|
||||
{ role: 'user', content: text('Igen?') },
|
||||
{ role: 'user', content: text('Hur gick juli?') },
|
||||
])
|
||||
expect(await loadChatHistory(supabase, 'conv-1')).toEqual([
|
||||
{ role: 'user', text: 'Hur gick juli?\n\nIgen?' },
|
||||
{ role: 'assistant', text: 'Svar.' },
|
||||
])
|
||||
})
|
||||
|
||||
it('never opens with an assistant turn whose question fell off the window', async () => {
|
||||
const supabase = supabaseWithRows([
|
||||
{ role: 'assistant', content: text('B') },
|
||||
{ role: 'user', content: text('b?') },
|
||||
{ role: 'assistant', content: text('A (its question is outside the window)') },
|
||||
])
|
||||
expect(await loadChatHistory(supabase, 'conv-1')).toEqual([
|
||||
{ role: 'user', text: 'b?' },
|
||||
{ role: 'assistant', text: 'B' },
|
||||
])
|
||||
})
|
||||
|
||||
it('reads only the newest HISTORY_MAX_MESSAGES rows and trims the oldest until the text fits', async () => {
|
||||
const limitSeen: number[] = []
|
||||
const big = 'x'.repeat(2_500)
|
||||
// 6 turns of 2 500 chars = 15 000 > HISTORY_MAX_CHARS: the oldest go.
|
||||
const rows: Row[] = []
|
||||
for (let i = 0; i < 6; i++) rows.push({ role: i % 2 === 0 ? 'assistant' : 'user', content: text(`${i}${big}`) })
|
||||
const supabase = supabaseWithRows(rows, { limitSeen })
|
||||
const turns = await loadChatHistory(supabase, 'conv-1')
|
||||
expect(limitSeen).toEqual([HISTORY_MAX_MESSAGES])
|
||||
const total = turns.reduce((n, t) => n + t.text.length, 0)
|
||||
expect(total).toBeLessThanOrEqual(HISTORY_MAX_CHARS)
|
||||
expect(turns[0].role).toBe('user')
|
||||
// Newest turn (index 0 in the newest-first rows) is the last one kept.
|
||||
expect(turns[turns.length - 1].text.startsWith('0')).toBe(true)
|
||||
})
|
||||
|
||||
it('clamps a single oversized turn instead of letting it eat the whole budget', async () => {
|
||||
const supabase = supabaseWithRows([
|
||||
{ role: 'assistant', content: text('Svar.') },
|
||||
{ role: 'user', content: text('y'.repeat(9_000)) },
|
||||
])
|
||||
const turns = await loadChatHistory(supabase, 'conv-1')
|
||||
expect(turns).toHaveLength(2)
|
||||
expect(turns[0].text.length).toBeLessThan(3_100)
|
||||
expect(turns[0].text.endsWith('…')).toBe(true)
|
||||
})
|
||||
|
||||
it('throws on a read error rather than silently answering without context', async () => {
|
||||
const supabase = supabaseWithRows([], { error: new Error('rls') })
|
||||
await expect(loadChatHistory(supabase, 'conv-1')).rejects.toThrow('rls')
|
||||
})
|
||||
|
||||
it('is empty for a thread with nothing readable', async () => {
|
||||
expect(await loadChatHistory(supabaseWithRows([]), 'conv-1')).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user