batch4: chats-in-sessions, force-send, /compact, right-rail file browser
Session 1:N Chat data model with backfill. Workspace switches to client-side multi-tab pane management. Right-rail file browser with float-over viewer and click-drag line selection replaces FileBrowserPane. Adds /compact streaming summarizer (respects compact markers in context builder), force-send (cancels in-flight, persists partial as 'cancelled', awaits cancellation completion via deferred Promise + 5s timeout), message queue, stop generation, chat auto-rename, session archive/unarchive with Closed Sessions section on repo landing page. CHECK constraints on sessions.status, messages.role, messages.status with KEEP IN SYNC comments tying to MESSAGE_ROLES / MESSAGE_STATUSES const arrays. Deletes dead pane routes/hook and the api.panes.* client block. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
147
apps/server/src/routes/chats.ts
Normal file
147
apps/server/src/routes/chats.ts
Normal file
@@ -0,0 +1,147 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import type { Sql } from '../db.js';
|
||||
import type { Broker } from '../services/broker.js';
|
||||
import type { Chat, Message } from '../types/api.js';
|
||||
|
||||
const CreateBody = z.object({
|
||||
name: z.string().min(1).max(200).optional(),
|
||||
});
|
||||
|
||||
const PatchBody = z.object({
|
||||
name: z.string().min(1).max(200).optional(),
|
||||
status: z.enum(['open', 'closed']).optional(),
|
||||
});
|
||||
|
||||
export function registerChatRoutes(
|
||||
app: FastifyInstance,
|
||||
sql: Sql,
|
||||
broker: Broker
|
||||
): void {
|
||||
app.get<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/chats',
|
||||
async (req, reply) => {
|
||||
const session = await sql`SELECT id FROM sessions WHERE id = ${req.params.id}`;
|
||||
if (session.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
const rows = await sql<Chat[]>`
|
||||
SELECT id, session_id, name, status, created_at, updated_at
|
||||
FROM chats
|
||||
WHERE session_id = ${req.params.id}
|
||||
ORDER BY updated_at DESC
|
||||
`;
|
||||
return rows;
|
||||
}
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/chats',
|
||||
async (req, reply) => {
|
||||
const parsed = CreateBody.safeParse(req.body ?? {});
|
||||
if (!parsed.success) {
|
||||
reply.code(400);
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
const session = await sql`SELECT id FROM sessions WHERE id = ${req.params.id}`;
|
||||
if (session.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
const [chat] = await sql<Chat[]>`
|
||||
INSERT INTO chats (session_id, name, status)
|
||||
VALUES (${req.params.id}, ${parsed.data.name ?? null}, 'open')
|
||||
RETURNING id, session_id, name, status, created_at, updated_at
|
||||
`;
|
||||
broker.publishUser('default', {
|
||||
type: 'chat_created',
|
||||
chat: chat!,
|
||||
session_id: req.params.id,
|
||||
});
|
||||
reply.code(201);
|
||||
return chat;
|
||||
}
|
||||
);
|
||||
|
||||
app.patch<{ Params: { id: string } }>(
|
||||
'/api/chats/:id',
|
||||
async (req, reply) => {
|
||||
const parsed = PatchBody.safeParse(req.body ?? {});
|
||||
if (!parsed.success) {
|
||||
reply.code(400);
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
const { name, status } = parsed.data;
|
||||
if (name === undefined && status === undefined) {
|
||||
reply.code(400);
|
||||
return { error: 'must provide name or status' };
|
||||
}
|
||||
const rows = await sql<Chat[]>`
|
||||
UPDATE chats
|
||||
SET
|
||||
name = COALESCE(${name ?? null}, name),
|
||||
status = COALESCE(${status ?? null}, status),
|
||||
updated_at = clock_timestamp()
|
||||
WHERE id = ${req.params.id}
|
||||
RETURNING id, session_id, name, status, created_at, updated_at
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
const chat = rows[0]!;
|
||||
if (status === 'closed') {
|
||||
broker.publishUser('default', {
|
||||
type: 'chat_closed',
|
||||
chat_id: chat.id,
|
||||
session_id: chat.session_id,
|
||||
});
|
||||
} else {
|
||||
broker.publishUser('default', {
|
||||
type: 'chat_updated',
|
||||
chat_id: chat.id,
|
||||
session_id: chat.session_id,
|
||||
name: chat.name,
|
||||
updated_at: chat.updated_at,
|
||||
});
|
||||
}
|
||||
return chat;
|
||||
}
|
||||
);
|
||||
|
||||
app.delete<{ Params: { id: string } }>(
|
||||
'/api/chats/:id',
|
||||
async (req, reply) => {
|
||||
const result = await sql<{ id: string; session_id: string }[]>`
|
||||
DELETE FROM chats WHERE id = ${req.params.id}
|
||||
RETURNING id, session_id
|
||||
`;
|
||||
if (result.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
reply.code(204);
|
||||
return null;
|
||||
}
|
||||
);
|
||||
|
||||
app.get<{ Params: { id: string } }>(
|
||||
'/api/chats/:id/messages',
|
||||
async (req, reply) => {
|
||||
const chat = await sql`SELECT id FROM chats WHERE id = ${req.params.id}`;
|
||||
if (chat.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
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
|
||||
FROM messages
|
||||
WHERE chat_id = ${req.params.id}
|
||||
ORDER BY created_at ASC, id ASC
|
||||
`;
|
||||
return rows;
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -1,21 +1,23 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import { z } from 'zod';
|
||||
import type { Sql } from '../db.js';
|
||||
import type { Message, Session } from '../types/api.js';
|
||||
import { requireUser } from '../auth.js';
|
||||
import type { Chat, Message, Session } from '../types/api.js';
|
||||
|
||||
const SendBody = z.object({
|
||||
content: z.string().min(1).max(64_000),
|
||||
});
|
||||
|
||||
interface MessageHandlers {
|
||||
enqueueInference: (sessionId: string, assistantMessageId: string, user: string) => void;
|
||||
enqueueInference: (sessionId: string, chatId: string, assistantMessageId: string, user: string) => void;
|
||||
enqueueCompact: (sessionId: string, chatId: string, compactMessageId: string, user: string) => void;
|
||||
publishUserMessage: (
|
||||
sessionId: string,
|
||||
chatId: string,
|
||||
userMessageId: string,
|
||||
content: string
|
||||
) => void;
|
||||
publishMessagesDeleted: (sessionId: string, messageIds: string[]) => void;
|
||||
publishMessagesDeleted: (sessionId: string, chatId: string, messageIds: string[]) => void;
|
||||
cancelInference: (sessionId: string, chatId: string) => Promise<boolean>;
|
||||
}
|
||||
|
||||
export function registerMessageRoutes(
|
||||
@@ -32,7 +34,7 @@ export function registerMessageRoutes(
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
const rows = await sql<Message[]>`
|
||||
SELECT id, session_id, role, content, tool_calls, tool_results, status, last_seq,
|
||||
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
|
||||
FROM messages
|
||||
WHERE session_id = ${req.params.id}
|
||||
@@ -43,7 +45,7 @@ export function registerMessageRoutes(
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/messages',
|
||||
'/api/chats/:id/messages',
|
||||
async (req, reply) => {
|
||||
const parsed = SendBody.safeParse(req.body);
|
||||
if (!parsed.success) {
|
||||
@@ -51,33 +53,39 @@ export function registerMessageRoutes(
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
|
||||
const session = await sql<Session[]>`SELECT id FROM sessions WHERE id = ${req.params.id}`;
|
||||
if (session.length === 0) {
|
||||
const chatRows = await sql<Chat[]>`
|
||||
SELECT id, session_id FROM chats WHERE id = ${req.params.id} AND status = 'open'
|
||||
`;
|
||||
if (chatRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
const chat = chatRows[0]!;
|
||||
const sessionId = chat.session_id;
|
||||
|
||||
const result = await sql.begin(async (tx) => {
|
||||
const [userMsg] = await tx<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, role, content, status, created_at)
|
||||
VALUES (${req.params.id}, 'user', ${parsed.data.content}, 'complete', clock_timestamp())
|
||||
INSERT INTO messages (session_id, chat_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, ${chat.id}, 'user', ${parsed.data.content}, 'complete', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
const [assistantMsg] = await tx<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, role, content, status, created_at)
|
||||
VALUES (${req.params.id}, 'assistant', '', 'streaming', clock_timestamp())
|
||||
INSERT INTO messages (session_id, chat_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, ${chat.id}, 'assistant', '', 'streaming', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
await tx`UPDATE sessions SET updated_at = NOW() WHERE id = ${req.params.id}`;
|
||||
await tx`UPDATE sessions SET updated_at = clock_timestamp() WHERE id = ${sessionId}`;
|
||||
await tx`UPDATE chats SET updated_at = clock_timestamp() WHERE id = ${chat.id}`;
|
||||
return { user_message_id: userMsg!.id, assistant_message_id: assistantMsg!.id };
|
||||
});
|
||||
|
||||
handlers.publishUserMessage(
|
||||
req.params.id,
|
||||
sessionId,
|
||||
chat.id,
|
||||
result.user_message_id,
|
||||
parsed.data.content
|
||||
);
|
||||
handlers.enqueueInference(req.params.id, result.assistant_message_id, requireUser(req));
|
||||
handlers.enqueueInference(sessionId, chat.id, result.assistant_message_id, 'default');
|
||||
|
||||
reply.code(202);
|
||||
return result;
|
||||
@@ -85,14 +93,24 @@ export function registerMessageRoutes(
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string; message_id: string } }>(
|
||||
'/api/sessions/:id/messages/:message_id/regenerate',
|
||||
'/api/chats/:id/messages/:message_id/regenerate',
|
||||
async (req, reply) => {
|
||||
const { id: sessionId, message_id: targetId } = req.params;
|
||||
const { id: chatId, message_id: targetId } = req.params;
|
||||
|
||||
const chatRows = await sql<Chat[]>`
|
||||
SELECT id, session_id FROM chats WHERE id = ${chatId}
|
||||
`;
|
||||
if (chatRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
const chat = chatRows[0]!;
|
||||
const sessionId = chat.session_id;
|
||||
|
||||
const target = await sql<{ id: string; role: string; status: string }[]>`
|
||||
SELECT id, role, status
|
||||
FROM messages
|
||||
WHERE session_id = ${sessionId} AND id = ${targetId}
|
||||
WHERE chat_id = ${chatId} AND id = ${targetId}
|
||||
`;
|
||||
if (target.length === 0) {
|
||||
reply.code(404);
|
||||
@@ -109,34 +127,141 @@ export function registerMessageRoutes(
|
||||
}
|
||||
|
||||
const { newAssistantId, deletedIds } = await sql.begin(async (tx) => {
|
||||
// Subquery keeps created_at in postgres at TIMESTAMPTZ µs precision.
|
||||
// Round-tripping through JS Date loses sub-ms precision and can pull
|
||||
// earlier rows (e.g. the triggering user message) into the >= bound.
|
||||
const deletedRows = await tx<{ id: string }[]>`
|
||||
DELETE FROM messages
|
||||
WHERE session_id = ${sessionId}
|
||||
WHERE chat_id = ${chatId}
|
||||
AND created_at >= (
|
||||
SELECT created_at FROM messages WHERE id = ${targetId}
|
||||
)
|
||||
RETURNING id
|
||||
`;
|
||||
const [row] = await tx<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, 'assistant', '', 'streaming', clock_timestamp())
|
||||
INSERT INTO messages (session_id, chat_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, ${chatId}, 'assistant', '', 'streaming', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
await tx`UPDATE sessions SET updated_at = NOW() WHERE id = ${sessionId}`;
|
||||
await tx`UPDATE sessions SET updated_at = clock_timestamp() WHERE id = ${sessionId}`;
|
||||
await tx`UPDATE chats SET updated_at = clock_timestamp() WHERE id = ${chatId}`;
|
||||
return {
|
||||
newAssistantId: row!.id,
|
||||
deletedIds: deletedRows.map((r) => r.id),
|
||||
};
|
||||
});
|
||||
|
||||
handlers.publishMessagesDeleted(sessionId, deletedIds);
|
||||
handlers.enqueueInference(sessionId, newAssistantId, requireUser(req));
|
||||
handlers.publishMessagesDeleted(sessionId, chatId, deletedIds);
|
||||
handlers.enqueueInference(sessionId, chatId, newAssistantId, 'default');
|
||||
|
||||
reply.code(202);
|
||||
return { assistant_message_id: newAssistantId };
|
||||
}
|
||||
);
|
||||
|
||||
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'
|
||||
`;
|
||||
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 };
|
||||
}
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/chats/:id/stop',
|
||||
async (req, reply) => {
|
||||
const chatRows = await sql<Chat[]>`
|
||||
SELECT id, session_id FROM chats WHERE id = ${req.params.id}
|
||||
`;
|
||||
if (chatRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found' };
|
||||
}
|
||||
const chat = chatRows[0]!;
|
||||
|
||||
const cancelled = await handlers.cancelInference(chat.session_id, chat.id);
|
||||
if (!cancelled) {
|
||||
reply.code(409);
|
||||
return { error: 'no active generation to stop' };
|
||||
}
|
||||
|
||||
reply.code(200);
|
||||
return { stopped: true };
|
||||
}
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/chats/:id/force_send',
|
||||
async (req, reply) => {
|
||||
const parsed = SendBody.safeParse(req.body);
|
||||
if (!parsed.success) {
|
||||
reply.code(400);
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
|
||||
const chatRows = await sql<Chat[]>`
|
||||
SELECT id, session_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;
|
||||
|
||||
// Await actual cancellation completion (catch block persists state).
|
||||
// 5s timeout guards against llama-swap stalls; if hit, proceed anyway.
|
||||
await Promise.race([
|
||||
handlers.cancelInference(sessionId, chat.id).then(() => undefined),
|
||||
new Promise<void>((_, rej) =>
|
||||
setTimeout(() => rej(new Error('cancel-timeout')), 5000)
|
||||
),
|
||||
]).catch((e: Error) => {
|
||||
if (e.message !== 'cancel-timeout') throw e;
|
||||
req.log.warn({ chatId: chat.id }, 'cancel timeout exceeded, proceeding with force-send');
|
||||
});
|
||||
|
||||
const result = await sql.begin(async (tx) => {
|
||||
const [userMsg] = await tx<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, chat_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, ${chat.id}, 'user', ${parsed.data.content}, 'complete', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
const [assistantMsg] = await tx<{ id: string }[]>`
|
||||
INSERT INTO messages (session_id, chat_id, role, content, status, created_at)
|
||||
VALUES (${sessionId}, ${chat.id}, 'assistant', '', 'streaming', clock_timestamp())
|
||||
RETURNING id
|
||||
`;
|
||||
await tx`UPDATE sessions SET updated_at = clock_timestamp() WHERE id = ${sessionId}`;
|
||||
await tx`UPDATE chats SET updated_at = clock_timestamp() WHERE id = ${chat.id}`;
|
||||
return { user_message_id: userMsg!.id, assistant_message_id: assistantMsg!.id };
|
||||
});
|
||||
|
||||
handlers.publishUserMessage(
|
||||
sessionId,
|
||||
chat.id,
|
||||
result.user_message_id,
|
||||
parsed.data.content
|
||||
);
|
||||
handlers.enqueueInference(sessionId, chat.id, result.assistant_message_id, 'default');
|
||||
|
||||
reply.code(202);
|
||||
return result;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,217 +0,0 @@
|
||||
import type { FastifyInstance } from 'fastify';
|
||||
import type { TransactionSql } from 'postgres';
|
||||
import type { Sql } from '../db.js';
|
||||
import type { Pane, PaneCreateRequest, PaneUpdateRequest } from '../types/api.js';
|
||||
|
||||
const VALID_KINDS = new Set(['chat', 'file_browser']);
|
||||
const MAX_PANES = 5;
|
||||
|
||||
async function movePane(
|
||||
tx: TransactionSql,
|
||||
paneId: string,
|
||||
sid: string,
|
||||
oldPos: number,
|
||||
newPos: number
|
||||
): Promise<void> {
|
||||
if (oldPos === newPos) return;
|
||||
// Move target pane to a sentinel well outside the negate range [-MAX_PANES, -1]
|
||||
// so it never collides with negated rows during the shift steps.
|
||||
await tx`UPDATE session_panes SET position = -100 WHERE id = ${paneId}`;
|
||||
if (newPos > oldPos) {
|
||||
await tx`UPDATE session_panes SET position = -position
|
||||
WHERE session_id = ${sid} AND position > ${oldPos} AND position <= ${newPos}`;
|
||||
await tx`UPDATE session_panes SET position = -position - 1
|
||||
WHERE session_id = ${sid} AND position < 0 AND id != ${paneId}`;
|
||||
} else {
|
||||
await tx`UPDATE session_panes SET position = -position - 2
|
||||
WHERE session_id = ${sid} AND position >= ${newPos} AND position < ${oldPos}`;
|
||||
await tx`UPDATE session_panes SET position = -position - 1
|
||||
WHERE session_id = ${sid} AND position < 0 AND id != ${paneId}`;
|
||||
}
|
||||
await tx`UPDATE session_panes SET position = ${newPos} WHERE id = ${paneId}`;
|
||||
}
|
||||
|
||||
export function registerPaneRoutes(app: FastifyInstance, sql: Sql): void {
|
||||
// GET /api/sessions/:id/panes — list panes ordered by position ASC
|
||||
app.get<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/panes',
|
||||
async (req, reply) => {
|
||||
const sessionRows = await sql`SELECT id FROM sessions WHERE id = ${req.params.id}`;
|
||||
if (sessionRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
const panes = await sql<Pane[]>`
|
||||
SELECT id, session_id, position, kind, state, created_at
|
||||
FROM session_panes
|
||||
WHERE session_id = ${req.params.id}
|
||||
ORDER BY position ASC
|
||||
`;
|
||||
return { panes };
|
||||
}
|
||||
);
|
||||
|
||||
// POST /api/sessions/:id/panes — create a new pane
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/panes',
|
||||
async (req, reply) => {
|
||||
const body = (req.body ?? {}) as PaneCreateRequest;
|
||||
const { kind, position } = body;
|
||||
|
||||
if (!kind || !VALID_KINDS.has(kind)) {
|
||||
reply.code(400);
|
||||
return { error: 'kind must be "chat" or "file_browser"' };
|
||||
}
|
||||
|
||||
const sessionRows = await sql`SELECT id FROM sessions WHERE id = ${req.params.id}`;
|
||||
if (sessionRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
|
||||
const sid = req.params.id;
|
||||
const state = {};
|
||||
|
||||
let insertError: string | null = null;
|
||||
const inserted = await sql.begin(async (tx) => {
|
||||
const countResult = await tx<{ n: number }[]>`
|
||||
SELECT COUNT(*)::int AS n FROM session_panes WHERE session_id = ${sid}
|
||||
`;
|
||||
const n = countResult[0]!.n;
|
||||
if (n >= MAX_PANES) {
|
||||
throw new Error('MAX_PANES_EXCEEDED');
|
||||
}
|
||||
let insertPos: number;
|
||||
if (position === undefined || position === null) {
|
||||
insertPos = n;
|
||||
} else {
|
||||
if (position < 0 || position > n) {
|
||||
throw new Error('OUT_OF_BOUNDS');
|
||||
}
|
||||
insertPos = position;
|
||||
}
|
||||
await tx`UPDATE session_panes SET position = -position - 1
|
||||
WHERE session_id = ${sid} AND position >= ${insertPos}`;
|
||||
const [row] = await tx<Pane[]>`
|
||||
INSERT INTO session_panes (session_id, position, kind, state)
|
||||
VALUES (${sid}, ${insertPos}, ${kind}, ${JSON.stringify(state)}::jsonb)
|
||||
RETURNING id, session_id, position, kind, state, created_at
|
||||
`;
|
||||
await tx`UPDATE session_panes SET position = -position
|
||||
WHERE session_id = ${sid} AND position < 0`;
|
||||
return row;
|
||||
}).catch((err: Error) => {
|
||||
insertError = err.message;
|
||||
return null;
|
||||
});
|
||||
|
||||
if (insertError === 'MAX_PANES_EXCEEDED') {
|
||||
reply.code(400);
|
||||
return { error: `session already has ${MAX_PANES} panes (maximum)` };
|
||||
}
|
||||
if (insertError === 'OUT_OF_BOUNDS') {
|
||||
reply.code(400);
|
||||
return { error: `position out of bounds` };
|
||||
}
|
||||
if (insertError) {
|
||||
reply.code(500);
|
||||
return { error: 'internal error' };
|
||||
}
|
||||
|
||||
reply.code(201);
|
||||
return inserted as Pane;
|
||||
}
|
||||
);
|
||||
|
||||
// PATCH /api/panes/:id — update state and/or position
|
||||
app.patch<{ Params: { id: string } }>(
|
||||
'/api/panes/:id',
|
||||
async (req, reply) => {
|
||||
const body = (req.body ?? {}) as PaneUpdateRequest;
|
||||
const { state, position } = body;
|
||||
|
||||
if (state === undefined && position === undefined) {
|
||||
reply.code(400);
|
||||
return { error: 'must provide at least one of: state, position' };
|
||||
}
|
||||
|
||||
const paneRows = await sql<Pane[]>`
|
||||
SELECT id, session_id, position, kind, state, created_at
|
||||
FROM session_panes WHERE id = ${req.params.id}
|
||||
`;
|
||||
if (paneRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'pane not found' };
|
||||
}
|
||||
const pane = paneRows[0]!;
|
||||
const sid = pane.session_id;
|
||||
const oldPos = pane.position;
|
||||
|
||||
// Apply position and/or state changes atomically
|
||||
let patchError: string | null = null;
|
||||
await sql.begin(async (tx) => {
|
||||
if (position !== undefined) {
|
||||
const countRows = await tx<{ n: number }[]>`
|
||||
SELECT COUNT(*)::int AS n FROM session_panes WHERE session_id = ${sid}
|
||||
`;
|
||||
const count = countRows[0]?.n ?? 0;
|
||||
if (position < 0 || position >= count) {
|
||||
throw `position must be between 0 and ${count - 1}`;
|
||||
}
|
||||
}
|
||||
if (position !== undefined && position !== oldPos) {
|
||||
await movePane(tx, req.params.id, sid, oldPos, position);
|
||||
}
|
||||
if (state !== undefined) {
|
||||
await tx`
|
||||
UPDATE session_panes SET state = ${JSON.stringify(state)}::jsonb
|
||||
WHERE id = ${req.params.id}
|
||||
`;
|
||||
}
|
||||
}).catch((err: unknown) => {
|
||||
if (typeof err === 'string') {
|
||||
patchError = err;
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
});
|
||||
|
||||
if (patchError !== null) {
|
||||
reply.code(400);
|
||||
return { error: patchError };
|
||||
}
|
||||
|
||||
const [updated] = await sql<Pane[]>`
|
||||
SELECT id, session_id, position, kind, state, created_at
|
||||
FROM session_panes WHERE id = ${req.params.id}
|
||||
`;
|
||||
return updated as Pane;
|
||||
}
|
||||
);
|
||||
|
||||
// DELETE /api/panes/:id — delete a pane, shift remaining down
|
||||
app.delete<{ Params: { id: string } }>(
|
||||
'/api/panes/:id',
|
||||
async (req, reply) => {
|
||||
const paneRows = await sql<{ id: string; session_id: string; position: number }[]>`
|
||||
SELECT id, session_id, position FROM session_panes WHERE id = ${req.params.id}
|
||||
`;
|
||||
if (paneRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'pane not found' };
|
||||
}
|
||||
const { session_id: sid, position: P } = paneRows[0]!;
|
||||
|
||||
await sql.begin(async (tx) => {
|
||||
await tx`DELETE FROM session_panes WHERE id = ${req.params.id}`;
|
||||
await tx`UPDATE session_panes SET position = -position
|
||||
WHERE session_id = ${sid} AND position > ${P}`;
|
||||
await tx`UPDATE session_panes SET position = -position - 1
|
||||
WHERE session_id = ${sid} AND position < 0`;
|
||||
});
|
||||
|
||||
reply.code(204);
|
||||
return null;
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import type { Sql } from '../db.js';
|
||||
import type { Config } from '../config.js';
|
||||
import type { Broker } from '../services/broker.js';
|
||||
import type { Project, AvailableProject } from '../types/api.js';
|
||||
import { requireUser } from '../auth.js';
|
||||
import { resolveProjectRoot, PathScopeError } from '../services/path_guard.js';
|
||||
import { listDir, viewFile } from '../services/file_ops.js';
|
||||
import { getProjectFiles } from '../services/file_index.js';
|
||||
@@ -77,7 +76,7 @@ export function registerProjectRoutes(
|
||||
VALUES (${name}, ${resolved.real})
|
||||
RETURNING id, name, path, added_at, last_session_id
|
||||
`;
|
||||
broker.publishUser(requireUser(req), { type: 'project_created', project: row as unknown as Project });
|
||||
broker.publishUser('default', { type: 'project_created', project: row as unknown as Project });
|
||||
reply.code(201);
|
||||
return row;
|
||||
} catch (err) {
|
||||
@@ -96,7 +95,7 @@ export function registerProjectRoutes(
|
||||
reply.code(404);
|
||||
return { error: 'not found' };
|
||||
}
|
||||
broker.publishUser(requireUser(req), { type: 'project_deleted', project_id: id });
|
||||
broker.publishUser('default', { type: 'project_deleted', project_id: id });
|
||||
reply.code(204);
|
||||
return null;
|
||||
});
|
||||
|
||||
@@ -5,7 +5,6 @@ import type { Config } from '../config.js';
|
||||
import type { Broker } from '../services/broker.js';
|
||||
import type { Session } from '../types/api.js';
|
||||
import { getSetting } from './settings.js';
|
||||
import { requireUser } from '../auth.js';
|
||||
|
||||
const CreateBody = z.object({
|
||||
name: z.string().min(1).max(200).optional(),
|
||||
@@ -31,7 +30,7 @@ export function registerSessionRoutes(
|
||||
config: Config,
|
||||
broker: Broker
|
||||
): void {
|
||||
app.get<{ Params: { id: string } }>(
|
||||
app.get<{ Params: { id: string }; Querystring: { status?: string } }>(
|
||||
'/api/projects/:id/sessions',
|
||||
async (req, reply) => {
|
||||
const project = await sql`SELECT id FROM projects WHERE id = ${req.params.id}`;
|
||||
@@ -39,10 +38,11 @@ export function registerSessionRoutes(
|
||||
reply.code(404);
|
||||
return { error: 'project not found' };
|
||||
}
|
||||
const status = req.query.status === 'archived' ? 'archived' : 'open';
|
||||
const rows = await sql<Session[]>`
|
||||
SELECT id, project_id, name, model, system_prompt, created_at, updated_at
|
||||
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at
|
||||
FROM sessions
|
||||
WHERE project_id = ${req.params.id}
|
||||
WHERE project_id = ${req.params.id} AND status = ${status}
|
||||
ORDER BY updated_at DESC
|
||||
`;
|
||||
return rows;
|
||||
@@ -81,15 +81,15 @@ export function registerSessionRoutes(
|
||||
const [session] = await tx<Session[]>`
|
||||
INSERT INTO sessions (project_id, name, model, system_prompt)
|
||||
VALUES (${req.params.id}, ${name}, ${model}, ${systemPrompt})
|
||||
RETURNING id, project_id, name, model, system_prompt, created_at, updated_at
|
||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
||||
`;
|
||||
await tx`
|
||||
INSERT INTO session_panes (session_id, position, kind, state)
|
||||
VALUES (${session!.id}, 0, 'chat', '{}'::jsonb)
|
||||
INSERT INTO chats (session_id, name, status)
|
||||
VALUES (${session!.id}, NULL, 'open')
|
||||
`;
|
||||
return session!;
|
||||
});
|
||||
broker.publishUser(requireUser(req), {
|
||||
broker.publishUser('default', {
|
||||
type: 'session_created',
|
||||
session: row,
|
||||
project_id: row.project_id,
|
||||
@@ -101,7 +101,7 @@ export function registerSessionRoutes(
|
||||
|
||||
app.get<{ Params: { id: string } }>('/api/sessions/:id', async (req, reply) => {
|
||||
const rows = await sql<Session[]>`
|
||||
SELECT id, project_id, name, model, system_prompt, created_at, updated_at
|
||||
SELECT id, project_id, name, model, system_prompt, status, created_at, updated_at
|
||||
FROM sessions WHERE id = ${req.params.id}
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
@@ -128,7 +128,7 @@ export function registerSessionRoutes(
|
||||
system_prompt = COALESCE(${system_prompt ?? null}, system_prompt),
|
||||
updated_at = clock_timestamp()
|
||||
WHERE id = ${req.params.id}
|
||||
RETURNING id, project_id, name, model, system_prompt, created_at, updated_at
|
||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
@@ -138,6 +138,51 @@ export function registerSessionRoutes(
|
||||
}
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/archive',
|
||||
async (req, reply) => {
|
||||
const rows = await sql<{ id: string; project_id: string }[]>`
|
||||
UPDATE sessions SET status = 'archived', updated_at = clock_timestamp()
|
||||
WHERE id = ${req.params.id} AND status = 'open'
|
||||
RETURNING id, project_id
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found or already archived' };
|
||||
}
|
||||
broker.publishUser('default', {
|
||||
type: 'session_archived',
|
||||
session_id: rows[0]!.id,
|
||||
project_id: rows[0]!.project_id,
|
||||
});
|
||||
reply.code(204);
|
||||
return null;
|
||||
}
|
||||
);
|
||||
|
||||
app.post<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id/unarchive',
|
||||
async (req, reply) => {
|
||||
const rows = await sql<Session[]>`
|
||||
UPDATE sessions SET status = 'open', updated_at = clock_timestamp()
|
||||
WHERE id = ${req.params.id} AND status = 'archived'
|
||||
RETURNING id, project_id, name, model, system_prompt, status, created_at, updated_at
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found or not archived' };
|
||||
}
|
||||
const session = rows[0]!;
|
||||
broker.publishUser('default', {
|
||||
type: 'session_created',
|
||||
session: session,
|
||||
project_id: session.project_id,
|
||||
});
|
||||
reply.code(200);
|
||||
return session;
|
||||
}
|
||||
);
|
||||
|
||||
app.delete<{ Params: { id: string } }>(
|
||||
'/api/sessions/:id',
|
||||
async (req, reply) => {
|
||||
@@ -150,7 +195,7 @@ export function registerSessionRoutes(
|
||||
return { error: 'not found' };
|
||||
}
|
||||
const project_id = deleted[0]!.project_id;
|
||||
broker.publishUser(requireUser(req), { type: 'session_deleted', session_id: id, project_id });
|
||||
broker.publishUser('default', { type: 'session_deleted', session_id: id, project_id });
|
||||
reply.code(204);
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -20,14 +20,14 @@ export function registerSidebarRoutes(app: FastifyInstance, sql: Sql): void {
|
||||
sql<SidebarSession[]>`
|
||||
SELECT id, project_id, name, model, updated_at
|
||||
FROM sessions
|
||||
WHERE project_id = ${p.id}
|
||||
WHERE project_id = ${p.id} AND status = 'open'
|
||||
ORDER BY updated_at DESC
|
||||
LIMIT 6
|
||||
`,
|
||||
sql<{ n: number }[]>`
|
||||
SELECT COUNT(*)::int AS n
|
||||
FROM sessions
|
||||
WHERE project_id = ${p.id}
|
||||
WHERE project_id = ${p.id} AND status = 'open'
|
||||
`,
|
||||
]);
|
||||
return {
|
||||
|
||||
@@ -22,7 +22,7 @@ export function registerWebSocket(
|
||||
}
|
||||
|
||||
const messages = await sql<Message[]>`
|
||||
SELECT id, session_id, role, content, tool_calls, tool_results, status, last_seq,
|
||||
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
|
||||
FROM messages
|
||||
WHERE session_id = ${sessionId}
|
||||
@@ -44,15 +44,8 @@ export function registerWebSocket(
|
||||
}
|
||||
);
|
||||
|
||||
app.get('/api/ws/user', { websocket: true }, async (socket, req) => {
|
||||
const user = req.user;
|
||||
// defensive: global auth hook (auth.ts) already rejects unauthenticated /api/* requests;
|
||||
// keep the explicit check here to close the WS cleanly (1008) rather than throwing.
|
||||
if (!user) {
|
||||
socket.close(1008, 'unauthenticated');
|
||||
return;
|
||||
}
|
||||
// No snapshot — user channel is purely live updates.
|
||||
app.get('/api/ws/user', { websocket: true }, async (socket) => {
|
||||
const user = 'default';
|
||||
const unsubscribe = broker.subscribeUser(user, (frame) => {
|
||||
if (socket.readyState !== socket.OPEN) return;
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user