v2.0.3: CLI client + human inbox + cost tracking + Boomerang new_task
Phase 7 of v2.0. BooCoder gains a terminal-driven UX and subagent isolation primitive. CLI (src/cli.ts): standalone entry point for terminal use. - boocode run "task" [--agent x] [--model y] — create + stream output - boocode ls [--state x] — formatted task table - boocode attach <id> — WS stream of running task - boocode send <id> "msg" — follow-up message to task session Connects to BOOCODER_URL (default http://100.114.205.53:9502). Human inbox (routes/inbox.ts): GET /api/inbox (failed/blocked tasks), POST /api/inbox/:id/retry (reset to pending for re-dispatch). Cost tracking: dispatcher aggregates tokens_used from all messages in the task's session after completion, stores in tasks.cost_tokens. GET /api/stats/costs?group_by=project|agent|day for aggregation. Boomerang subagent isolation (3 new tools): - new_task: creates child task with parent_task_id linkage, runs in fresh isolated session. Orchestrator sees only output_summary. - list_tasks: query child tasks of current parent - check_task_status: read task state + output_summary The orchestrator pattern: an agent with tools: [new_task, list_tasks, check_task_status] can ONLY dispatch — can't read files or MCP. This is the Roo Code Boomerang Tasks capability-restriction principle. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -134,6 +134,14 @@ export function createDispatcher(deps: Deps): { start(): void; stop(): Promise<v
|
||||
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') {
|
||||
const [msg] = await sql<{ content: string | null }[]>`
|
||||
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);
|
||||
await sql`
|
||||
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}
|
||||
`;
|
||||
log.info({ taskId }, 'dispatcher: task completed (native)');
|
||||
log.info({ taskId, costTokens }, 'dispatcher: task completed (native)');
|
||||
} else {
|
||||
const [msg] = await sql<{ content: string | null }[]>`
|
||||
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);
|
||||
await sql`
|
||||
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}
|
||||
`;
|
||||
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
|
||||
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`
|
||||
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}
|
||||
`;
|
||||
log.info({ taskId, agent }, 'dispatcher: task completed (external)');
|
||||
log.info({ taskId, agent, costTokens: extCostTokens }, 'dispatcher: task completed (external)');
|
||||
|
||||
} catch (err) {
|
||||
const errMsg = err instanceof Error ? err.message : String(err);
|
||||
|
||||
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 { applyPendingTool } from './apply_pending.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';
|
||||
|
||||
@@ -16,6 +19,11 @@ export const WRITE_TOOLS: readonly ToolDef<any>[] = [
|
||||
deleteFileTool,
|
||||
editFileTool,
|
||||
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
|
||||
@@ -23,4 +31,4 @@ export const WRITE_TOOLS_BY_NAME: ReadonlyMap<string, ToolDef<any>> = new Map(
|
||||
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,
|
||||
};
|
||||
},
|
||||
};
|
||||
Reference in New Issue
Block a user