v1.11: opencode-style compaction port
- compaction.ts: usable/isOverflow/estimate/turns/select/buildPrompt/process
- compaction-prompt.ts: SUMMARY_TEMPLATE verbatim from opencode
- schema: messages.{compacted_at,summary,tail_start_id} + chats.needs_compaction
- inference: auto-trigger on overflow, pre-fetch compaction before next turn
- /compact slash command rewired to new path
- WS: chat_status working/idle around compaction + compacted frame
- frontend: SummaryCard + sonner toast on compacted
- 24 unit tests for pure functions
This commit is contained in:
@@ -49,7 +49,12 @@ const AskUserInputArgs = z.object({
|
||||
|
||||
interface MessageHandlers {
|
||||
enqueueInference: (sessionId: string, chatId: string, assistantMessageId: string, user: string) => void;
|
||||
enqueueCompact: (sessionId: string, chatId: string, compactMessageId: string, user: string) => void;
|
||||
// v1.11: returns a promise that resolves after compaction.process finishes
|
||||
// (await the LLM call). Throws on failure — the route surfaces a 500.
|
||||
// Replaces the v1.10 enqueueCompact (which fired-and-forgot a kind='compact'
|
||||
// streaming row). The new anchored-rolling strategy inserts a single
|
||||
// summary=true assistant row only after the LLM responds.
|
||||
runCompaction: (chatId: string) => Promise<void>;
|
||||
publishUserMessage: (
|
||||
sessionId: string,
|
||||
chatId: string,
|
||||
@@ -81,9 +86,15 @@ export function registerMessageRoutes(
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
// v1.11: returns ALL messages including compacted ones. The UI
|
||||
// distinguishes via the new `summary` flag (renders an accordion
|
||||
// SummaryCard) and shows compacted_at-stamped rows inline for context.
|
||||
// Internal inference assembly filters compacted_at IS NULL separately —
|
||||
// see services/inference.ts loadContext + services/compaction.ts.
|
||||
const rows = await sql<Message[]>`
|
||||
SELECT id, session_id, chat_id, role, content, kind, tool_calls, tool_results, status, last_seq,
|
||||
tokens_used, ctx_used, ctx_max, started_at, finished_at, created_at, metadata
|
||||
tokens_used, ctx_used, ctx_max, started_at, finished_at, created_at, metadata,
|
||||
summary, tail_start_id, compacted_at
|
||||
FROM messages
|
||||
WHERE session_id = ${req.params.id}
|
||||
ORDER BY created_at ASC, id ASC
|
||||
@@ -251,29 +262,30 @@ export function registerMessageRoutes(
|
||||
}
|
||||
);
|
||||
|
||||
// v1.11: manual /compact. Was a streaming kind='compact' row inserted by
|
||||
// this handler; now delegates to the anchored-rolling compaction service.
|
||||
// Synchronous (we await the LLM call) — callers either await or rely on
|
||||
// the 'compacted' WS frame to refresh their view. The response carries
|
||||
// no body of interest; the new summary row arrives via the WS frame.
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/chats/:id/compact',
|
||||
async (req, reply) => {
|
||||
const chatRows = await sql<Chat[]>`
|
||||
SELECT id, session_id FROM chats WHERE id = ${req.params.id} AND status = 'open'
|
||||
const chatRows = await sql<{ id: string }[]>`
|
||||
SELECT id FROM chats WHERE id = ${req.params.id} AND status = 'open'
|
||||
`;
|
||||
if (chatRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
const chat = chatRows[0]!;
|
||||
const sessionId = chat.session_id;
|
||||
|
||||
const [compactMsg] = await sql<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, chat_id, role, content, kind, status, created_at)
|
||||
VALUES (${sessionId}, ${chat.id}, 'system', '', 'compact', 'streaming', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
|
||||
handlers.enqueueCompact(sessionId, chat.id, compactMsg!.id, 'default');
|
||||
|
||||
reply.code(202);
|
||||
return { compact_message_id: compactMsg!.id };
|
||||
try {
|
||||
await handlers.runCompaction(chatRows[0]!.id);
|
||||
} catch (err) {
|
||||
req.log.error({ err, chatId: chatRows[0]!.id }, 'manual compaction failed');
|
||||
reply.code(500);
|
||||
return { error: err instanceof Error ? err.message : 'compaction failed' };
|
||||
}
|
||||
reply.code(200);
|
||||
return { ok: true };
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user