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.
156 lines
4.9 KiB
TypeScript
156 lines
4.9 KiB
TypeScript
"use client";
|
|
|
|
import { memo, useCallback, useEffect, useRef, useState } from "react";
|
|
import { useSettingsData } from "@/hooks/domains/settings/use-settings-data";
|
|
import { type ChatInputContainerHandle } from "@/components/task/chat/chat-input-container";
|
|
import {
|
|
QueuedMessageIndicator,
|
|
type QueuedMessageIndicatorHandle,
|
|
} from "@/components/task/chat/queued-message-indicator";
|
|
import { MessageList } from "@/components/task/chat/message-list";
|
|
import { useChatPanelState } from "@/components/task/chat/use-chat-panel-state";
|
|
import {
|
|
ChatInputArea,
|
|
useSubmitHandler,
|
|
useChatPanelHandlers,
|
|
} from "@/components/task/chat/chat-input-area";
|
|
import { ClarificationInputOverlay } from "@/components/task/chat/clarification-input-overlay";
|
|
|
|
type QuickChatContentProps = {
|
|
sessionId: string;
|
|
minimalToolbar?: boolean;
|
|
placeholderOverride?: string;
|
|
initialPrompt?: string;
|
|
onInitialPromptSent?: () => void;
|
|
};
|
|
|
|
function useQuickChatState(sessionId: string) {
|
|
const chatInputRef = useRef<ChatInputContainerHandle>(null);
|
|
const queuedMessageRef = useRef<QueuedMessageIndicatorHandle>(null);
|
|
|
|
useSettingsData(true);
|
|
const panelState = useChatPanelState({
|
|
sessionId,
|
|
onOpenFile: undefined,
|
|
onOpenFileAtLine: undefined,
|
|
});
|
|
const { isSending, handleSubmit } = useSubmitHandler(panelState, undefined);
|
|
const { cancelQueue } = panelState;
|
|
const { handleCancelTurn, handleCancelQueue, handleQueueEditComplete } = useChatPanelHandlers(
|
|
panelState.resolvedSessionId,
|
|
cancelQueue,
|
|
chatInputRef,
|
|
);
|
|
|
|
return {
|
|
chatInputRef,
|
|
queuedMessageRef,
|
|
panelState,
|
|
isSending,
|
|
handleSubmit,
|
|
handleCancelTurn,
|
|
handleCancelQueue,
|
|
handleQueueEditComplete,
|
|
};
|
|
}
|
|
|
|
export const QuickChatContent = memo(function QuickChatContent({
|
|
sessionId,
|
|
minimalToolbar,
|
|
placeholderOverride,
|
|
initialPrompt,
|
|
onInitialPromptSent,
|
|
}: QuickChatContentProps) {
|
|
const [clarificationKey, setClarificationKey] = useState(0);
|
|
const initialPromptSent = useRef(false);
|
|
const state = useQuickChatState(sessionId);
|
|
const {
|
|
chatInputRef,
|
|
queuedMessageRef,
|
|
panelState,
|
|
isSending,
|
|
handleSubmit,
|
|
handleCancelTurn,
|
|
handleCancelQueue,
|
|
handleQueueEditComplete,
|
|
} = state;
|
|
const {
|
|
taskId,
|
|
pendingClarification,
|
|
pendingClarificationGroup,
|
|
isQueued,
|
|
queuedMessage,
|
|
updateQueueContent,
|
|
} = panelState;
|
|
|
|
useEffect(() => {
|
|
const timer = setTimeout(() => chatInputRef.current?.focusInput(), 50);
|
|
return () => clearTimeout(timer);
|
|
}, [chatInputRef]);
|
|
|
|
useEffect(() => {
|
|
if (!initialPrompt || !taskId || initialPromptSent.current) return;
|
|
initialPromptSent.current = true;
|
|
handleSubmit(initialPrompt);
|
|
onInitialPromptSent?.();
|
|
}, [initialPrompt, taskId, handleSubmit, onInitialPromptSent]);
|
|
|
|
const handleClarificationResolved = useCallback(() => setClarificationKey((k) => k + 1), []);
|
|
|
|
return (
|
|
<div className="flex flex-col flex-1 min-h-0">
|
|
<div className="flex-1 min-h-0 overflow-hidden">
|
|
<MessageList
|
|
items={panelState.groupedItems}
|
|
messages={panelState.allMessages}
|
|
permissionsByToolCallId={panelState.permissionsByToolCallId}
|
|
childrenByParentToolCallId={panelState.childrenByParentToolCallId}
|
|
taskId={taskId ?? undefined}
|
|
sessionId={panelState.resolvedSessionId}
|
|
messagesLoading={panelState.messagesLoading}
|
|
isWorking={panelState.isWorking}
|
|
sessionState={panelState.session?.state}
|
|
taskState={panelState.task?.state}
|
|
worktreePath={panelState.session?.worktree_path}
|
|
onOpenFile={undefined}
|
|
/>
|
|
</div>
|
|
{pendingClarification && (
|
|
<div className="flex-shrink-0 border-t border-sky-400/30 bg-card px-1">
|
|
<ClarificationInputOverlay
|
|
messages={pendingClarificationGroup}
|
|
onResolved={handleClarificationResolved}
|
|
/>
|
|
</div>
|
|
)}
|
|
{isQueued && queuedMessage && (
|
|
<div className="flex-shrink-0 bg-card px-3 pt-1.5">
|
|
<QueuedMessageIndicator
|
|
ref={queuedMessageRef}
|
|
content={queuedMessage.content}
|
|
onCancel={handleCancelQueue}
|
|
onUpdate={updateQueueContent}
|
|
isVisible={true}
|
|
onEditComplete={handleQueueEditComplete}
|
|
/>
|
|
</div>
|
|
)}
|
|
<ChatInputArea
|
|
chatInputRef={chatInputRef}
|
|
clarificationKey={clarificationKey}
|
|
onClarificationResolved={handleClarificationResolved}
|
|
handleSubmit={handleSubmit}
|
|
handleCancelTurn={handleCancelTurn}
|
|
showRequestChangesTooltip={false}
|
|
onRequestChangesTooltipDismiss={undefined}
|
|
panelState={panelState}
|
|
isSending={isSending}
|
|
hideSessionsDropdown={true}
|
|
minimalToolbar={minimalToolbar}
|
|
hidePlanMode={true}
|
|
placeholderOverride={placeholderOverride}
|
|
/>
|
|
</div>
|
|
);
|
|
});
|