mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
Feat: board redraft loop (#139)
* feat(board): expose board review brief + guard approve-and-start
Slice 1 of the board-informed intake re-draft loop (backend foundation):
- JournalService.board_review_brief(task_id): the PO + Head of Marketing
DECISION_LOG entries for a task, oldest-first, each tagged with author —
the board's review as structured data.
- GET /api/tasks/{task_id}/board-review (PM-or-above) backing the CEO's
approval/redraft surface, so the real board analysis is readable instead
of a placeholder; BoardReviewEntry response schema.
- Guard: approve_and_start now refuses a board task whose review is not
complete (service invariant + precise BOARD_REVIEW_INCOMPLETE at the route).
Previously only the UI hid the button; the backend let an early/rogue call
hand the task to Main PM mid-review.
Tests: brief filtering/ordering + endpoint (200/404) + the two guard paths.
* feat(panel): show real board review at the approve gate + live refresh
Slice 1 frontend of the board-informed intake re-draft loop:
- tasksApi.getBoardReview + useBoardReview hook consume GET
/tasks/{id}/board-review.
- The Approve & Start dialog now renders the actual Product Owner + Head of
Marketing notes (markdown) instead of a static placeholder, so the CEO reads
the board's analysis before approving.
- C2: useTask polls (4s) while a task is still on the board with an
incomplete review, so the Approve & Start button appears as soon as the
board finishes — there is no per-task websocket. Polling stops once
board_review_complete flips.
* feat(intake): board-informed re-draft loop (backend, cold path)
Slice 2 of the re-draft loop:
- update_live_draft: apply a board-informed re-draft to the EXISTING task in
place (title/description/acceptance_criteria) — never a duplicate — then route
it: 'main_pm' hands it to the Main PM via approve_and_start; 'board' clears
board_review_complete for another review round.
- confirm route branches on task_id → update_live_draft vs confirm_live_draft;
LiveConfirmRequest.task_id added (scope taken from the task, not required).
- POST /live/re-interview/{task_id} (PM-or-above): spawns a fresh intake session
seeded with the current draft + the board brief (compose_redraft_message),
scoped to the task's product/project. The cold path + Slice-3 fallback.
- format_board_briefing / compose_redraft_message helpers.
Tests: pure helpers + update_live_draft (main_pm hand-off, re-board reset,
missing-task).
* feat(panel): board-informed re-draft entry + prompter re-draft guidance
Slice 2 panel of the re-draft loop:
- 'Re-draft with board feedback' button on a board-reviewed task detail →
/prompter?redraft=<taskId>.
- usePrompter.startRedraft(taskId): calls POST /prompter/live/re-interview/{id},
scopes the chat to the task, and streams the re-draft; redraftTaskId is
threaded (persisted across reload) so confirm carries task_id and updates the
existing task in place rather than creating a duplicate.
- prompterLiveApi.reInterview; ConfirmPayload.task_id.
- Prompter role prompt: a 'Re-drafting after board review' section so the agent
revises the included draft from the board brief instead of starting over.
Panel verified by CI (no local node_modules).
* feat(intake): keep-alive re-draft — park the intake agent during board review
Slice 3 of the re-draft loop (in-context fidelity; cold path is the fallback):
- Registry: LiveIntakeSession.task_id + park(session_id, task_id) (keep alive
instead of reaping) + find_by_task() for board-completion injection.
- Confirm: the board route (first pass) PARKS the intake agent instead of
reaping, so it keeps the whole interview in context.
- Orchestrator: on board-review completion, inject the synthesized board brief
into the parked session (_inject_board_brief_into_parked_intake) so the
resident prompter re-drafts in-context. No-op when nothing is parked (the
container died / a new intake replaced it) — the cold /re-interview path
covers that. No reaper change needed (an idle parked session spends no tokens
and the budget sweep is the only agent-stopping sweep).
- Panel: confirm(board) keeps the chat alive (parked, redraftTaskId set) with a
notice; the injected revised draft arrives over the existing stream to approve.
Tests: registry park/find_by_task/closed-ignored. Container delivery + the full
panel parked flow need live (container-runtime) verification.
---------
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef } from "react";
|
||||
import { Loader2, Sparkles, X } from "lucide-react";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { usePrompter } from "@/hooks/use-prompter";
|
||||
@@ -34,8 +35,21 @@ export default function PrompterPage() {
|
||||
launchTask,
|
||||
startAnother,
|
||||
isLaunching,
|
||||
startRedraft,
|
||||
} = usePrompter();
|
||||
|
||||
// Entry from a task's "Re-draft with board feedback" button: ?redraft=<taskId>
|
||||
// re-opens intake seeded with the board's review of that task. Fire once.
|
||||
const redraftTriggered = useRef(false);
|
||||
useEffect(() => {
|
||||
if (redraftTriggered.current) return;
|
||||
const taskId = new URLSearchParams(window.location.search).get("redraft");
|
||||
if (taskId) {
|
||||
redraftTriggered.current = true;
|
||||
void startRedraft(taskId);
|
||||
}
|
||||
}, [startRedraft]);
|
||||
|
||||
const showForm = state === "form" || state === "preparing";
|
||||
const isComposerDisabled =
|
||||
state === "launching" || state === "success" || isSending;
|
||||
|
||||
@@ -20,6 +20,7 @@ import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { AlertTriangle, ArrowLeft, RefreshCw } from "lucide-react";
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { toast } from "sonner";
|
||||
|
||||
interface TaskDetailPageProps {
|
||||
@@ -28,6 +29,7 @@ interface TaskDetailPageProps {
|
||||
|
||||
export default function TaskDetailPage({ params }: TaskDetailPageProps) {
|
||||
const { taskId } = use(params);
|
||||
const router = useRouter();
|
||||
const { data: task, isLoading, error, refetch } = useTask(taskId);
|
||||
const { data: project } = useProject(task?.project_id ?? "");
|
||||
const lifecycle = useTaskLifecycle();
|
||||
@@ -377,7 +379,15 @@ export default function TaskDetailPage({ params }: TaskDetailPageProps) {
|
||||
{task.status === TaskStatus.PENDING &&
|
||||
task.board_review_complete === true &&
|
||||
task.team !== Team.MAIN_PM && (
|
||||
<div className="flex justify-end">
|
||||
<div className="flex justify-end gap-2">
|
||||
{task.team === Team.BOARD && (
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => router.push(`/prompter?redraft=${task.id}`)}
|
||||
>
|
||||
Re-draft with board feedback
|
||||
</Button>
|
||||
)}
|
||||
<ApproveAndStartButton task={task} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
import { useState } from "react";
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { tasksApi } from "@/lib/api";
|
||||
import { useBoardReview } from "@/hooks/use-tasks";
|
||||
import { Markdown } from "@/components/ui/markdown";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
@@ -22,10 +24,22 @@ interface ApproveAndStartButtonProps {
|
||||
task: Task;
|
||||
}
|
||||
|
||||
function roleLabel(role: string): string {
|
||||
if (role === "product_owner") return "Product Owner";
|
||||
if (role === "head_marketing") return "Head of Marketing";
|
||||
return role;
|
||||
}
|
||||
|
||||
export function ApproveAndStartButton({ task }: ApproveAndStartButtonProps) {
|
||||
const queryClient = useQueryClient();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [notes, setNotes] = useState("");
|
||||
// Fetch the board's actual review only while the dialog is open, so the CEO
|
||||
// reads the PO + Head of Marketing analysis before approving.
|
||||
const { data: boardReview = [], isLoading: boardLoading } = useBoardReview(
|
||||
task.id,
|
||||
open,
|
||||
);
|
||||
|
||||
const approveAndStartMutation = useMutation({
|
||||
mutationFn: ({ taskId, notes }: { taskId: string; notes: string }) =>
|
||||
@@ -78,11 +92,39 @@ export function ApproveAndStartButton({ task }: ApproveAndStartButtonProps) {
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label>Board review (Product Owner & Head of Marketing)</Label>
|
||||
{boardLoading ? (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Loading board review…
|
||||
</p>
|
||||
) : boardReview.length === 0 ? (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
No board review recorded for this task yet.
|
||||
</p>
|
||||
) : (
|
||||
<div className="max-h-72 space-y-3 overflow-y-auto rounded-md border p-3">
|
||||
{boardReview.map((entry) => (
|
||||
<div
|
||||
key={entry.timestamp ?? `${entry.author}-${entry.title}`}
|
||||
className="space-y-1"
|
||||
>
|
||||
<span className="inline-block rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">
|
||||
{roleLabel(entry.author_role)}
|
||||
</span>
|
||||
<div className="text-sm font-medium">{entry.title}</div>
|
||||
<Markdown compact>{entry.content}</Markdown>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="approve-and-start-notes">Approval notes (required)</Label>
|
||||
<Textarea
|
||||
id="approve-and-start-notes"
|
||||
placeholder="Board review complete; requirements are clear. Build it..."
|
||||
placeholder="Board review read; requirements are clear. Build it..."
|
||||
value={notes}
|
||||
onChange={(e) => setNotes(e.target.value)}
|
||||
rows={3}
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
type ConfirmPayload,
|
||||
} from "@/lib/api/prompter";
|
||||
import { getErrorMessage } from "@/lib/api/client";
|
||||
import { tasksApi } from "@/lib/api/tasks";
|
||||
import { Team } from "@/types";
|
||||
import type { TaskType, TaskNature, Complexity } from "@/types";
|
||||
|
||||
@@ -162,6 +163,7 @@ interface PersistedChat {
|
||||
state: PrompterState;
|
||||
scope: { targetKind: TargetKind; projectId: string; productId: string };
|
||||
editableDraft: EditableDraft;
|
||||
redraftTaskId?: string | null;
|
||||
savedAt: number;
|
||||
}
|
||||
|
||||
@@ -225,6 +227,9 @@ export function usePrompter() {
|
||||
|
||||
// Live-session plumbing held in refs so SSE callbacks never see stale state.
|
||||
const sessionIdRef = useRef<string | null>(null);
|
||||
// Set when this chat is a board-informed re-draft of an existing task: confirm
|
||||
// then updates that task in place instead of creating a new one.
|
||||
const redraftTaskIdRef = useRef<string | null>(null);
|
||||
const sourceRef = useRef<EventSource | null>(null);
|
||||
const streamingIdRef = useRef<string | null>(null);
|
||||
// Synchronous re-entry guard for launch — a double-click was creating two tasks.
|
||||
@@ -390,6 +395,7 @@ export function usePrompter() {
|
||||
state,
|
||||
scope: scopeRef.current,
|
||||
editableDraft,
|
||||
redraftTaskId: redraftTaskIdRef.current,
|
||||
savedAt: Date.now(),
|
||||
});
|
||||
}
|
||||
@@ -415,6 +421,7 @@ export function usePrompter() {
|
||||
// events. Any tokens from a turn that was mid-flight at reload are gone,
|
||||
// so land in a stable state rather than "streaming".
|
||||
sessionIdRef.current = persisted.sessionId;
|
||||
redraftTaskIdRef.current = persisted.redraftTaskId ?? null;
|
||||
setSessionId(persisted.sessionId);
|
||||
setMessages(persisted.messages);
|
||||
setEditableDraft(persisted.editableDraft);
|
||||
@@ -482,6 +489,41 @@ export function usePrompter() {
|
||||
openStream,
|
||||
]);
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Re-draft an existing board-reviewed task with the board's feedback
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
const startRedraft = useCallback(
|
||||
async (taskId: string) => {
|
||||
if (state === "preparing" || sessionIdRef.current) return;
|
||||
setState("preparing");
|
||||
try {
|
||||
// Scope the chat to the task's product/project so launch has a target
|
||||
// even if the re-drafted proposal omits it.
|
||||
const task = await tasksApi.get(taskId);
|
||||
if (task.product_id) {
|
||||
setTargetKind("product");
|
||||
setProductId(task.product_id);
|
||||
} else if (task.project_id) {
|
||||
setTargetKind("project");
|
||||
setProjectId(task.project_id);
|
||||
}
|
||||
const { session_id } = await prompterLiveApi.reInterview(taskId);
|
||||
redraftTaskIdRef.current = taskId;
|
||||
sessionIdRef.current = session_id;
|
||||
setSessionId(session_id);
|
||||
openStream(session_id);
|
||||
setIsSending(true);
|
||||
setActivity("Re-opening intake with the board's feedback…");
|
||||
setState("streaming");
|
||||
} catch (err) {
|
||||
addMessage({ role: "error", content: getErrorMessage(err) });
|
||||
setState("form");
|
||||
}
|
||||
},
|
||||
[state, addMessage, openStream],
|
||||
);
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Send a chat message
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -580,6 +622,11 @@ export function usePrompter() {
|
||||
editableDraft.targetKind === "product"
|
||||
? { product_id: editableDraft.productId, draft, route }
|
||||
: { project_id: editableDraft.projectId, draft, route };
|
||||
// Board-informed re-draft: confirm updates the existing task in place.
|
||||
const redraftId = redraftTaskIdRef.current;
|
||||
if (redraftId) {
|
||||
payload.task_id = redraftId;
|
||||
}
|
||||
|
||||
const effectiveTeam =
|
||||
editableDraft.targetKind === "product"
|
||||
@@ -588,11 +635,27 @@ export function usePrompter() {
|
||||
|
||||
try {
|
||||
const { task_id } = await prompterLiveApi.confirm(sid, payload);
|
||||
// Board route, first pass: the backend parked the intake agent so the
|
||||
// board's feedback can be injected for an in-place re-draft. Keep the chat
|
||||
// alive (don't reap) — the revised draft will arrive here to approve.
|
||||
if (route === "board" && !redraftId) {
|
||||
redraftTaskIdRef.current = task_id;
|
||||
addMessage({
|
||||
role: "assistant",
|
||||
content:
|
||||
"Sent to the board — the Product Owner and Head of Marketing are " +
|
||||
"reviewing this. Their feedback will arrive here as a revised draft " +
|
||||
"you can approve. You can leave and come back; this chat stays open.",
|
||||
});
|
||||
setState("chatting");
|
||||
return; // `finally` resets the launching guard
|
||||
}
|
||||
// The draft became a task — reap the agent and close the stream.
|
||||
closeStream();
|
||||
void prompterLiveApi.stop(sid).catch(() => undefined);
|
||||
clearPersisted();
|
||||
sessionIdRef.current = null;
|
||||
redraftTaskIdRef.current = null;
|
||||
setCreatedTaskId(task_id);
|
||||
setCreatedTaskTitle(draft.title);
|
||||
setCreatedTaskTeam(effectiveTeam);
|
||||
@@ -605,7 +668,7 @@ export function usePrompter() {
|
||||
setIsLaunching(false);
|
||||
launchingRef.current = false;
|
||||
}
|
||||
}, [editableDraft, isValidForLaunch, closeStream]);
|
||||
}, [editableDraft, isValidForLaunch, closeStream, addMessage]);
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Reset to start another conversation
|
||||
@@ -655,6 +718,7 @@ export function usePrompter() {
|
||||
setInitialMessage,
|
||||
isFormValid,
|
||||
start,
|
||||
startRedraft,
|
||||
|
||||
// Chat + confirm
|
||||
send,
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { tasksApi, type TaskFilters } from "@/lib/api/tasks";
|
||||
import type {
|
||||
Task,
|
||||
TaskCreate,
|
||||
ProgressRequest,
|
||||
CheckpointRequest,
|
||||
CommitRequest,
|
||||
SoftBlockRequest,
|
||||
EscalateRequest,
|
||||
import {
|
||||
Team,
|
||||
type Task,
|
||||
type TaskCreate,
|
||||
type ProgressRequest,
|
||||
type CheckpointRequest,
|
||||
type CommitRequest,
|
||||
type SoftBlockRequest,
|
||||
type EscalateRequest,
|
||||
} from "@/types";
|
||||
|
||||
// Type for task updates - allows any Task field to be updated
|
||||
@@ -21,6 +22,7 @@ export const taskKeys = {
|
||||
details: () => [...taskKeys.all, "detail"] as const,
|
||||
detail: (id: string) => [...taskKeys.details(), id] as const,
|
||||
subtasks: (parentId: string) => [...taskKeys.all, "subtasks", parentId] as const,
|
||||
boardReview: (id: string) => [...taskKeys.all, "board-review", id] as const,
|
||||
stats: () => [...taskKeys.all, "stats"] as const,
|
||||
statsByTeam: () => [...taskKeys.all, "stats-by-team"] as const,
|
||||
};
|
||||
@@ -39,6 +41,25 @@ export function useTask(taskId: string) {
|
||||
queryKey: taskKeys.detail(taskId),
|
||||
queryFn: () => tasksApi.get(taskId),
|
||||
enabled: !!taskId,
|
||||
// No per-task websocket exists, so while a board task is mid-review we poll
|
||||
// the detail so the "Approve & Start" button appears as soon as the board
|
||||
// finishes. Polling stops the moment board_review_complete flips true.
|
||||
refetchInterval: (query) =>
|
||||
query.state.data?.team === Team.BOARD &&
|
||||
!query.state.data?.board_review_complete
|
||||
? 4000
|
||||
: false,
|
||||
});
|
||||
}
|
||||
|
||||
// The board's review (PO + Head of Marketing) for a task. Enabled lazily so
|
||||
// it's only fetched where it's shown (e.g. the approve/redraft surface).
|
||||
export function useBoardReview(taskId: string, enabled = true) {
|
||||
return useQuery({
|
||||
queryKey: taskKeys.boardReview(taskId),
|
||||
queryFn: () => tasksApi.getBoardReview(taskId),
|
||||
enabled: !!taskId && enabled,
|
||||
staleTime: 30000,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -67,6 +67,15 @@ export const prompterLiveApi = {
|
||||
return data;
|
||||
},
|
||||
|
||||
/** Re-open intake to re-draft a board-reviewed task with the board's feedback.
|
||||
* Spawns a fresh session seeded with the current draft + the board review. */
|
||||
reInterview: async (taskId: string): Promise<StartLiveResponse> => {
|
||||
const { data } = await api.post<StartLiveResponse>(
|
||||
`/prompter/live/re-interview/${taskId}`
|
||||
);
|
||||
return data;
|
||||
},
|
||||
|
||||
/** SSE URL the panel opens to watch the agent. EventSource sends no headers
|
||||
* (the route is keyed by the opaque session id on the trusted network). */
|
||||
streamUrl: (sessionId: string): string =>
|
||||
|
||||
@@ -44,4 +44,7 @@ export interface ConfirmPayload {
|
||||
product_id?: string;
|
||||
draft?: DraftProposal;
|
||||
route?: "board" | "main_pm";
|
||||
// Set on a board-informed re-draft: the confirm updates this existing task in
|
||||
// place instead of creating a new one (scope is taken from the task).
|
||||
task_id?: string;
|
||||
}
|
||||
|
||||
@@ -21,6 +21,16 @@ export interface TaskFilters {
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
// One board reviewer's decision-log entry for a task (PO or Head of Marketing).
|
||||
// Matches the backend BoardReviewEntry schema.
|
||||
export interface BoardReviewEntry {
|
||||
author: string;
|
||||
author_role: string;
|
||||
title: string;
|
||||
content: string;
|
||||
timestamp: string | null;
|
||||
}
|
||||
|
||||
export const tasksApi = {
|
||||
// List tasks with optional filters
|
||||
list: async (filters?: TaskFilters): Promise<Task[]> => {
|
||||
@@ -58,6 +68,16 @@ export const tasksApi = {
|
||||
return data;
|
||||
},
|
||||
|
||||
// The board's review (PO + Head of Marketing decision logs) for a task,
|
||||
// oldest-first. Empty until the board has reviewed.
|
||||
getBoardReview: async (taskId: string): Promise<BoardReviewEntry[]> => {
|
||||
if (isMockMode()) return [];
|
||||
const { data } = await api.get<BoardReviewEntry[]>(
|
||||
"/tasks/" + taskId + "/board-review",
|
||||
);
|
||||
return data;
|
||||
},
|
||||
|
||||
// Create task
|
||||
create: async (task: TaskCreate): Promise<Task> => {
|
||||
if (isMockMode()) {
|
||||
|
||||
Reference in New Issue
Block a user