bce9fd266a
* feat(backend): multi-question support for ask_user_question_kandev
Reshape the MCP tool from a single prompt+options pair to a questions[]
array (1-4 entries, single-choice each, custom text fallback). The
clarification HTTP handler gates the response until every question has an
answer, fans out one chat message per question (sharing pending_id, with
question_index/question_total in metadata), and returns a JSON map keyed
by question id back to the agent. The orchestrator resume prompt now
formats multi-line Q1/A1, Q2/A2 summaries when the bundle has more than
one question. Mock-agent gets a clarification-multi scenario and
ask_user_question_test.go covers the new schema + map response. No
back-compat shim — local-first tool, single-PR breaking change.
* feat(web): refresh clarification overlay with multi-question + modern UI
Each per-question chat message gets its own card with a "Question N of M"
progress chip, a ✓ Answered badge once committed, and shadcn-aligned
option buttons with kbd hints. A new useClarificationGroup hook coordinates
the per-question commits (decision A) and posts every answer in a single
batch once the user finishes the bundle; X rejects the whole group. The
single-question case keeps the 1-9 / Esc keyboard shortcuts. Playwright
e2e adds 6 multi-question scenarios (rendering, full happy path, partial
state, mixed option/custom, skip-rejects-bundle, sibling-state) on top of
the existing single-question regression suite.
* fix(web): clarification carousel UX with stepper navigation + race fix
Replaces the vertically stacked card layout with a horizontal stepper:
numbered circle dots up top show step state (active/answered/pending),
the single active question card sits in the middle, and Back / Next /
Submit buttons sit at the bottom. Picking an option auto-advances to the
next step (single-question case auto-submits, no explicit Submit button).
The stepper steps are clickable so users can revise prior answers.
Keyboard shortcuts: 1-9 for option pick, ArrowLeft/Right for navigation,
Esc for skip.
Also fixes a race that surfaced as a 400 BadRequest on the
/api/v1/clarification/:id/respond endpoint when the user clicked an
option before all N messages of a multi-question bundle had streamed in:
findPendingClarificationGroup now gates on metadata.question_total and
returns an empty array until the full bundle has arrived.
Playwright suite expanded from 6 to 12 multi-question scenarios:
stepper rendering, auto-advance, Back, stepper jump, Submit gating,
happy path, mixed custom-text, revise-via-jump, skip-from-mid-step,
number-key shortcuts, Esc skip, first-step Back disabled.
* fix(clarification): address CodeRabbit/Greptile/Claude review comments
Backend:
- Single source of truth for question validation: rename/export
NormalizeAndValidateQuestions and call it from both the HTTP and the
WebSocket-side MCP handlers, so duplicate question ids and bad option
counts can't slip through either path.
- httpRespond now validates that every answer references a real question
id from the bundle and that no id is answered twice (regression tests
added).
- questionsFromMessages reorders by metadata.question_index so the
reconstructed bundle preserves the original question order.
- adapters.CreateClarificationRequestMessages rolls back already-created
messages when a later write in the bundle fails.
- extractQuestionAnswers always returns a JSON map (even on rejection,
with an envelope { rejected, reject_reason }) and simplifyAnswer
preserves both selected_option and custom_text when both are present.
- MCP tool description: rewrite the response example to match the actual
output shape; add minItems / maxItems to the questions and options
arrays in the JSON Schema.
- Test helper: drop the local contains() shim, use strings.Contains.
Frontend:
- useMemo([props]) was a no-op (props is always a fresh ref); split into
[message, messages] so it actually memoizes.
- Drop the dead "expired" SubmitState branch — the backend never returns
410 from this endpoint.
- Remove the asymmetric option-list dimming: the agent now receives both
selected_option and custom_text together, so a half-grey state was
misleading.
- New tests: pending-clarification.test.ts covers
findPendingClarificationGroup including the question_total gate, and
use-clarification-group.test.ts covers the hook's record/submit/skip
flows and the override-merge path used by the single-question case.
* fix(web): treat clarification 409 as success so duplicate submit doesn't stick the overlay
* fix(clarification): unblock agent on persistence failure + nil-guard rejected branch
- Add Store.CancelRequest(pendingID) and call it from both the WebSocket
MCP handler and the HTTP create-request handler when message creation
fails. Without it, the agent's WaitForResponse parked for the full
2-hour MCP timeout while no clarification cards ever reached the user.
Both handlers now return an explicit error response on failure.
- applyAnswersToMessages now guards h.repo == nil in the rejected branch
(parity with sibling expectedQuestionIDs).
- extractQuestionAnswers stubs for unanswered questions in a rejected
bundle now carry { answered: false, rejected: true } so agents reading
per-question payloads see the rejection without inspecting the
envelope.
- Hook test: added 409-as-ok regression coverage for both submit and
skip paths so the previous fix can't drift.
- Store test: covers CancelRequest unblocking a parked WaitForResponse.
* fix: drop unused e2e helper + use channel sync in CancelRequest test
* refactor(web): drop dead 'message' prop from clarification overlay
Both call sites pass 'messages' (the bundle group), so the legacy
single-message prop was unused. Tightening the prop type also lets the
useMemo depend on a single value.
* fix(web): ignore modifier-keyed events in clarification carousel shortcuts
Bare 1..9 / ArrowLeft / ArrowRight / Esc still drive the carousel, but
Cmd/Ctrl+1..9 (browser tab switch) and Alt+ArrowLeft (browser back) now
pass through as the user expects.
135 lines
4.1 KiB
TypeScript
135 lines
4.1 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import type { Message } from "@/lib/types/http";
|
|
import { findPendingClarificationGroup, hasPendingClarification } from "./pending-clarification";
|
|
|
|
function message(overrides: Partial<Message>): Message {
|
|
return {
|
|
id: "msg-1",
|
|
session_id: "session-1",
|
|
task_id: "task-1",
|
|
author_type: "agent",
|
|
content: "",
|
|
type: "message",
|
|
created_at: "2026-05-02T00:00:00Z",
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("hasPendingClarification", () => {
|
|
it("detects clarification requests with pending status", () => {
|
|
expect(
|
|
hasPendingClarification([
|
|
message({
|
|
type: "clarification_request",
|
|
metadata: { status: "pending" },
|
|
}),
|
|
]),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("treats missing clarification status as pending", () => {
|
|
expect(hasPendingClarification([message({ type: "clarification_request" })])).toBe(true);
|
|
});
|
|
|
|
it("ignores answered clarification requests and ordinary messages", () => {
|
|
expect(
|
|
hasPendingClarification([
|
|
message({ type: "message" }),
|
|
message({
|
|
type: "clarification_request",
|
|
metadata: { status: "answered" },
|
|
}),
|
|
]),
|
|
).toBe(false);
|
|
});
|
|
|
|
it("treats rejected and expired clarifications as not pending", () => {
|
|
expect(
|
|
hasPendingClarification([
|
|
message({
|
|
type: "clarification_request",
|
|
metadata: { status: "rejected" },
|
|
}),
|
|
]),
|
|
).toBe(false);
|
|
expect(
|
|
hasPendingClarification([
|
|
message({
|
|
type: "clarification_request",
|
|
metadata: { status: "expired" },
|
|
}),
|
|
]),
|
|
).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("findPendingClarificationGroup", () => {
|
|
it("returns empty array when there are no messages", () => {
|
|
expect(findPendingClarificationGroup([])).toEqual([]);
|
|
expect(findPendingClarificationGroup(null)).toEqual([]);
|
|
expect(findPendingClarificationGroup(undefined)).toEqual([]);
|
|
});
|
|
|
|
it("returns empty array when there is no pending clarification", () => {
|
|
expect(
|
|
findPendingClarificationGroup([
|
|
message({ type: "clarification_request", metadata: { status: "answered" } }),
|
|
]),
|
|
).toEqual([]);
|
|
});
|
|
|
|
it("returns the single message when no pending_id is set", () => {
|
|
const msg = message({ type: "clarification_request" });
|
|
expect(findPendingClarificationGroup([msg])).toEqual([msg]);
|
|
});
|
|
|
|
it("returns every message that shares the latest pending_id", () => {
|
|
const a = message({
|
|
id: "a",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p1", question_total: 3, question_index: 0, status: "pending" },
|
|
});
|
|
const b = message({
|
|
id: "b",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p1", question_total: 3, question_index: 1, status: "pending" },
|
|
});
|
|
const c = message({
|
|
id: "c",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p1", question_total: 3, question_index: 2, status: "pending" },
|
|
});
|
|
const noise = message({ id: "n", type: "message" });
|
|
expect(findPendingClarificationGroup([noise, a, b, c]).map((m) => m.id)).toEqual([
|
|
"a",
|
|
"b",
|
|
"c",
|
|
]);
|
|
});
|
|
|
|
it("gates on question_total — returns [] when not all messages have arrived", () => {
|
|
// Backend declared 3 questions but only 1 has streamed in; the overlay
|
|
// should stay hidden until the remaining 2 land.
|
|
const a = message({
|
|
id: "a",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p1", question_total: 3, question_index: 0, status: "pending" },
|
|
});
|
|
expect(findPendingClarificationGroup([a])).toEqual([]);
|
|
});
|
|
|
|
it("ignores messages from a different pending bundle", () => {
|
|
const old = message({
|
|
id: "old",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p0", status: "answered" },
|
|
});
|
|
const a = message({
|
|
id: "a",
|
|
type: "clarification_request",
|
|
metadata: { pending_id: "p1", question_total: 1, status: "pending" },
|
|
});
|
|
expect(findPendingClarificationGroup([old, a]).map((m) => m.id)).toEqual(["a"]);
|
|
});
|
|
});
|