* fix(assistant): stop cross-user conversation access, bricked threads and lost sessions Hotfix batch (PR1 of the assistant UI makeover, dev_docs/assistant_redesign_plan.md section 7). No visual change; each of these is wrong today regardless of which design lands, and three are unrecoverable per incident. /api/agent/invoke never checked who owns a resumed conversation_id. RLS on agent_conversations/agent_messages is company-scoped, not user-scoped (20260517204000), so a member could post a colleague's conversation id, have their history loaded into the prompt and read it back, while their own turns were appended to that thread. The conversations list route filters on user_id for exactly this reason. Also pins company and intent: resuming a thread from another company would mix ledgers, and resuming under a different intent would swap the tool whitelist under history the model has already seen. A turn persists the assistant message carrying tool_use blocks before the tools run, and their results only after the batch finishes. Dying in between (client disconnect terminating the function, a deploy, a slow tool) left history ending on an unanswered tool_use, which the Messages API rejects on replay: every later turn 400s, and agent_messages is append-only for the BFL trail, so nothing could repair it. History is now patched on read by synthesizing is_error tool_results, leaving the stored trail untouched. check_and_increment_agent_quota is SECURITY DEFINER in public with a caller-chosen p_user_id, so any authenticated user could drain a colleague's minute/day budget and lock them out of every agent endpoint. A plain REVOKE would break the limiter (all three callers use the user's RLS client) and, as it fails open, silently remove the spend cap: the function now refuses to act for anyone but the caller, while service-role connections keep passing an explicit id. The single reject route re-read status and then wrote unguarded, so losing the race with commit's atomic pending -> committing claim stamped `rejected` over an operation that had already posted a verifikat, invisible to the committing-state recovery sweep. Guarded on status like bulk-reject already is; a lost race is now a 409. The sheet's Escape handler listened on window with no defaultPrevented or target check while the sheet is deliberately non-modal, so pressing Esc to dismiss the reject-reason Select inside an approval card, the command palette or any dialog unmounted the sheet and discarded the conversation, the streaming turn and the un-actioned proposal. It now yields to open overlays and to focus outside the sheet. Verified: 9526 unit tests pass, lint clean on touched files, guards pass, and the new pg-real test proves the quota guard against real Postgres (attacker raises 42501, victim counters stay at 0). The four unrelated pg-real failures on this machine reproduce identically with these changes stashed. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(assistant): close anon path on the quota RPC, order the ownership check ahead of writes Review follow-ups on the hotfix batch. The caller guard used auth.uid() alone, which is NULL for the `anon` role just as it is for backend roles, so an unauthenticated caller holding the public anon key (it ships in the browser bundle) could still pick any p_user_id and drain that user's quota. The guard now keys on the request role: anon and authenticated may only ever spend their own quota, backend roles keep passing an explicit id. The default PUBLIC execute grant is revoked as a second layer, with execute granted only to authenticated and service_role. Covered by a new pg test for the anon path. The ownership check ran after the onboarding.intake stamp, so a request that was about to be rejected could still write intake_completed_at. It now sits directly after the capability gate, ahead of every side effect and ahead of the company and profile reads, which also makes a rejected request cheaper. The tool-result repair matched ids anywhere in the history, but the API needs results in the message IMMEDIATELY after the tool_use. A result persisted after an intervening turn (two turns racing on one conversation) left a shape that still 400s. The repair is now positional, and orphaned or late-duplicate tool_results are dropped, since an unmatched tool_result is rejected just as an unanswered tool_use is. The Escape guard matched the Radix popper wrapper, which stays mounted when a popper is force-mounted; it now requires data-state="open" so a closed popper cannot block Escape for the rest of the session. Both new route errors are Swedish, per the user-facing error rule. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
341 lines
13 KiB
TypeScript
341 lines
13 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { NextResponse } from 'next/server'
|
|
import { z } from 'zod'
|
|
import { ensureInitialized } from '@/lib/init'
|
|
import { requireAuth } from '@/lib/auth/require-auth'
|
|
import { getActiveCompanyId } from '@/lib/company/context'
|
|
import { getIntent } from '@/lib/agent/intents/registry'
|
|
import { checkAgentRateLimit, agentRateLimitResponseBody } from '@/lib/rate-limits/agent'
|
|
import { runChatTurn, friendlyModelError } from '@/lib/agent/chat/run-turn'
|
|
import { guardSandbox } from '@/lib/sandbox/guard'
|
|
import { requireCapability } from '@/lib/entitlements/has-capability'
|
|
import { CAPABILITY } from '@/lib/entitlements/keys'
|
|
import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
|
|
|
|
// Make sure extensions are loaded: the chat loop dispatches against the
|
|
// agent tool registry which is populated by the mcp-server extension at load.
|
|
ensureInitialized()
|
|
|
|
// Hard cap on the per-turn user input. Generous for a chat composer (about
|
|
// 5k words / 20 pages) but bounds Bedrock token cost if the rate limiter is
|
|
// ever fail-open and a client floods large payloads.
|
|
const MAX_USER_MESSAGE_LEN = 20_000
|
|
|
|
const BodySchema = z.object({
|
|
intent_id: z.string().min(1).max(200),
|
|
// Existing conversation to resume; if omitted, the route creates one. The
|
|
// chat sheet's React state holds the conversation id as `string | null`
|
|
// and serializes `null` on the first turn, so accept null alongside
|
|
// undefined and treat both as "no existing conversation".
|
|
conversation_id: z.string().uuid().nullable().optional(),
|
|
// Optional company override; defaults to active_company_id.
|
|
company_id: z.string().uuid().nullable().optional(),
|
|
// The user's message (or, on the first turn, this is empty and we send the
|
|
// intent's prompt template instead). Capped to bound LLM cost.
|
|
user_message: z.string().max(MAX_USER_MESSAGE_LEN).nullable().optional(),
|
|
// Intent-specific capture args (e.g. { transaction_id: '...' } for
|
|
// transaction.categorization). Used only on the first turn to build the
|
|
// prompt template. Each value is bounded so capture inputs can't be a
|
|
// megabyte each; the dispatcher rejects oversize values upfront.
|
|
intent_args: z
|
|
.record(z.string().max(120), z.unknown())
|
|
.nullable()
|
|
.optional()
|
|
.refine(
|
|
(v) => {
|
|
if (!v) return true
|
|
try {
|
|
return JSON.stringify(v).length <= MAX_USER_MESSAGE_LEN
|
|
} catch {
|
|
return false
|
|
}
|
|
},
|
|
{ message: 'intent_args too large' },
|
|
),
|
|
// Optional context_ref for the conversation row, e.g. 'transaction:<id>'.
|
|
context_ref: z.string().max(200).nullable().optional(),
|
|
// When true (and user_message is provided), persist the turn but flag it
|
|
// hidden so it doesn't render as a user bubble on resume. Used by the chat's
|
|
// rejection-correction flow (ApprovalCard → AgentChat) to feed the agent a
|
|
// synthetic correction without showing it as something the user typed.
|
|
user_message_hidden: z.boolean().nullable().optional(),
|
|
})
|
|
|
|
// POST /api/agent/invoke
|
|
//
|
|
// Streams NDJSON events from the chat loop. Each line is a JSON object whose
|
|
// `kind` identifies the event type: see lib/agent/chat/run-turn.ts StreamEvent.
|
|
//
|
|
// Auth: the user must be a member of the resolved company.
|
|
//
|
|
// Plan ref: dev_docs/specialized-agent-plan.md §9 (chat loop).
|
|
export async function POST(request: Request) {
|
|
const { user, supabase, error } = await requireAuth()
|
|
if (error) return error
|
|
|
|
// Generous per-user rate limit: bounds runaway Bedrock spend (loop-firing
|
|
// sessions). Fails open on infra error.
|
|
const rate = await checkAgentRateLimit(supabase, user.id)
|
|
if (!rate.ok) {
|
|
return NextResponse.json(agentRateLimitResponseBody(rate), {
|
|
status: 429,
|
|
headers: rate.retryAfterSec ? { 'Retry-After': String(rate.retryAfterSec) } : undefined,
|
|
})
|
|
}
|
|
|
|
let body: z.infer<typeof BodySchema>
|
|
try {
|
|
body = BodySchema.parse(await request.json())
|
|
} catch (err) {
|
|
return NextResponse.json(
|
|
{ error: err instanceof Error ? getUserErrorMessage(err) : 'Invalid body' },
|
|
{ status: 400 },
|
|
)
|
|
}
|
|
|
|
const intent = getIntent(body.intent_id)
|
|
if (!intent) {
|
|
return NextResponse.json({ error: `Unknown intent: ${body.intent_id}` }, { status: 400 })
|
|
}
|
|
|
|
const companyId = body.company_id ?? (await getActiveCompanyId(supabase, user.id))
|
|
if (!companyId) return NextResponse.json({ error: 'No active company' }, { status: 400 })
|
|
|
|
const { data: membership } = await supabase
|
|
.from('company_members')
|
|
.select('role')
|
|
.eq('company_id', companyId)
|
|
.eq('user_id', user.id)
|
|
.maybeSingle()
|
|
if (!membership) return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
|
|
|
|
// No Anthropic Bedrock calls in the sandbox: the demo runs entirely on
|
|
// seed data and the assistant is gated to a "look, don't touch" preview.
|
|
const blocked = await guardSandbox(supabase, companyId)
|
|
if (blocked) return blocked
|
|
|
|
const capBlocked = await requireCapability(supabase, companyId, CAPABILITY.ai)
|
|
if (capBlocked) return capBlocked
|
|
|
|
// Resolve the conversation BEFORE any side effect below (the onboarding
|
|
// intake stamp): a request that is about to be rejected must not write.
|
|
let conversationId = body.conversation_id ?? null
|
|
if (conversationId) {
|
|
// A resumed conversation id comes straight from the client, so ownership
|
|
// has to be proven here. RLS on agent_conversations/agent_messages is
|
|
// COMPANY-scoped (migration 20260517204000), not user-scoped, so RLS alone
|
|
// would happily load a colleague's thread into the prompt and append this
|
|
// user's turns to it. The conversations list route filters on user_id for
|
|
// exactly this reason; the same rule applies to the turn itself.
|
|
//
|
|
// The company check matters too: a user who belongs to several companies
|
|
// must not resume a thread from company B while the turn runs with company
|
|
// A's ledger, tools and staged operations.
|
|
const { data: conv } = await supabase
|
|
.from('agent_conversations')
|
|
.select('id, user_id, company_id, intent_id')
|
|
.eq('id', conversationId)
|
|
.maybeSingle()
|
|
|
|
if (!conv || conv.user_id !== user.id || conv.company_id !== companyId) {
|
|
// Same response for "doesn't exist" and "isn't yours": a 403 here would
|
|
// confirm that someone else's conversation id is real.
|
|
return NextResponse.json({ error: 'Konversationen hittades inte.' }, { status: 404 })
|
|
}
|
|
|
|
// The intent decides the tool loadout and the system prompt. Letting a
|
|
// resumed thread switch intent mid-conversation would swap the tool
|
|
// whitelist under history the model has already been shown.
|
|
if (conv.intent_id !== body.intent_id) {
|
|
return NextResponse.json(
|
|
{ error: 'Konversationen hör till ett annat sammanhang.' },
|
|
{ status: 400 },
|
|
)
|
|
}
|
|
}
|
|
|
|
// onboarding.intake completion signal: once the user has actually
|
|
// engaged (typed a real reply, not the auto-fired greeting prompt that
|
|
// mounts the chat), stamp intake_completed_at on the profile so re-entry
|
|
// logic and opportunistic follow-up logic in other intents can tell the
|
|
// intake happened. Idempotent: the IS NULL guard ensures we never
|
|
// overwrite the first engagement timestamp. Best-effort: failure here
|
|
// doesn't break the chat; the next user turn retries.
|
|
if (
|
|
body.intent_id === 'onboarding.intake' &&
|
|
typeof body.user_message === 'string' &&
|
|
body.user_message.trim().length > 0 &&
|
|
body.user_message_hidden !== true
|
|
) {
|
|
try {
|
|
await supabase
|
|
.from('agent_profiles')
|
|
.update({ intake_completed_at: new Date().toISOString() })
|
|
.eq('company_id', companyId)
|
|
.is('intake_completed_at', null)
|
|
} catch {
|
|
// ignored: see comment above
|
|
}
|
|
}
|
|
|
|
// Load lightweight company + user signals for the system prompt.
|
|
const [{ data: company }, { data: profile }] = await Promise.all([
|
|
supabase.from('companies').select('name').eq('id', companyId).single(),
|
|
supabase.from('profiles').select('full_name').eq('id', user.id).single(),
|
|
])
|
|
const companyName = company?.name ?? ''
|
|
const firstName = profile?.full_name?.split(' ')[0] ?? null
|
|
|
|
// Create the conversation row when this is a fresh thread.
|
|
if (!conversationId) {
|
|
const { data: newConv, error: convErr } = await supabase
|
|
.from('agent_conversations')
|
|
.insert({
|
|
company_id: companyId,
|
|
user_id: user.id,
|
|
intent_id: body.intent_id,
|
|
context_ref: body.context_ref ?? null,
|
|
title: intent.sheetTitle,
|
|
})
|
|
.select('id')
|
|
.single()
|
|
if (convErr || !newConv) {
|
|
return NextResponse.json(
|
|
{ error: getUserErrorMessage(convErr) ?? 'Failed to create conversation' },
|
|
{ status: 500 },
|
|
)
|
|
}
|
|
conversationId = newConv.id as string
|
|
}
|
|
|
|
// Compute the user message to send to Anthropic. On the first turn (no
|
|
// user_message provided), we run the intent's capture + promptTemplate
|
|
// pipeline so the prompt is anchored on the page context the user
|
|
// clicked from.
|
|
let effectiveUserMessage = body.user_message ?? ''
|
|
// When the caller didn't supply a user_message, we synthesize one from the
|
|
// intent's promptTemplate. Mark that synthetic turn hidden so the UI
|
|
// doesn't render the template scaffolding as a user bubble on resume. The
|
|
// client can also explicitly request a hidden turn (rejection correction)
|
|
// even when it DID supply a user_message.
|
|
let userMessageHidden = body.user_message_hidden === true
|
|
if (!effectiveUserMessage) {
|
|
try {
|
|
const captured = await intent.capture(body.intent_args ?? {}, {
|
|
supabase,
|
|
userId: user.id,
|
|
companyId,
|
|
})
|
|
const profileSummary = await loadProfileSummary(supabase, companyId)
|
|
const memory = await loadRankedMemory(supabase, companyId, 30)
|
|
effectiveUserMessage = intent.promptTemplate({
|
|
captured,
|
|
profileSummary,
|
|
activeMemory: memory,
|
|
})
|
|
userMessageHidden = true
|
|
} catch (err) {
|
|
return NextResponse.json(
|
|
{
|
|
error:
|
|
err instanceof Error
|
|
? `Capture failed: ${getUserErrorMessage(err)}`
|
|
: 'Capture failed',
|
|
},
|
|
{ status: 500 },
|
|
)
|
|
}
|
|
}
|
|
|
|
// Stream: NDJSON events from the chat loop.
|
|
const encoder = new TextEncoder()
|
|
// Conversation id is set above; capture into a non-null local for the
|
|
// streaming closure's first emission.
|
|
const convId: string = conversationId
|
|
|
|
const stream = new ReadableStream<Uint8Array>({
|
|
async start(controller) {
|
|
const emit = (event: unknown): boolean => {
|
|
try {
|
|
controller.enqueue(encoder.encode(JSON.stringify(event) + '\n'))
|
|
return true
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
|
|
// Surface the conversation id so the client can resume with it.
|
|
emit({ kind: 'conversation', conversation_id: convId })
|
|
|
|
try {
|
|
await runChatTurn({
|
|
supabase,
|
|
userId: user.id,
|
|
companyId,
|
|
companyName,
|
|
firstName,
|
|
intent,
|
|
conversationId: convId,
|
|
userMessage: effectiveUserMessage,
|
|
userMessageHidden,
|
|
persist: true,
|
|
emit: (event) => emit(event),
|
|
})
|
|
} catch (err) {
|
|
// run-turn already emitted a friendly error before re-throwing; emit a
|
|
// normalized one here too so this outer catch never overwrites it with a
|
|
// raw AWS SDK string.
|
|
emit({
|
|
kind: 'error',
|
|
message: friendlyModelError(err),
|
|
})
|
|
} finally {
|
|
try {
|
|
controller.close()
|
|
} catch {
|
|
// Already closed
|
|
}
|
|
}
|
|
},
|
|
})
|
|
|
|
return new Response(stream, {
|
|
headers: {
|
|
'Content-Type': 'application/x-ndjson; charset=utf-8',
|
|
'Cache-Control': 'no-store',
|
|
'X-Accel-Buffering': 'no',
|
|
},
|
|
})
|
|
}
|
|
|
|
async function loadProfileSummary(
|
|
supabase: Awaited<ReturnType<typeof createClient>>,
|
|
companyId: string,
|
|
): Promise<string | null> {
|
|
const { data } = await supabase
|
|
.from('agent_profiles')
|
|
.select('profile_summary')
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
return (data?.profile_summary as string | null) ?? null
|
|
}
|
|
|
|
async function loadRankedMemory(
|
|
supabase: Awaited<ReturnType<typeof createClient>>,
|
|
companyId: string,
|
|
cap: number,
|
|
): Promise<{ content: string; kind: string }[]> {
|
|
const { data } = await supabase
|
|
.from('agent_memory')
|
|
.select('content, kind, relevance_score, last_accessed_at')
|
|
.eq('company_id', companyId)
|
|
.eq('is_active', true)
|
|
.order('relevance_score', { ascending: false })
|
|
.order('last_accessed_at', { ascending: false, nullsFirst: false })
|
|
.limit(cap)
|
|
return (data ?? []).map((r: { content: string; kind: string }) => ({
|
|
content: r.content,
|
|
kind: r.kind,
|
|
}))
|
|
}
|