v2.2-paseo-providers: Paseo provider stack + v2.2.1 pane-scoped chat fixes
Ship Paseo-equivalent provider snapshot, AgentComposerBar, ACP dispatch rewrite with streaming/persist, permission prompts, and agent commands. Follow-up: pane-scoped chat resolution, CoderMessageList tool timeline, WS user-delta replace, and inference orphan tool_call stripping. Archive openspec v2-2; update CHANGELOG and CURRENT. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -3,12 +3,16 @@ import { z } from 'zod';
|
||||
import type { Sql } from '../db.js';
|
||||
import type { Broker } from '@boocode/server/broker';
|
||||
import type { WsFrame } from '@boocode/server/ws-frames';
|
||||
import { resolveChatId } from './chat-resolve.js';
|
||||
|
||||
const SendBody = z.object({
|
||||
content: z.string().min(1).max(64_000),
|
||||
pane_id: z.string().min(1).max(200),
|
||||
chat_id: z.string().uuid().optional(),
|
||||
provider: z.string().max(100).optional(),
|
||||
model: z.string().max(200).optional(),
|
||||
mode_id: z.string().max(200).optional(),
|
||||
thinking_option_id: z.string().max(200).optional(),
|
||||
});
|
||||
|
||||
interface InferenceApi {
|
||||
@@ -17,12 +21,100 @@ interface InferenceApi {
|
||||
hasActive: (chatId: string) => boolean;
|
||||
}
|
||||
|
||||
interface MessageRow {
|
||||
id: string;
|
||||
role: string;
|
||||
content: string | null;
|
||||
status: string | null;
|
||||
tool_calls: Array<{ id: string; name: string; args?: Record<string, unknown> }> | null;
|
||||
tool_results: {
|
||||
tool_call_id: string;
|
||||
output: unknown;
|
||||
truncated?: boolean;
|
||||
error?: string;
|
||||
} | null;
|
||||
reasoning_parts: Array<{ text?: string }> | null;
|
||||
}
|
||||
|
||||
function mapCoderMessageRow(row: MessageRow) {
|
||||
if (row.role === 'tool') {
|
||||
if (!row.tool_results?.tool_call_id) return null;
|
||||
return {
|
||||
id: row.id,
|
||||
role: 'tool' as const,
|
||||
tool_results: row.tool_results,
|
||||
};
|
||||
}
|
||||
if (row.role !== 'user' && row.role !== 'assistant' && row.role !== 'system') {
|
||||
return null;
|
||||
}
|
||||
const tool_calls = row.tool_calls?.map((tc) => ({
|
||||
id: tc.id,
|
||||
function: {
|
||||
name: tc.name,
|
||||
arguments: JSON.stringify(tc.args ?? {}),
|
||||
},
|
||||
}));
|
||||
const reasoningText = row.reasoning_parts?.map((p) => p.text ?? '').join('') ?? '';
|
||||
return {
|
||||
id: row.id,
|
||||
role: row.role as 'user' | 'assistant' | 'system',
|
||||
content: row.content ?? '',
|
||||
status: (row.status ?? 'complete') as 'streaming' | 'complete' | 'failed',
|
||||
...(reasoningText ? { reasoning_text: reasoningText } : {}),
|
||||
...(tool_calls?.length ? { tool_calls } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
export function registerMessageRoutes(
|
||||
app: FastifyInstance,
|
||||
sql: Sql,
|
||||
broker: Broker,
|
||||
inference: InferenceApi,
|
||||
): void {
|
||||
// GET /api/sessions/:sessionId/messages — hydrate CoderPane on load / reconnect
|
||||
app.get<{ Params: { sessionId: string }; Querystring: { chat_id?: string } }>(
|
||||
'/api/sessions/:sessionId/messages',
|
||||
async (req, reply) => {
|
||||
const sessionId = req.params.sessionId;
|
||||
const chatId = req.query.chat_id;
|
||||
const sessionRows = await sql<{ id: string }[]>`
|
||||
SELECT id FROM sessions WHERE id = ${sessionId}
|
||||
`;
|
||||
if (sessionRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
|
||||
if (chatId) {
|
||||
const chatRows = await sql<{ id: string }[]>`
|
||||
SELECT id FROM chats
|
||||
WHERE id = ${chatId} AND session_id = ${sessionId} AND status = 'open'
|
||||
`;
|
||||
if (chatRows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'chat not found or not open in this session' };
|
||||
}
|
||||
}
|
||||
|
||||
const rows = chatId
|
||||
? await sql<MessageRow[]>`
|
||||
SELECT id, role, content, status, tool_calls, tool_results, reasoning_parts
|
||||
FROM messages_with_parts
|
||||
WHERE session_id = ${sessionId} AND chat_id = ${chatId}
|
||||
ORDER BY created_at ASC, id ASC
|
||||
`
|
||||
: await sql<MessageRow[]>`
|
||||
SELECT id, role, content, status, tool_calls, tool_results, reasoning_parts
|
||||
FROM messages_with_parts
|
||||
WHERE session_id = ${sessionId}
|
||||
ORDER BY created_at ASC, id ASC
|
||||
`;
|
||||
|
||||
return rows.map(mapCoderMessageRow).filter((m) => m !== null);
|
||||
},
|
||||
);
|
||||
|
||||
// POST /api/sessions/:sessionId/messages — send a user message + kick off inference
|
||||
app.post<{ Params: { sessionId: string } }>(
|
||||
'/api/sessions/:sessionId/messages',
|
||||
@@ -34,7 +126,8 @@ export function registerMessageRoutes(
|
||||
}
|
||||
|
||||
const sessionId = req.params.sessionId;
|
||||
const { content, chat_id: explicitChatId, provider, model } = parsed.data;
|
||||
const { content, pane_id, chat_id: explicitChatId, provider, model, mode_id, thinking_option_id } =
|
||||
parsed.data;
|
||||
const isExternal = provider && provider !== 'boocode';
|
||||
|
||||
// Validate session exists
|
||||
@@ -46,8 +139,13 @@ export function registerMessageRoutes(
|
||||
return { error: 'session not found' };
|
||||
}
|
||||
|
||||
// Resolve chat_id: use explicit value or find/create a default chat
|
||||
let chatId: string;
|
||||
const resolved = await resolveChatId(sql, sessionId, pane_id);
|
||||
if (!resolved) {
|
||||
reply.code(404);
|
||||
return { error: 'pane not found' };
|
||||
}
|
||||
|
||||
let chatId = resolved;
|
||||
if (explicitChatId) {
|
||||
const chatRows = await sql<{ id: string }[]>`
|
||||
SELECT id FROM chats WHERE id = ${explicitChatId} AND session_id = ${sessionId} AND status = 'open'
|
||||
@@ -57,20 +155,6 @@ export function registerMessageRoutes(
|
||||
return { error: 'chat not found or not open in this session' };
|
||||
}
|
||||
chatId = explicitChatId;
|
||||
} else {
|
||||
const existing = await sql<{ id: string }[]>`
|
||||
SELECT id FROM chats WHERE session_id = ${sessionId} AND status = 'open' ORDER BY created_at LIMIT 1
|
||||
`;
|
||||
if (existing.length > 0) {
|
||||
chatId = existing[0]!.id;
|
||||
} else {
|
||||
const [newChat] = await sql<{ id: string }[]>`
|
||||
INSERT INTO chats (session_id, name, status)
|
||||
VALUES (${sessionId}, 'Chat', 'open')
|
||||
RETURNING id
|
||||
`;
|
||||
chatId = newChat!.id;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isExternal) {
|
||||
@@ -113,8 +197,8 @@ export function registerMessageRoutes(
|
||||
// External provider: create a task for the dispatcher
|
||||
const projectId = sessionRows[0]!.project_id;
|
||||
const [task] = await sql<{ id: string; state: string }[]>`
|
||||
INSERT INTO tasks (project_id, input, agent, model, session_id)
|
||||
VALUES (${projectId}, ${content}, ${provider}, ${model ?? null}, ${sessionId})
|
||||
INSERT INTO tasks (project_id, input, agent, model, mode_id, thinking_option_id, session_id)
|
||||
VALUES (${projectId}, ${content}, ${provider}, ${model ?? null}, ${mode_id ?? null}, ${thinking_option_id ?? null}, ${sessionId})
|
||||
RETURNING id, state
|
||||
`;
|
||||
reply.code(202);
|
||||
|
||||
Reference in New Issue
Block a user