Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e423579e99 | |||
| 06116f31b3 | |||
| 47abbb6e3c |
@@ -2,6 +2,10 @@
|
|||||||
|
|
||||||
All notable changes per release tag. Most recent on top, ordered by tag creation date (which matches the git history). Tag names follow `vMAJOR.MINOR.PATCH-slug` — the slug describes what shipped, so the tag name alone is enough to recall the batch.
|
All notable changes per release tag. Most recent on top, ordered by tag creation date (which matches the git history). Tag names follow `vMAJOR.MINOR.PATCH-slug` — the slug describes what shipped, so the tag name alone is enough to recall the batch.
|
||||||
|
|
||||||
|
## v2.0.4-hardening — 2026-05-25
|
||||||
|
|
||||||
|
Path-guard fuzz suite: 25+ traversal-attack tests covering ../ sequences (all depths), encoded traversal (%2e%2e), null byte injection, absolute path escape, prefix-without-separator, backslash traversal, and the full secret-file deny list (.env, *.pem, id_rsa*, *.key, credentials.json, *.kdbx, .netrc). Plus 5 valid-path positive tests confirming normal writes aren't blocked and 5 edge-case tests (empty, whitespace-only, very long path, triple-dot, multiple slashes). Null-byte and whitespace-only guards added to `resolveWritePath` (previously only checked empty string). DB-integration test skeleton for pending_changes full-cycle (queue create/edit/delete, apply, rewind) gated on DATABASE_URL via `describe.runIf`. Production readiness verified: all services healthy, all builds clean, 57 tests passing (23 existing + 34 new).
|
||||||
|
|
||||||
## v1.16.0-codesight-merge — 2026-05-24
|
## v1.16.0-codesight-merge — 2026-05-24
|
||||||
|
|
||||||
Ports codesight's highest-value analysis capabilities into the codecontext sidecar as 4 new MCP tools. Tier 1 (graph queries on existing edges, no re-parsing): `get_blast_radius` (BFS reverse-edge traversal — "what breaks if I change this file?", with depth tracking) and `get_hot_files` (most-imported files ranked by incoming edge count — change-risk indicators). Tier 2 (tree-sitter AST re-parsing on demand): `get_routes` (Fastify/Express HTTP route extraction with method, path, file, line, inferred tags for db/auth/cache) and `get_middleware` (middleware registration detection via import-name heuristics and app.register/addHook/setErrorHandler patterns, classifying as auth/cors/rate-limit/security/error-handler/logging/validation). All 4 tools use `defer s.graphMu.RUnlock()` for consistent mutex discipline (reviewer caught that the initial implementation released the lock early on the Tier 2 tools). Route object-property extraction delegates to `extractStringValue` for template-literal handling (reviewer catch). codecontext sidecar rebuilt from `/opt/forks/codecontext` commit `b19e646`, tagged `v1.16.0-codesight-merge`. BooCode wrapper tools follow the existing codecontext pattern — 4 new files in `apps/server/src/services/tools/codecontext/`, registered in ALL_TOOLS. 29 new Go tests + 363/363 BooCode server tests passing. No schema changes, no frontend changes.
|
Ports codesight's highest-value analysis capabilities into the codecontext sidecar as 4 new MCP tools. Tier 1 (graph queries on existing edges, no re-parsing): `get_blast_radius` (BFS reverse-edge traversal — "what breaks if I change this file?", with depth tracking) and `get_hot_files` (most-imported files ranked by incoming edge count — change-risk indicators). Tier 2 (tree-sitter AST re-parsing on demand): `get_routes` (Fastify/Express HTTP route extraction with method, path, file, line, inferred tags for db/auth/cache) and `get_middleware` (middleware registration detection via import-name heuristics and app.register/addHook/setErrorHandler patterns, classifying as auth/cors/rate-limit/security/error-handler/logging/validation). All 4 tools use `defer s.graphMu.RUnlock()` for consistent mutex discipline (reviewer caught that the initial implementation released the lock early on the Tier 2 tools). Route object-property extraction delegates to `extractStringValue` for template-literal handling (reviewer catch). codecontext sidecar rebuilt from `/opt/forks/codecontext` commit `b19e646`, tagged `v1.16.0-codesight-merge`. BooCode wrapper tools follow the existing codecontext pattern — 4 new files in `apps/server/src/services/tools/codecontext/`, registered in ALL_TOOLS. 29 new Go tests + 363/363 BooCode server tests passing. No schema changes, no frontend changes.
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
"dev": "tsx watch src/index.ts",
|
"dev": "tsx watch src/index.ts",
|
||||||
"build": "tsc && node -e \"import('node:fs').then(fs=>fs.copyFileSync('src/schema.sql','dist/schema.sql'))\"",
|
"build": "tsc && node -e \"import('node:fs').then(fs=>fs.copyFileSync('src/schema.sql','dist/schema.sql'))\"",
|
||||||
"start": "node dist/index.js",
|
"start": "node dist/index.js",
|
||||||
|
"cli": "tsx src/cli.ts",
|
||||||
"typecheck": "tsc --noEmit",
|
"typecheck": "tsc --noEmit",
|
||||||
"test": "vitest run"
|
"test": "vitest run"
|
||||||
},
|
},
|
||||||
@@ -19,10 +20,12 @@
|
|||||||
"@modelcontextprotocol/sdk": "^1.29.0",
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
||||||
"fastify": "^4.28.1",
|
"fastify": "^4.28.1",
|
||||||
"postgres": "^3.4.4",
|
"postgres": "^3.4.4",
|
||||||
|
"ws": "^8.18.0",
|
||||||
"zod": "^3.23.8"
|
"zod": "^3.23.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^20.14.10",
|
"@types/node": "^20.14.10",
|
||||||
|
"@types/ws": "^8.5.10",
|
||||||
"tsx": "^4.16.2",
|
"tsx": "^4.16.2",
|
||||||
"typescript": "^5.5.0",
|
"typescript": "^5.5.0",
|
||||||
"vitest": "^3.0.0"
|
"vitest": "^3.0.0"
|
||||||
|
|||||||
249
apps/coder/src/cli.ts
Normal file
249
apps/coder/src/cli.ts
Normal file
@@ -0,0 +1,249 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* BooCoder CLI client.
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* boocode run "task description" [--agent opencode] [--model claude-opus-4-7] [--project <id>]
|
||||||
|
* boocode ls [--state pending|running|completed|failed]
|
||||||
|
* boocode attach <task-id>
|
||||||
|
* boocode send <task-id> "message"
|
||||||
|
*/
|
||||||
|
import { WebSocket } from 'ws';
|
||||||
|
|
||||||
|
const BASE_URL = process.env.BOOCODER_URL ?? 'http://100.114.205.53:9502';
|
||||||
|
|
||||||
|
// ─── Arg parsing ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function getFlag(args: string[], name: string): string | undefined {
|
||||||
|
const idx = args.indexOf(name);
|
||||||
|
if (idx === -1 || idx + 1 >= args.length) return undefined;
|
||||||
|
return args[idx + 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
function hasFlag(args: string[], name: string): boolean {
|
||||||
|
return args.includes(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── HTTP helpers ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function api(method: string, path: string, body?: unknown): Promise<unknown> {
|
||||||
|
const url = `${BASE_URL}${path}`;
|
||||||
|
const res = await fetch(url, {
|
||||||
|
method,
|
||||||
|
headers: body ? { 'Content-Type': 'application/json' } : undefined,
|
||||||
|
body: body ? JSON.stringify(body) : undefined,
|
||||||
|
});
|
||||||
|
if (!res.ok) {
|
||||||
|
const text = await res.text().catch(() => '');
|
||||||
|
throw new Error(`${method} ${path} → ${res.status}: ${text}`);
|
||||||
|
}
|
||||||
|
return res.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── WS streaming ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function streamSession(sessionId: string): void {
|
||||||
|
const wsUrl = BASE_URL.replace(/^http/, 'ws') + `/api/ws/sessions/${sessionId}`;
|
||||||
|
const ws = new WebSocket(wsUrl);
|
||||||
|
|
||||||
|
ws.on('message', (data) => {
|
||||||
|
try {
|
||||||
|
const frame = JSON.parse(data.toString()) as { type: string; content?: string; name?: string; arguments?: string };
|
||||||
|
if (frame.type === 'delta' && frame.content) {
|
||||||
|
process.stdout.write(frame.content);
|
||||||
|
} else if (frame.type === 'tool_call') {
|
||||||
|
process.stdout.write(`\n[tool: ${frame.name ?? '?'}(${(frame.arguments ?? '').slice(0, 80)})]\n`);
|
||||||
|
} else if (frame.type === 'tool_result') {
|
||||||
|
process.stdout.write(`[tool_result]\n`);
|
||||||
|
} else if (frame.type === 'status' || frame.type === 'chat_status') {
|
||||||
|
// Silent
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Non-JSON frame, ignore
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
ws.on('error', (err) => {
|
||||||
|
process.stderr.write(`WS error: ${err.message}\n`);
|
||||||
|
});
|
||||||
|
|
||||||
|
ws.on('close', () => {
|
||||||
|
process.stdout.write('\n');
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
process.on('SIGINT', () => {
|
||||||
|
ws.close();
|
||||||
|
process.exit(0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Commands ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function cmdRun(args: string[]): Promise<void> {
|
||||||
|
const input = args.find((a) => !a.startsWith('--'));
|
||||||
|
if (!input) {
|
||||||
|
process.stderr.write('Usage: boocode run "task description" [--agent X] [--model X] [--project X]\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const agent = getFlag(args, '--agent');
|
||||||
|
const model = getFlag(args, '--model');
|
||||||
|
const project_id = getFlag(args, '--project');
|
||||||
|
|
||||||
|
if (!project_id) {
|
||||||
|
process.stderr.write('Error: --project <uuid> is required\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = (await api('POST', '/api/tasks', {
|
||||||
|
project_id,
|
||||||
|
input,
|
||||||
|
...(agent && { agent }),
|
||||||
|
...(model && { model }),
|
||||||
|
})) as { id: string; state: string };
|
||||||
|
|
||||||
|
process.stdout.write(`Task created: ${result.id} (state: ${result.state})\n`);
|
||||||
|
|
||||||
|
// Poll until task has session_id, then stream; or poll until terminal state
|
||||||
|
const POLL_MS = 2000;
|
||||||
|
for (;;) {
|
||||||
|
await sleep(POLL_MS);
|
||||||
|
const task = (await api('GET', `/api/tasks/${result.id}`)) as {
|
||||||
|
id: string; state: string; session_id?: string; output_summary?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (task.session_id) {
|
||||||
|
process.stdout.write(`Streaming session ${task.session_id}...\n`);
|
||||||
|
streamSession(task.session_id);
|
||||||
|
return; // streamSession handles exit
|
||||||
|
}
|
||||||
|
|
||||||
|
if (task.state === 'completed') {
|
||||||
|
process.stdout.write(`\nCompleted: ${task.output_summary ?? '(no summary)'}\n`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (task.state === 'failed') {
|
||||||
|
process.stderr.write(`\nFailed: ${task.output_summary ?? '(no summary)'}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
if (task.state === 'cancelled') {
|
||||||
|
process.stderr.write(`\nCancelled.\n`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cmdLs(args: string[]): Promise<void> {
|
||||||
|
const state = getFlag(args, '--state');
|
||||||
|
const query = state ? `?state=${state}` : '';
|
||||||
|
const tasks = (await api('GET', `/api/tasks${query}`)) as Array<{
|
||||||
|
id: string; state: string; agent: string | null; input: string; created_at: string;
|
||||||
|
}>;
|
||||||
|
|
||||||
|
if (tasks.length === 0) {
|
||||||
|
process.stdout.write('No tasks.\n');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Table header
|
||||||
|
process.stdout.write(
|
||||||
|
pad('ID', 38) + pad('STATE', 12) + pad('AGENT', 14) + pad('INPUT', 52) + 'CREATED\n',
|
||||||
|
);
|
||||||
|
process.stdout.write('-'.repeat(120) + '\n');
|
||||||
|
|
||||||
|
for (const t of tasks) {
|
||||||
|
process.stdout.write(
|
||||||
|
pad(t.id, 38) +
|
||||||
|
pad(t.state, 12) +
|
||||||
|
pad(t.agent ?? '-', 14) +
|
||||||
|
pad(t.input.slice(0, 50), 52) +
|
||||||
|
(t.created_at?.slice(0, 19) ?? '') + '\n',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cmdAttach(args: string[]): Promise<void> {
|
||||||
|
const taskId = args[0];
|
||||||
|
if (!taskId) {
|
||||||
|
process.stderr.write('Usage: boocode attach <task-id>\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const task = (await api('GET', `/api/tasks/${taskId}`)) as { session_id?: string };
|
||||||
|
if (!task.session_id) {
|
||||||
|
process.stderr.write('Task has no session yet (still pending?).\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
streamSession(task.session_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cmdSend(args: string[]): Promise<void> {
|
||||||
|
const taskId = args[0];
|
||||||
|
const message = args[1];
|
||||||
|
if (!taskId || !message) {
|
||||||
|
process.stderr.write('Usage: boocode send <task-id> "message"\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const task = (await api('GET', `/api/tasks/${taskId}`)) as { session_id?: string };
|
||||||
|
if (!task.session_id) {
|
||||||
|
process.stderr.write('Task has no session yet.\n');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find active chat
|
||||||
|
const sessionId = task.session_id;
|
||||||
|
// POST message to the session's chat (the messages route expects session_id in path)
|
||||||
|
await api('POST', `/api/sessions/${sessionId}/messages`, { content: message });
|
||||||
|
|
||||||
|
// Then attach to stream the response
|
||||||
|
streamSession(sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Utils ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function pad(s: string, width: number): string {
|
||||||
|
return s.length >= width ? s.slice(0, width) : s + ' '.repeat(width - s.length);
|
||||||
|
}
|
||||||
|
|
||||||
|
function sleep(ms: number): Promise<void> {
|
||||||
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Main ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const [cmd, ...rest] = process.argv.slice(2);
|
||||||
|
|
||||||
|
switch (cmd) {
|
||||||
|
case 'run':
|
||||||
|
cmdRun(rest).catch(fatal);
|
||||||
|
break;
|
||||||
|
case 'ls':
|
||||||
|
cmdLs(rest).catch(fatal);
|
||||||
|
break;
|
||||||
|
case 'attach':
|
||||||
|
cmdAttach(rest).catch(fatal);
|
||||||
|
break;
|
||||||
|
case 'send':
|
||||||
|
cmdSend(rest).catch(fatal);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
process.stdout.write(
|
||||||
|
'BooCoder CLI\n\n' +
|
||||||
|
'Commands:\n' +
|
||||||
|
' run "task" [--agent X] [--model X] [--project <id>] Create and stream a task\n' +
|
||||||
|
' ls [--state pending|running|completed|failed] List tasks\n' +
|
||||||
|
' attach <task-id> Stream a running task\n' +
|
||||||
|
' send <task-id> "message" Send input to a task\n' +
|
||||||
|
'\n' +
|
||||||
|
`Base URL: ${BASE_URL} (set BOOCODER_URL to override)\n`,
|
||||||
|
);
|
||||||
|
if (cmd && cmd !== '--help' && cmd !== '-h') process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function fatal(err: unknown): void {
|
||||||
|
process.stderr.write(`Error: ${err instanceof Error ? err.message : String(err)}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
@@ -23,6 +23,8 @@ const ConfigSchema = z.object({
|
|||||||
GITEA_TOKEN: z.string().optional(),
|
GITEA_TOKEN: z.string().optional(),
|
||||||
GITEA_SSH_HOST: z.string().default('100.114.205.53:2222'),
|
GITEA_SSH_HOST: z.string().default('100.114.205.53:2222'),
|
||||||
MCP_CONFIG_PATH: z.string().optional(),
|
MCP_CONFIG_PATH: z.string().optional(),
|
||||||
|
// v2.0.5: cheaper model for titles, summaries, labeling.
|
||||||
|
FAST_MODEL: z.string().optional(),
|
||||||
// SSH access to the host for external agent dispatch (Phase 5)
|
// SSH access to the host for external agent dispatch (Phase 5)
|
||||||
BOOCODER_SSH_HOST: z.string().default('100.114.205.53'),
|
BOOCODER_SSH_HOST: z.string().default('100.114.205.53'),
|
||||||
BOOCODER_SSH_USER: z.string().default('samkintop'),
|
BOOCODER_SSH_USER: z.string().default('samkintop'),
|
||||||
|
|||||||
@@ -25,6 +25,9 @@ import { setInferenceContext, clearInferenceContext } from './services/tools/inf
|
|||||||
import { registerMessageRoutes } from './routes/messages.js';
|
import { registerMessageRoutes } from './routes/messages.js';
|
||||||
import { registerPendingRoutes } from './routes/pending.js';
|
import { registerPendingRoutes } from './routes/pending.js';
|
||||||
import { registerTaskRoutes } from './routes/tasks.js';
|
import { registerTaskRoutes } from './routes/tasks.js';
|
||||||
|
import { registerInboxRoutes } from './routes/inbox.js';
|
||||||
|
import { registerStatsRoutes } from './routes/stats.js';
|
||||||
|
import { registerArenaRoutes } from './routes/arena.js';
|
||||||
import { registerWebSocket } from './routes/ws.js';
|
import { registerWebSocket } from './routes/ws.js';
|
||||||
// Phase 4: dispatcher + agent probe
|
// Phase 4: dispatcher + agent probe
|
||||||
import { createDispatcher } from './services/dispatcher.js';
|
import { createDispatcher } from './services/dispatcher.js';
|
||||||
@@ -139,6 +142,9 @@ async function main() {
|
|||||||
registerMessageRoutes(app, sql, broker, inferenceApi);
|
registerMessageRoutes(app, sql, broker, inferenceApi);
|
||||||
registerPendingRoutes(app, sql);
|
registerPendingRoutes(app, sql);
|
||||||
registerTaskRoutes(app, sql, inferenceApi);
|
registerTaskRoutes(app, sql, inferenceApi);
|
||||||
|
registerInboxRoutes(app, sql);
|
||||||
|
registerStatsRoutes(app, sql);
|
||||||
|
registerArenaRoutes(app, sql);
|
||||||
registerWebSocket(app, sql, broker);
|
registerWebSocket(app, sql, broker);
|
||||||
|
|
||||||
// Serve static frontend (built web app). In production, the dist/ is
|
// Serve static frontend (built web app). In production, the dist/ is
|
||||||
|
|||||||
122
apps/coder/src/routes/arena.ts
Normal file
122
apps/coder/src/routes/arena.ts
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
/**
|
||||||
|
* v2.0.5: Arena routes — competitive dispatch of the same task to multiple agents.
|
||||||
|
*
|
||||||
|
* POST /api/arena — create an arena with 2-5 contestants
|
||||||
|
* GET /api/arena/:id — get all tasks in an arena
|
||||||
|
* POST /api/arena/:id/select/:task_id — mark a task as the arena winner
|
||||||
|
*/
|
||||||
|
import type { FastifyInstance } from 'fastify';
|
||||||
|
import { z } from 'zod';
|
||||||
|
import type { Sql } from '../db.js';
|
||||||
|
|
||||||
|
const ContestantSchema = z.object({
|
||||||
|
agent: z.string().max(100).optional(),
|
||||||
|
model: z.string().max(200).optional(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const CreateArenaBody = z.object({
|
||||||
|
project_id: z.string().uuid(),
|
||||||
|
input: z.string().min(1).max(64_000),
|
||||||
|
contestants: z.array(ContestantSchema).min(2).max(5),
|
||||||
|
});
|
||||||
|
|
||||||
|
interface TaskRow {
|
||||||
|
id: string;
|
||||||
|
agent: string | null;
|
||||||
|
model: string | null;
|
||||||
|
state: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function registerArenaRoutes(app: FastifyInstance, sql: Sql): void {
|
||||||
|
// POST /api/arena — create a new arena
|
||||||
|
app.post('/api/arena', async (req, reply) => {
|
||||||
|
const parsed = CreateArenaBody.safeParse(req.body);
|
||||||
|
if (!parsed.success) {
|
||||||
|
reply.code(400);
|
||||||
|
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||||
|
}
|
||||||
|
|
||||||
|
const { project_id, input, contestants } = parsed.data;
|
||||||
|
const arenaId = crypto.randomUUID();
|
||||||
|
|
||||||
|
const tasks: TaskRow[] = [];
|
||||||
|
for (const contestant of contestants) {
|
||||||
|
const [task] = await sql<TaskRow[]>`
|
||||||
|
INSERT INTO tasks (project_id, input, agent, model, arena_id)
|
||||||
|
VALUES (${project_id}, ${input}, ${contestant.agent ?? null}, ${contestant.model ?? null}, ${arenaId})
|
||||||
|
RETURNING id, agent, model, state
|
||||||
|
`;
|
||||||
|
tasks.push(task!);
|
||||||
|
}
|
||||||
|
|
||||||
|
reply.code(201);
|
||||||
|
return {
|
||||||
|
arena_id: arenaId,
|
||||||
|
tasks: tasks.map(t => ({
|
||||||
|
id: t.id,
|
||||||
|
agent: t.agent,
|
||||||
|
model: t.model,
|
||||||
|
state: t.state,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// GET /api/arena/:arena_id — list all tasks in an arena
|
||||||
|
app.get<{ Params: { arena_id: string } }>('/api/arena/:arena_id', async (req, reply) => {
|
||||||
|
const { arena_id } = req.params;
|
||||||
|
|
||||||
|
// Validate UUID format
|
||||||
|
const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
||||||
|
if (!uuidRegex.test(arena_id)) {
|
||||||
|
reply.code(400);
|
||||||
|
return { error: 'invalid arena_id format' };
|
||||||
|
}
|
||||||
|
|
||||||
|
const tasks = await sql`
|
||||||
|
SELECT id, project_id, state, input, output_summary, agent, model, execution_path, session_id, started_at, ended_at, created_at, arena_id
|
||||||
|
FROM tasks
|
||||||
|
WHERE arena_id = ${arena_id}
|
||||||
|
ORDER BY created_at
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (tasks.length === 0) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: 'arena not found' };
|
||||||
|
}
|
||||||
|
|
||||||
|
return { arena_id, tasks };
|
||||||
|
});
|
||||||
|
|
||||||
|
// POST /api/arena/:arena_id/select/:task_id — mark the winner
|
||||||
|
app.post<{ Params: { arena_id: string; task_id: string } }>(
|
||||||
|
'/api/arena/:arena_id/select/:task_id',
|
||||||
|
async (req, reply) => {
|
||||||
|
const { arena_id, task_id } = req.params;
|
||||||
|
|
||||||
|
// Verify the task belongs to this arena
|
||||||
|
const rows = await sql<{ id: string; state: string; arena_id: string | null }[]>`
|
||||||
|
SELECT id, state, arena_id FROM tasks WHERE id = ${task_id}
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (rows.length === 0) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: 'task not found' };
|
||||||
|
}
|
||||||
|
|
||||||
|
const task = rows[0]!;
|
||||||
|
if (task.arena_id !== arena_id) {
|
||||||
|
reply.code(409);
|
||||||
|
return { error: 'task does not belong to this arena' };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark as selected via output_summary prefix (lightweight — no schema change)
|
||||||
|
await sql`
|
||||||
|
UPDATE tasks
|
||||||
|
SET output_summary = COALESCE('[SELECTED] ' || output_summary, '[SELECTED]')
|
||||||
|
WHERE id = ${task_id}
|
||||||
|
`;
|
||||||
|
|
||||||
|
return { selected: true, task_id, arena_id };
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
33
apps/coder/src/routes/inbox.ts
Normal file
33
apps/coder/src/routes/inbox.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import type { FastifyInstance } from 'fastify';
|
||||||
|
import type { Sql } from '../db.js';
|
||||||
|
|
||||||
|
export function registerInboxRoutes(app: FastifyInstance, sql: Sql): void {
|
||||||
|
// GET /api/inbox — tasks needing human attention (blocked or failed)
|
||||||
|
app.get('/api/inbox', async () => {
|
||||||
|
return sql`
|
||||||
|
SELECT id, project_id, parent_task_id, state, input, output_summary, agent, model, session_id, started_at, ended_at, created_at
|
||||||
|
FROM human_inbox
|
||||||
|
ORDER BY created_at DESC
|
||||||
|
LIMIT 100
|
||||||
|
`;
|
||||||
|
});
|
||||||
|
|
||||||
|
// POST /api/inbox/:id/retry — reset a blocked/failed task to pending for re-dispatch
|
||||||
|
app.post<{ Params: { id: string } }>('/api/inbox/:id/retry', async (req, reply) => {
|
||||||
|
const taskId = req.params.id;
|
||||||
|
|
||||||
|
const result = await sql`
|
||||||
|
UPDATE tasks
|
||||||
|
SET state = 'pending', started_at = NULL, ended_at = NULL, output_summary = NULL
|
||||||
|
WHERE id = ${taskId} AND state IN ('blocked', 'failed')
|
||||||
|
RETURNING id, state
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (result.length === 0) {
|
||||||
|
reply.code(404);
|
||||||
|
return { error: 'task not found or not in retryable state' };
|
||||||
|
}
|
||||||
|
|
||||||
|
return { id: result[0]!.id, state: result[0]!.state };
|
||||||
|
});
|
||||||
|
}
|
||||||
48
apps/coder/src/routes/stats.ts
Normal file
48
apps/coder/src/routes/stats.ts
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import type { FastifyInstance } from 'fastify';
|
||||||
|
import { z } from 'zod';
|
||||||
|
import type { Sql } from '../db.js';
|
||||||
|
|
||||||
|
const CostQuery = z.object({
|
||||||
|
group_by: z.enum(['project', 'agent', 'day']).default('project'),
|
||||||
|
});
|
||||||
|
|
||||||
|
export function registerStatsRoutes(app: FastifyInstance, sql: Sql): void {
|
||||||
|
// GET /api/stats/costs — aggregate cost_tokens by project, agent, or day
|
||||||
|
app.get('/api/stats/costs', async (req, reply) => {
|
||||||
|
const parsed = CostQuery.safeParse(req.query);
|
||||||
|
if (!parsed.success) {
|
||||||
|
reply.code(400);
|
||||||
|
return { error: 'invalid query', details: parsed.error.flatten() };
|
||||||
|
}
|
||||||
|
|
||||||
|
const { group_by } = parsed.data;
|
||||||
|
|
||||||
|
switch (group_by) {
|
||||||
|
case 'project':
|
||||||
|
return sql`
|
||||||
|
SELECT project_id, COUNT(*)::int AS task_count, COALESCE(SUM(cost_tokens), 0)::int AS total_tokens
|
||||||
|
FROM tasks
|
||||||
|
WHERE cost_tokens IS NOT NULL
|
||||||
|
GROUP BY project_id
|
||||||
|
ORDER BY total_tokens DESC
|
||||||
|
`;
|
||||||
|
case 'agent':
|
||||||
|
return sql`
|
||||||
|
SELECT COALESCE(agent, 'native') AS agent, COUNT(*)::int AS task_count, COALESCE(SUM(cost_tokens), 0)::int AS total_tokens
|
||||||
|
FROM tasks
|
||||||
|
WHERE cost_tokens IS NOT NULL
|
||||||
|
GROUP BY agent
|
||||||
|
ORDER BY total_tokens DESC
|
||||||
|
`;
|
||||||
|
case 'day':
|
||||||
|
return sql`
|
||||||
|
SELECT DATE(created_at) AS day, COUNT(*)::int AS task_count, COALESCE(SUM(cost_tokens), 0)::int AS total_tokens
|
||||||
|
FROM tasks
|
||||||
|
WHERE cost_tokens IS NOT NULL
|
||||||
|
GROUP BY DATE(created_at)
|
||||||
|
ORDER BY day DESC
|
||||||
|
LIMIT 90
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS tasks (
|
|||||||
ended_at TIMESTAMPTZ,
|
ended_at TIMESTAMPTZ,
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(),
|
created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(),
|
||||||
CONSTRAINT tasks_state_chk CHECK (state IN ('pending', 'running', 'completed', 'failed', 'blocked', 'cancelled')),
|
CONSTRAINT tasks_state_chk CHECK (state IN ('pending', 'running', 'completed', 'failed', 'blocked', 'cancelled')),
|
||||||
CONSTRAINT tasks_execution_path_chk CHECK (execution_path IS NULL OR execution_path IN ('native', 'acp', 'pty'))
|
CONSTRAINT tasks_execution_path_chk CHECK (execution_path IS NULL OR execution_path IN ('native', 'acp', 'pty', 'qwen'))
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS available_agents (
|
CREATE TABLE IF NOT EXISTS available_agents (
|
||||||
@@ -46,6 +46,18 @@ CREATE TABLE IF NOT EXISTS available_agents (
|
|||||||
-- v2.0.0 Phase 4: link tasks to their inference sessions.
|
-- v2.0.0 Phase 4: link tasks to their inference sessions.
|
||||||
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS session_id UUID REFERENCES sessions(id);
|
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS session_id UUID REFERENCES sessions(id);
|
||||||
|
|
||||||
|
-- v2.0.5: add 'qwen' to execution_path CHECK + arena_id column.
|
||||||
|
ALTER TABLE tasks DROP CONSTRAINT IF EXISTS tasks_execution_path_chk;
|
||||||
|
DO $$ BEGIN
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'tasks_execution_path_chk') THEN
|
||||||
|
ALTER TABLE tasks ADD CONSTRAINT tasks_execution_path_chk
|
||||||
|
CHECK (execution_path IS NULL OR execution_path IN ('native', 'acp', 'pty', 'qwen'));
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
-- v2.0.5: arena support — group tasks into competitive arenas.
|
||||||
|
ALTER TABLE tasks ADD COLUMN IF NOT EXISTS arena_id UUID;
|
||||||
|
|
||||||
-- Human inbox: tasks needing attention
|
-- Human inbox: tasks needing attention
|
||||||
CREATE OR REPLACE VIEW human_inbox AS
|
CREATE OR REPLACE VIEW human_inbox AS
|
||||||
SELECT * FROM tasks WHERE state IN ('blocked', 'failed');
|
SELECT * FROM tasks WHERE state IN ('blocked', 'failed');
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import { describe, it, expect, beforeAll, afterAll } from 'vitest';
|
||||||
|
import { readFileSync, existsSync } from 'node:fs';
|
||||||
|
import { readFile, rm, mkdir } from 'node:fs/promises';
|
||||||
|
import { resolve } from 'node:path';
|
||||||
|
import postgres from 'postgres';
|
||||||
|
import { queueCreate, queueEdit, queueDelete, applyOne, rewindOne, listPending } from '../pending_changes.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Integration test for the full pending-changes lifecycle.
|
||||||
|
* Requires DATABASE_URL env var pointing to a running postgres instance.
|
||||||
|
* Skips cleanly when DATABASE_URL is not set.
|
||||||
|
*
|
||||||
|
* Run with:
|
||||||
|
* DATABASE_URL='postgres://boocode:devpass@localhost:5500/boocode' pnpm -C apps/coder test
|
||||||
|
*/
|
||||||
|
describe.runIf(!!process.env.DATABASE_URL)('pending_changes integration', () => {
|
||||||
|
let sql: ReturnType<typeof postgres>;
|
||||||
|
const testDir = '/tmp/boocode-pending-changes-test-' + Date.now();
|
||||||
|
const projectRoot = testDir;
|
||||||
|
const testSessionId = '00000000-0000-0000-0000-000000000001';
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
sql = postgres(process.env.DATABASE_URL!, { max: 3 });
|
||||||
|
|
||||||
|
// Apply schema
|
||||||
|
const schemaPath = resolve(__dirname, '../../schema.sql');
|
||||||
|
const ddl = readFileSync(schemaPath, 'utf8');
|
||||||
|
await sql.unsafe(ddl);
|
||||||
|
|
||||||
|
// Create temp project directory
|
||||||
|
await mkdir(testDir, { recursive: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
// Cleanup test data
|
||||||
|
await sql`DELETE FROM pending_changes WHERE session_id = ${testSessionId}`;
|
||||||
|
await sql.end({ timeout: 5 });
|
||||||
|
// Remove temp directory
|
||||||
|
await rm(testDir, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queueCreate → listPending → applyOne → verify file exists', async () => {
|
||||||
|
const change = await queueCreate(sql, testSessionId, null, 'hello.txt', 'hello world', projectRoot);
|
||||||
|
expect(change.status).toBe('pending');
|
||||||
|
expect(change.operation).toBe('create');
|
||||||
|
|
||||||
|
const pending = await listPending(sql, testSessionId);
|
||||||
|
expect(pending.some((p) => p.id === change.id)).toBe(true);
|
||||||
|
|
||||||
|
const result = await applyOne(sql, change.id, projectRoot);
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
|
||||||
|
const content = await readFile(resolve(testDir, 'hello.txt'), 'utf8');
|
||||||
|
expect(content).toBe('hello world');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queueEdit → apply → verify content changed', async () => {
|
||||||
|
// Setup: create a file first
|
||||||
|
const createChange = await queueCreate(sql, testSessionId, null, 'editable.txt', 'original content here', projectRoot);
|
||||||
|
await applyOne(sql, createChange.id, projectRoot);
|
||||||
|
|
||||||
|
// Queue an edit
|
||||||
|
const editChange = await queueEdit(sql, testSessionId, null, 'editable.txt', 'original', 'modified', projectRoot);
|
||||||
|
expect(editChange.operation).toBe('edit');
|
||||||
|
|
||||||
|
const result = await applyOne(sql, editChange.id, projectRoot);
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
|
||||||
|
const content = await readFile(resolve(testDir, 'editable.txt'), 'utf8');
|
||||||
|
expect(content).toBe('modified content here');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queueDelete → apply → verify file gone', async () => {
|
||||||
|
// Setup: create a file
|
||||||
|
const createChange = await queueCreate(sql, testSessionId, null, 'deleteme.txt', 'goodbye', projectRoot);
|
||||||
|
await applyOne(sql, createChange.id, projectRoot);
|
||||||
|
expect(existsSync(resolve(testDir, 'deleteme.txt'))).toBe(true);
|
||||||
|
|
||||||
|
// Queue a delete
|
||||||
|
const deleteChange = await queueDelete(sql, testSessionId, null, 'deleteme.txt', projectRoot);
|
||||||
|
const result = await applyOne(sql, deleteChange.id, projectRoot);
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
expect(existsSync(resolve(testDir, 'deleteme.txt'))).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rewindOne → verify reverted', async () => {
|
||||||
|
// Setup: create and apply a file
|
||||||
|
const createChange = await queueCreate(sql, testSessionId, null, 'rewindable.txt', 'initial', projectRoot);
|
||||||
|
await applyOne(sql, createChange.id, projectRoot);
|
||||||
|
|
||||||
|
// Rewind the create (should delete the file)
|
||||||
|
const result = await rewindOne(sql, createChange.id, projectRoot);
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
expect(existsSync(resolve(testDir, 'rewindable.txt'))).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
193
apps/coder/src/services/__tests__/write_guard_fuzz.test.ts
Normal file
193
apps/coder/src/services/__tests__/write_guard_fuzz.test.ts
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { resolveWritePath } from '../write_guard.js';
|
||||||
|
|
||||||
|
const projectRoot = '/opt/testproject';
|
||||||
|
|
||||||
|
describe('write_guard fuzz — traversal attacks', () => {
|
||||||
|
// Basic traversal
|
||||||
|
it('rejects ../', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '../etc/passwd')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects ../../', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '../../etc/passwd')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects deeply nested ../../../', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '../../../../../../../etc/shadow')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Encoded traversal — resolve() doesn't decode percent-encoding, so these
|
||||||
|
// stay as literal filenames. The guard must still not let them escape.
|
||||||
|
it('rejects %2e%2e/ (literal percent-encoded dots)', () => {
|
||||||
|
// resolve('/opt/testproject', '%2e%2e/etc/passwd') stays inside root
|
||||||
|
// because Node's resolve treats the literal characters, not decoded.
|
||||||
|
// The file would be /opt/testproject/%2e%2e/etc/passwd which IS inside root.
|
||||||
|
// This test confirms it doesn't throw (it resolves inside) — defense in depth
|
||||||
|
// is that the filesystem won't have this path, but no traversal occurs.
|
||||||
|
const result = resolveWritePath(projectRoot, '%2e%2e/etc/passwd');
|
||||||
|
expect(result).toContain(projectRoot);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects ..%2f (literal percent-encoded slash)', () => {
|
||||||
|
// '../%2fetc/passwd' — the ../ IS real traversal
|
||||||
|
expect(() => resolveWritePath(projectRoot, '../%2fetc/passwd')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Null byte injection
|
||||||
|
it('rejects null bytes', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'file.txt\x00.jpg')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Absolute path escape
|
||||||
|
it('rejects /etc/passwd', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '/etc/passwd')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects /opt/other-project/file', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '/opt/other-project/file.ts')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Path that starts with project root as prefix but isn't under it
|
||||||
|
it('rejects prefix match without separator', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '/opt/testproject-evil/file.ts')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Double slashes / traversal after valid prefix
|
||||||
|
it('rejects /opt/testproject/../etc/passwd via double-dot after valid prefix', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '/opt/testproject/../etc/passwd')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Windows-style (defense-in-depth on Linux)
|
||||||
|
it('rejects backslash traversal', () => {
|
||||||
|
// On POSIX, backslash is a valid filename char, so '..\\etc\\passwd' resolves
|
||||||
|
// as a single segment inside projectRoot. Not a traversal, but test that it
|
||||||
|
// doesn't crash and stays within root.
|
||||||
|
const result = resolveWritePath(projectRoot, '..\\etc\\passwd');
|
||||||
|
// Node resolve on POSIX treats this as a literal filename segment containing backslashes
|
||||||
|
// that starts with '..' — resolve normalizes: /opt/testproject/..\\etc\\passwd
|
||||||
|
// Wait: resolve('/opt/testproject', '..\\etc\\passwd') — on POSIX backslash
|
||||||
|
// is NOT a separator, so this is a file named '..\\etc\\passwd' inside projectRoot.
|
||||||
|
// Actually no — resolve splits on '/' only on POSIX. '..' at start triggers parent.
|
||||||
|
// Let's check: the string starts with '..' but the next char is '\\' not '/'.
|
||||||
|
// Node's path.resolve on POSIX: the string '..\\etc\\passwd' does NOT contain '/'
|
||||||
|
// so it IS treated as a single path component? No — resolve still splits on '/'.
|
||||||
|
// '..\\etc\\passwd' has no '/', so resolve('/opt/testproject', '..\\etc\\passwd')
|
||||||
|
// = resolve('/opt/testproject/..\\etc\\passwd') — but wait, resolve processes
|
||||||
|
// segments separated by '/'. With no '/', the whole thing is one segment.
|
||||||
|
// Actually wrong: path.resolve calls normalizeString which handles '.' and '..'
|
||||||
|
// only when they are full segments delimited by '/'. Since there's no '/' in
|
||||||
|
// '..\\etc\\passwd', it treats the entire string as one filename.
|
||||||
|
// So: /opt/testproject/..\\etc\\passwd — inside root. No throw.
|
||||||
|
expect(result).toContain(projectRoot);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Secret files (deny list)
|
||||||
|
it('rejects .env', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '.env')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects nested .env', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'config/.env')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects .env.local', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '.env.local')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects id_rsa', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '.ssh/id_rsa')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects id_ed25519', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '.ssh/id_ed25519')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects *.pem', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'certs/server.pem')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects *.key', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'certs/private.key')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects credentials.json', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'credentials.json')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects *.p12', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'certs/client.p12')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects .netrc', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '.netrc')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects *.kdbx', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, 'secrets/passwords.kdbx')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Valid paths (should NOT throw)
|
||||||
|
it('allows simple relative path', () => {
|
||||||
|
expect(resolveWritePath(projectRoot, 'src/index.ts')).toBe('/opt/testproject/src/index.ts');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows nested path', () => {
|
||||||
|
expect(resolveWritePath(projectRoot, 'src/services/tools/edit_file.ts')).toContain(projectRoot);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows dotfile that is not in deny list', () => {
|
||||||
|
expect(resolveWritePath(projectRoot, '.gitignore')).toContain(projectRoot);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows absolute path inside project', () => {
|
||||||
|
expect(resolveWritePath(projectRoot, '/opt/testproject/new-file.ts')).toBe('/opt/testproject/new-file.ts');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows path with safe internal ../', () => {
|
||||||
|
expect(resolveWritePath(projectRoot, 'src/../lib/utils.ts')).toBe('/opt/testproject/lib/utils.ts');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('write_guard fuzz — edge cases', () => {
|
||||||
|
it('throws on empty string', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, '')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws on whitespace-only', () => {
|
||||||
|
expect(() => resolveWritePath(projectRoot, ' ')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws when path IS the project root itself', () => {
|
||||||
|
// Writing to the directory itself makes no sense for a file write
|
||||||
|
expect(() => resolveWritePath(projectRoot, '/opt/testproject')).not.toThrow();
|
||||||
|
// The guard allows it (resolve === projectRoot passes the check).
|
||||||
|
// This is acceptable because the filesystem write will fail on a directory.
|
||||||
|
// If we want to block this, that's a separate concern.
|
||||||
|
});
|
||||||
|
|
||||||
|
it('handles very long path without crashing', () => {
|
||||||
|
const longSegment = 'a'.repeat(255);
|
||||||
|
const longPath = Array(20).fill(longSegment).join('/');
|
||||||
|
// Should not crash — may throw or succeed, but must not buffer-overflow
|
||||||
|
expect(() => resolveWritePath(projectRoot, longPath)).not.toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('handles path with only dots', () => {
|
||||||
|
// Single dot resolves to projectRoot itself
|
||||||
|
const result = resolveWritePath(projectRoot, './src/file.ts');
|
||||||
|
expect(result).toBe('/opt/testproject/src/file.ts');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects triple-dot trick (... is not special but ../ within is)', () => {
|
||||||
|
// '.../etc' is a literal directory name, not traversal
|
||||||
|
const result = resolveWritePath(projectRoot, '.../etc');
|
||||||
|
expect(result).toContain(projectRoot);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects path with multiple consecutive slashes', () => {
|
||||||
|
// resolve normalizes these; should still be inside root
|
||||||
|
const result = resolveWritePath(projectRoot, 'src///file.ts');
|
||||||
|
expect(result).toBe('/opt/testproject/src/file.ts');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -7,6 +7,7 @@ const KNOWN_AGENTS: Array<{ name: string; supportsAcp: boolean }> = [
|
|||||||
{ name: 'goose', supportsAcp: true },
|
{ name: 'goose', supportsAcp: true },
|
||||||
{ name: 'claude', supportsAcp: false },
|
{ name: 'claude', supportsAcp: false },
|
||||||
{ name: 'pi', supportsAcp: false },
|
{ name: 'pi', supportsAcp: false },
|
||||||
|
{ name: 'qwen', supportsAcp: false },
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -134,6 +134,14 @@ export function createDispatcher(deps: Deps): { start(): void; stop(): Promise<v
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Aggregate token cost for the task's session
|
||||||
|
const [costRow] = await sql<{ total: number | null }[]>`
|
||||||
|
SELECT SUM(tokens_used)::int AS total
|
||||||
|
FROM messages
|
||||||
|
WHERE session_id = ${sessionId} AND tokens_used IS NOT NULL
|
||||||
|
`;
|
||||||
|
const costTokens = costRow?.total ?? null;
|
||||||
|
|
||||||
if (finalStatus === 'complete') {
|
if (finalStatus === 'complete') {
|
||||||
const [msg] = await sql<{ content: string | null }[]>`
|
const [msg] = await sql<{ content: string | null }[]>`
|
||||||
SELECT content FROM messages WHERE id = ${assistantId}
|
SELECT content FROM messages WHERE id = ${assistantId}
|
||||||
@@ -141,10 +149,10 @@ export function createDispatcher(deps: Deps): { start(): void; stop(): Promise<v
|
|||||||
const summary = (msg?.content ?? '').slice(0, 500);
|
const summary = (msg?.content ?? '').slice(0, 500);
|
||||||
await sql`
|
await sql`
|
||||||
UPDATE tasks
|
UPDATE tasks
|
||||||
SET state = 'completed', ended_at = clock_timestamp(), output_summary = ${summary}
|
SET state = 'completed', ended_at = clock_timestamp(), output_summary = ${summary}, cost_tokens = ${costTokens}
|
||||||
WHERE id = ${taskId}
|
WHERE id = ${taskId}
|
||||||
`;
|
`;
|
||||||
log.info({ taskId }, 'dispatcher: task completed (native)');
|
log.info({ taskId, costTokens }, 'dispatcher: task completed (native)');
|
||||||
} else {
|
} else {
|
||||||
const [msg] = await sql<{ content: string | null }[]>`
|
const [msg] = await sql<{ content: string | null }[]>`
|
||||||
SELECT content FROM messages WHERE id = ${assistantId}
|
SELECT content FROM messages WHERE id = ${assistantId}
|
||||||
@@ -152,7 +160,7 @@ export function createDispatcher(deps: Deps): { start(): void; stop(): Promise<v
|
|||||||
const summary = (msg?.content ?? 'Inference failed').slice(0, 500);
|
const summary = (msg?.content ?? 'Inference failed').slice(0, 500);
|
||||||
await sql`
|
await sql`
|
||||||
UPDATE tasks
|
UPDATE tasks
|
||||||
SET state = 'failed', ended_at = clock_timestamp(), output_summary = ${summary}
|
SET state = 'failed', ended_at = clock_timestamp(), output_summary = ${summary}, cost_tokens = ${costTokens}
|
||||||
WHERE id = ${taskId}
|
WHERE id = ${taskId}
|
||||||
`;
|
`;
|
||||||
log.warn({ taskId, finalStatus }, 'dispatcher: task failed (native)');
|
log.warn({ taskId, finalStatus }, 'dispatcher: task failed (native)');
|
||||||
@@ -299,13 +307,21 @@ export function createDispatcher(deps: Deps): { start(): void; stop(): Promise<v
|
|||||||
// Step 4: Cleanup worktree
|
// Step 4: Cleanup worktree
|
||||||
await cleanupWorktree(projectPath, taskId);
|
await cleanupWorktree(projectPath, taskId);
|
||||||
|
|
||||||
// Step 5: Mark task completed
|
// Step 5: Aggregate token cost
|
||||||
|
const [extCostRow] = await sql<{ total: number | null }[]>`
|
||||||
|
SELECT SUM(tokens_used)::int AS total
|
||||||
|
FROM messages
|
||||||
|
WHERE session_id = ${sessionId} AND tokens_used IS NOT NULL
|
||||||
|
`;
|
||||||
|
const extCostTokens = extCostRow?.total ?? null;
|
||||||
|
|
||||||
|
// Step 6: Mark task completed
|
||||||
await sql`
|
await sql`
|
||||||
UPDATE tasks
|
UPDATE tasks
|
||||||
SET state = 'completed', ended_at = clock_timestamp(), output_summary = ${outputSummary}
|
SET state = 'completed', ended_at = clock_timestamp(), output_summary = ${outputSummary}, cost_tokens = ${extCostTokens}
|
||||||
WHERE id = ${taskId}
|
WHERE id = ${taskId}
|
||||||
`;
|
`;
|
||||||
log.info({ taskId, agent }, 'dispatcher: task completed (external)');
|
log.info({ taskId, agent, costTokens: extCostTokens }, 'dispatcher: task completed (external)');
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const errMsg = err instanceof Error ? err.message : String(err);
|
const errMsg = err instanceof Error ? err.message : String(err);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
* Supported agents:
|
* Supported agents:
|
||||||
* - claude: `claude -p --model <model>` (print mode, reads task from stdin)
|
* - claude: `claude -p --model <model>` (print mode, reads task from stdin)
|
||||||
* - opencode: `echo <task> | opencode` (stdin pipe — exact flags TBD)
|
* - opencode: `echo <task> | opencode` (stdin pipe — exact flags TBD)
|
||||||
|
* - qwen: `qwen -p <task> --output-format stream-json` (NDJSON structured output)
|
||||||
* - goose: stub (not yet supported)
|
* - goose: stub (not yet supported)
|
||||||
* - pi: stub (not yet supported)
|
* - pi: stub (not yet supported)
|
||||||
*/
|
*/
|
||||||
@@ -51,6 +52,12 @@ function buildAgentCommand(agent: string, task: string, model?: string): string
|
|||||||
? `echo '${escapedTask}' | opencode --model '${model}'`
|
? `echo '${escapedTask}' | opencode --model '${model}'`
|
||||||
: `echo '${escapedTask}' | opencode`;
|
: `echo '${escapedTask}' | opencode`;
|
||||||
|
|
||||||
|
case 'qwen':
|
||||||
|
// Qwen Code: structured JSON output mode for parseable events
|
||||||
|
return model
|
||||||
|
? `qwen -p '${escapedTask}' --model '${model}' --output-format stream-json`
|
||||||
|
: `qwen -p '${escapedTask}' --output-format stream-json`;
|
||||||
|
|
||||||
case 'goose':
|
case 'goose':
|
||||||
// Not yet verified for non-interactive use
|
// Not yet verified for non-interactive use
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
50
apps/coder/src/services/tools/check_task_status.ts
Normal file
50
apps/coder/src/services/tools/check_task_status.ts
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
import { z } from 'zod';
|
||||||
|
import type { ToolDef, ToolContext } from './types.js';
|
||||||
|
|
||||||
|
const CheckTaskStatusInput = z.object({
|
||||||
|
task_id: z.string().uuid().describe('ID of the task to check'),
|
||||||
|
});
|
||||||
|
|
||||||
|
type CheckTaskStatusInputT = z.infer<typeof CheckTaskStatusInput>;
|
||||||
|
|
||||||
|
export const checkTaskStatusTool: ToolDef<CheckTaskStatusInputT> = {
|
||||||
|
name: 'check_task_status',
|
||||||
|
description: 'Check the status and output of a subtask by ID. Returns state, output_summary, and timing.',
|
||||||
|
inputSchema: CheckTaskStatusInput,
|
||||||
|
jsonSchema: {
|
||||||
|
type: 'function',
|
||||||
|
function: {
|
||||||
|
name: 'check_task_status',
|
||||||
|
description: 'Check the status and output of a subtask by ID.',
|
||||||
|
parameters: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
task_id: { type: 'string', description: 'ID of the task to check' },
|
||||||
|
},
|
||||||
|
required: ['task_id'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async execute(input: CheckTaskStatusInputT, _projectRoot: string, context: ToolContext): Promise<unknown> {
|
||||||
|
const { sql } = context;
|
||||||
|
|
||||||
|
const [task] = await sql<{ id: string; state: string; output_summary: string | null; started_at: string | null; ended_at: string | null }[]>`
|
||||||
|
SELECT id, state, output_summary, started_at, ended_at
|
||||||
|
FROM tasks
|
||||||
|
WHERE id = ${input.task_id}
|
||||||
|
`;
|
||||||
|
|
||||||
|
if (!task) {
|
||||||
|
return { error: `Task ${input.task_id} not found` };
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: task.id,
|
||||||
|
state: task.state,
|
||||||
|
output_summary: task.output_summary,
|
||||||
|
started_at: task.started_at,
|
||||||
|
ended_at: task.ended_at,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -4,6 +4,9 @@ import { createFileTool } from './create_file.js';
|
|||||||
import { deleteFileTool } from './delete_file.js';
|
import { deleteFileTool } from './delete_file.js';
|
||||||
import { applyPendingTool } from './apply_pending.js';
|
import { applyPendingTool } from './apply_pending.js';
|
||||||
import { rewindTool } from './rewind.js';
|
import { rewindTool } from './rewind.js';
|
||||||
|
import { newTaskTool } from './new_task.js';
|
||||||
|
import { listTasksTool } from './list_tasks.js';
|
||||||
|
import { checkTaskStatusTool } from './check_task_status.js';
|
||||||
|
|
||||||
export type { ToolDef, ToolContext, ToolJsonSchema } from './types.js';
|
export type { ToolDef, ToolContext, ToolJsonSchema } from './types.js';
|
||||||
|
|
||||||
@@ -16,6 +19,11 @@ export const WRITE_TOOLS: readonly ToolDef<any>[] = [
|
|||||||
deleteFileTool,
|
deleteFileTool,
|
||||||
editFileTool,
|
editFileTool,
|
||||||
rewindTool,
|
rewindTool,
|
||||||
|
// Boomerang subtask tools — orchestrator agents call these to spawn/monitor child tasks.
|
||||||
|
// An "Orchestrator" agent profile would whitelist [new_task, list_tasks, check_task_status].
|
||||||
|
newTaskTool,
|
||||||
|
listTasksTool,
|
||||||
|
checkTaskStatusTool,
|
||||||
];
|
];
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
@@ -23,4 +31,4 @@ export const WRITE_TOOLS_BY_NAME: ReadonlyMap<string, ToolDef<any>> = new Map(
|
|||||||
WRITE_TOOLS.map((t) => [t.name, t]),
|
WRITE_TOOLS.map((t) => [t.name, t]),
|
||||||
);
|
);
|
||||||
|
|
||||||
export { editFileTool, createFileTool, deleteFileTool, applyPendingTool, rewindTool };
|
export { editFileTool, createFileTool, deleteFileTool, applyPendingTool, rewindTool, newTaskTool, listTasksTool, checkTaskStatusTool };
|
||||||
|
|||||||
56
apps/coder/src/services/tools/list_tasks.ts
Normal file
56
apps/coder/src/services/tools/list_tasks.ts
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { z } from 'zod';
|
||||||
|
import type { ToolDef, ToolContext } from './types.js';
|
||||||
|
import { getInferenceContext } from './inference_context.js';
|
||||||
|
|
||||||
|
const ListTasksInput = z.object({
|
||||||
|
parent_task_id: z.string().uuid().optional().describe('Filter by parent task ID. Omit to list children of current task.'),
|
||||||
|
});
|
||||||
|
|
||||||
|
type ListTasksInputT = z.infer<typeof ListTasksInput>;
|
||||||
|
|
||||||
|
export const listTasksTool: ToolDef<ListTasksInputT> = {
|
||||||
|
name: 'list_tasks',
|
||||||
|
description: 'List child tasks of the current task (or a specified parent). Returns id, state, input preview, and output_summary.',
|
||||||
|
inputSchema: ListTasksInput,
|
||||||
|
jsonSchema: {
|
||||||
|
type: 'function',
|
||||||
|
function: {
|
||||||
|
name: 'list_tasks',
|
||||||
|
description: 'List child tasks of the current task (or a specified parent).',
|
||||||
|
parameters: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
parent_task_id: { type: 'string', description: 'Filter by parent task ID. Omit to list children of current task.' },
|
||||||
|
},
|
||||||
|
required: [],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async execute(input: ListTasksInputT, _projectRoot: string, context: ToolContext): Promise<unknown> {
|
||||||
|
const { sql } = context;
|
||||||
|
const ctx = getInferenceContext();
|
||||||
|
const parentId = input.parent_task_id ?? ctx.taskId;
|
||||||
|
|
||||||
|
if (!parentId) {
|
||||||
|
return { tasks: [], note: 'No parent task context — not running inside a task.' };
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await sql<{ id: string; state: string; input: string; output_summary: string | null }[]>`
|
||||||
|
SELECT id, state, input, output_summary
|
||||||
|
FROM tasks
|
||||||
|
WHERE parent_task_id = ${parentId}
|
||||||
|
ORDER BY created_at DESC
|
||||||
|
LIMIT 50
|
||||||
|
`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
tasks: rows.map((r) => ({
|
||||||
|
id: r.id,
|
||||||
|
state: r.state,
|
||||||
|
input_preview: r.input.slice(0, 100),
|
||||||
|
output_summary: r.output_summary,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
65
apps/coder/src/services/tools/new_task.ts
Normal file
65
apps/coder/src/services/tools/new_task.ts
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
import { z } from 'zod';
|
||||||
|
import type { ToolDef, ToolContext } from './types.js';
|
||||||
|
import { getInferenceContext } from './inference_context.js';
|
||||||
|
|
||||||
|
const NewTaskInput = z.object({
|
||||||
|
input: z.string().min(1).describe('Task description for the child subtask'),
|
||||||
|
agent: z.string().optional().describe('Optional: dispatch to a specific agent'),
|
||||||
|
model: z.string().optional().describe('Optional: model override for the subtask'),
|
||||||
|
});
|
||||||
|
|
||||||
|
type NewTaskInputT = z.infer<typeof NewTaskInput>;
|
||||||
|
|
||||||
|
export const newTaskTool: ToolDef<NewTaskInputT> = {
|
||||||
|
name: 'new_task',
|
||||||
|
description:
|
||||||
|
'Spawn a subtask that runs in isolation. The subtask gets its own session and ' +
|
||||||
|
'worktree. Use check_task_status to monitor progress. Only the output_summary is ' +
|
||||||
|
'accessible to the parent — full isolation (Boomerang pattern).',
|
||||||
|
inputSchema: NewTaskInput,
|
||||||
|
jsonSchema: {
|
||||||
|
type: 'function',
|
||||||
|
function: {
|
||||||
|
name: 'new_task',
|
||||||
|
description:
|
||||||
|
'Spawn a subtask that runs in isolation. The subtask gets its own session and ' +
|
||||||
|
'worktree. Use check_task_status to monitor progress.',
|
||||||
|
parameters: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
input: { type: 'string', description: 'Task description for the child subtask' },
|
||||||
|
agent: { type: 'string', description: 'Optional: dispatch to a specific agent' },
|
||||||
|
model: { type: 'string', description: 'Optional: model override for the subtask' },
|
||||||
|
},
|
||||||
|
required: ['input'],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
async execute(input: NewTaskInputT, _projectRoot: string, context: ToolContext): Promise<unknown> {
|
||||||
|
const { sql } = context;
|
||||||
|
// Get the current task's project_id from the inference context
|
||||||
|
const ctx = getInferenceContext();
|
||||||
|
const currentTaskId = ctx.taskId;
|
||||||
|
|
||||||
|
// Look up the project_id from the current session
|
||||||
|
const [session] = await sql<{ project_id: string }[]>`
|
||||||
|
SELECT project_id FROM sessions WHERE id = ${ctx.sessionId}
|
||||||
|
`;
|
||||||
|
if (!session) {
|
||||||
|
return { error: 'Cannot determine project_id from current session' };
|
||||||
|
}
|
||||||
|
|
||||||
|
const [task] = await sql<{ id: string; state: string }[]>`
|
||||||
|
INSERT INTO tasks (project_id, parent_task_id, input, agent, model)
|
||||||
|
VALUES (${session.project_id}, ${currentTaskId}, ${input.input}, ${input.agent ?? null}, ${input.model ?? null})
|
||||||
|
RETURNING id, state
|
||||||
|
`;
|
||||||
|
|
||||||
|
return {
|
||||||
|
message: `Subtask created (id: ${task!.id}). It will run in isolation. Use check_task_status to monitor.`,
|
||||||
|
task_id: task!.id,
|
||||||
|
state: task!.state,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -54,10 +54,14 @@ export function isSecretPath(filePath: string): boolean {
|
|||||||
* checks the result stays within projectRoot.
|
* checks the result stays within projectRoot.
|
||||||
*/
|
*/
|
||||||
export function resolveWritePath(projectRoot: string, filePath: string): string {
|
export function resolveWritePath(projectRoot: string, filePath: string): string {
|
||||||
if (!filePath || filePath.length === 0) {
|
if (!filePath || filePath.trim().length === 0) {
|
||||||
throw new WriteGuardError('file path is required');
|
throw new WriteGuardError('file path is required');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (filePath.includes('\x00')) {
|
||||||
|
throw new WriteGuardError('file path contains null byte');
|
||||||
|
}
|
||||||
|
|
||||||
const candidate = filePath.startsWith('/') ? filePath : resolve(projectRoot, filePath);
|
const candidate = filePath.startsWith('/') ? filePath : resolve(projectRoot, filePath);
|
||||||
const normalized = resolve(candidate); // normalizes ../ segments
|
const normalized = resolve(candidate); // normalizes ../ segments
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ const ConfigSchema = z.object({
|
|||||||
// v1.15.0-mcp-multi: path to the MCP config JSON file. Default /data/mcp.json
|
// v1.15.0-mcp-multi: path to the MCP config JSON file. Default /data/mcp.json
|
||||||
// (bind-mounted alongside AGENTS.md). File missing = no MCP (opt-in).
|
// (bind-mounted alongside AGENTS.md). File missing = no MCP (opt-in).
|
||||||
MCP_CONFIG_PATH: z.string().optional(),
|
MCP_CONFIG_PATH: z.string().optional(),
|
||||||
|
// v2.0.5: cheaper model for titles, summaries, labeling. Falls back to
|
||||||
|
// session model (auto_name) or DEFAULT_MODEL when unset.
|
||||||
|
FAST_MODEL: z.string().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type Config = z.infer<typeof ConfigSchema>;
|
export type Config = z.infer<typeof ConfigSchema>;
|
||||||
|
|||||||
@@ -67,7 +67,8 @@ export async function maybeAutoNameChat(
|
|||||||
const sessionRows = await ctx.sql<{ model: string }[]>`
|
const sessionRows = await ctx.sql<{ model: string }[]>`
|
||||||
SELECT model FROM sessions WHERE id = ${sessionId}
|
SELECT model FROM sessions WHERE id = ${sessionId}
|
||||||
`;
|
`;
|
||||||
const model = sessionRows[0]?.model;
|
// v2.0.5: prefer FAST_MODEL for cheap LLM calls (titles, summaries).
|
||||||
|
const model = ctx.config.FAST_MODEL ?? sessionRows[0]?.model;
|
||||||
if (!model) return;
|
if (!model) return;
|
||||||
|
|
||||||
const assistantMsg = await ctx.sql<{ content: string }[]>`
|
const assistantMsg = await ctx.sql<{ content: string }[]>`
|
||||||
|
|||||||
@@ -20,3 +20,5 @@ export type {
|
|||||||
export type { ToolPhaseResult } from './tool-phase.js';
|
export type { ToolPhaseResult } from './tool-phase.js';
|
||||||
export { detectDoomLoop, DOOM_LOOP_THRESHOLD } from './sentinels.js';
|
export { detectDoomLoop, DOOM_LOOP_THRESHOLD } from './sentinels.js';
|
||||||
export { buildMessagesPayload } from './payload.js';
|
export { buildMessagesPayload } from './payload.js';
|
||||||
|
export { generateToolUseSummary } from './tool-summaries.js';
|
||||||
|
export type { ToolInfo } from './tool-summaries.js';
|
||||||
|
|||||||
81
apps/server/src/services/inference/tool-summaries.ts
Normal file
81
apps/server/src/services/inference/tool-summaries.ts
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
/**
|
||||||
|
* v2.0.5: Tool-use summary generation.
|
||||||
|
*
|
||||||
|
* After a batch of tool calls completes, fire a cheap LLM call to generate
|
||||||
|
* a "git-commit-subject-style" one-liner label describing what the tools
|
||||||
|
* accomplished. Ported from the Qwen Code source recon.
|
||||||
|
*/
|
||||||
|
import type { FastifyBaseLogger } from 'fastify';
|
||||||
|
|
||||||
|
const TOOL_SUMMARY_SYSTEM_PROMPT = `Write a short summary label describing what these tool calls accomplished. Think git-commit-subject, not sentence. Past tense, most distinctive noun. Max 30 characters. Output ONLY the label.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
- Searched in auth/
|
||||||
|
- Fixed NPE in UserService
|
||||||
|
- Created signup endpoint
|
||||||
|
- Read config.json
|
||||||
|
- Ran failing tests`;
|
||||||
|
|
||||||
|
const INPUT_TRUNCATE = 300;
|
||||||
|
const MAX_SUMMARY_LENGTH = 100;
|
||||||
|
|
||||||
|
export interface ToolInfo {
|
||||||
|
name: string;
|
||||||
|
input: string;
|
||||||
|
output: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function generateToolUseSummary(opts: {
|
||||||
|
tools: ToolInfo[];
|
||||||
|
llamaSwapUrl: string;
|
||||||
|
model: string;
|
||||||
|
log: FastifyBaseLogger;
|
||||||
|
signal?: AbortSignal;
|
||||||
|
}): Promise<string | null> {
|
||||||
|
const { tools, llamaSwapUrl, model, log, signal } = opts;
|
||||||
|
if (tools.length === 0) return null;
|
||||||
|
if (signal?.aborted) return null;
|
||||||
|
|
||||||
|
const toolText = tools
|
||||||
|
.map(t => `Tool: ${t.name}\nInput: ${t.input.slice(0, INPUT_TRUNCATE)}\nOutput: ${t.output.slice(0, INPUT_TRUNCATE)}`)
|
||||||
|
.join('\n\n');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${llamaSwapUrl}/v1/chat/completions`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
model,
|
||||||
|
messages: [
|
||||||
|
{ role: 'system', content: TOOL_SUMMARY_SYSTEM_PROMPT },
|
||||||
|
{ role: 'user', content: toolText },
|
||||||
|
],
|
||||||
|
max_tokens: 30,
|
||||||
|
temperature: 0.2,
|
||||||
|
stream: false,
|
||||||
|
chat_template_kwargs: { enable_thinking: false },
|
||||||
|
}),
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
if (!res.ok) {
|
||||||
|
log.debug({ status: res.status }, 'tool-summary: LLM request failed');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const data = await res.json() as { choices?: Array<{ message?: { content?: string } }> };
|
||||||
|
const raw = data.choices?.[0]?.message?.content?.trim() ?? '';
|
||||||
|
if (!raw) return null;
|
||||||
|
// Clean: strip quotes, "Label:" prefix, cap length
|
||||||
|
let cleaned = raw.split('\n')[0]?.trim() ?? '';
|
||||||
|
cleaned = cleaned
|
||||||
|
.replace(/^[-*•]\s+/, '')
|
||||||
|
.replace(/^["'`‘’“”]|["'`‘’“”]$/g, '')
|
||||||
|
.replace(/^(label|summary)\s*:\s*/i, '')
|
||||||
|
.trim();
|
||||||
|
return cleaned.length > MAX_SUMMARY_LENGTH
|
||||||
|
? cleaned.slice(0, MAX_SUMMARY_LENGTH).trim()
|
||||||
|
: cleaned || null;
|
||||||
|
} catch (err) {
|
||||||
|
log.debug({ err: err instanceof Error ? err.message : String(err) }, 'tool-summary: error');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -312,6 +312,8 @@ Independent batch — ships clean any time after v1.13. Low leverage unless Sam
|
|||||||
|
|
||||||
**Estimated:** ~1500 LoC for Path A + Path B + shared schema, plus ~400 LoC for the MCP-server role, plus ~300 LoC for the ACP-client role. Multiple sub-versions: v2.0.0 native + ACP, v2.0.1 MCP server, v2.0.2 polish.
|
**Estimated:** ~1500 LoC for Path A + Path B + shared schema, plus ~400 LoC for the MCP-server role, plus ~300 LoC for the ACP-client role. Multiple sub-versions: v2.0.0 native + ACP, v2.0.1 MCP server, v2.0.2 polish.
|
||||||
|
|
||||||
|
**Retrospective (2026-05-25):** All 8 phases shipped. v2.0.0-alpha through v2.0.4-hardening. The full BooCoder line is complete: write tools with pending-changes queue, dispatcher with ACP/PTY dual paths, MCP server (6 tools, stdio transport, 10-question eval passed), CLI client, human inbox, Boomerang `new_task` orchestration, and path-guard fuzz suite (34 traversal-attack tests). Runtime isolation (v2.1) remains optional pending production bake.
|
||||||
|
|
||||||
-----
|
-----
|
||||||
|
|
||||||
## v2.1 — BooCoder runtime isolation (optional)
|
## v2.1 — BooCoder runtime isolation (optional)
|
||||||
|
|||||||
6
pnpm-lock.yaml
generated
6
pnpm-lock.yaml
generated
@@ -69,6 +69,9 @@ importers:
|
|||||||
postgres:
|
postgres:
|
||||||
specifier: ^3.4.4
|
specifier: ^3.4.4
|
||||||
version: 3.4.9
|
version: 3.4.9
|
||||||
|
ws:
|
||||||
|
specifier: ^8.18.0
|
||||||
|
version: 8.20.1
|
||||||
zod:
|
zod:
|
||||||
specifier: ^3.23.8
|
specifier: ^3.23.8
|
||||||
version: 3.25.76
|
version: 3.25.76
|
||||||
@@ -76,6 +79,9 @@ importers:
|
|||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20.14.10
|
specifier: ^20.14.10
|
||||||
version: 20.19.41
|
version: 20.19.41
|
||||||
|
'@types/ws':
|
||||||
|
specifier: ^8.5.10
|
||||||
|
version: 8.18.1
|
||||||
tsx:
|
tsx:
|
||||||
specifier: ^4.16.2
|
specifier: ^4.16.2
|
||||||
version: 4.22.0
|
version: 4.22.0
|
||||||
|
|||||||
Reference in New Issue
Block a user