Sidebar (replaces the modal drawer): - Inline, toggleable, no backdrop/focus theft — can stay open while working - Open state persists across pages (provider in root layout) and reloads (localStorage; starts closed server-side to avoid hydration mismatch, stored value applied post-mount; default open on first run) - Hamburger in page headers only when closed; close button in sidebar header Floating composer blob (per reference screenshot): - Floats over the transcript (absolute overlay), persists at bottom while scrolling, content fades behind it (gradient mask); pb-44 scroll clearance - Concentric corner radii: blob rounded-2xl(16px) − p-1.5(6px) = send rounded-[10px] = 25% of the 40px button; CornerDownLeft icon per reference - Stop moved from header into the blob (busy → square icon) - prompt-input.tsx + 7 orphan ui files pruned (attachments/command palette unused); hand-rolled Composer is ~100 lines and render-tested Pending-question morph (one text field on screen, never two): - Quiz/ask-select pending → blob becomes the note field (send hidden, hint line above); card's internal note input removed; Submit consumes it - Ask free-text pending → blob becomes the answer field; its send submits via the card's registered submit api (ref bridge); Enter works - Chat owns the single text state; card clears it on submit - canSend for answer mode mirrors the card predicate directly — reading the ref during render lagged one commit (found in browser testing) Widths: one shared column (max-w-3xl + px-4) for transcript, cards, and composer — all three measured pixel-identical (left 416, width 736). Assistant Message max-w-full/MessageContent w-full (was max-w-[95%]/w-fit — the 'cards are a bit shorter' bug). User messages render plain text again — no math pipeline on learner-authored text (currency hazard accepted for the model only, guarded by the prompt). Tests: 58 pass (5 new composer pins; card tests updated to controlled props). Verified live: note flow, answer flow, sidebar persistence, float, fade, zero console errors — plus the live model spontaneously honoring the $ currency escape contract in a continuation.
243 lines
7.9 KiB
TypeScript
243 lines
7.9 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect, useMemo, useState } from "react";
|
|
import { Button } from "@/components/ui/button";
|
|
import { MessageResponse } from "@/components/ai-elements/message";
|
|
import { cn } from "@/lib/utils";
|
|
import type { AskToolInput, QuizToolInput } from "@/src/agent/tools";
|
|
import {
|
|
buildAnswer,
|
|
coerceCorrectAnswer,
|
|
normalizeOptions,
|
|
resolveCorrect,
|
|
seededRandom,
|
|
shuffleOptions,
|
|
type AnswerRequest,
|
|
type QuestionAnswerData,
|
|
type QuestionData,
|
|
type QuestionMode,
|
|
} from "@/src/core/question-core";
|
|
|
|
/**
|
|
* The pending interaction card — renders when a quiz/ask tool part is in
|
|
* `input-available` state. Owns selection state (single source of truth —
|
|
* buttons, not native inputs), grades via question-core, and submits the
|
|
* structured answer record as the tool output.
|
|
*
|
|
* Quiz: graded (single/multi-select + "I don't know").
|
|
* Ask: not graded (single/multi-select + "Other" free text, or text mode).
|
|
*
|
|
* The card owns selection state; the free-text field lives in the composer
|
|
* blob (one text input on screen, never two). `pendingText` is the controlled
|
|
* text: the note for select modes, the answer for text mode. `registerSubmit`
|
|
* lets the composer trigger submit (Enter in answer mode).
|
|
*/
|
|
|
|
export interface QuizCardSubmitApi {
|
|
submit: () => void;
|
|
canSubmit: () => boolean;
|
|
}
|
|
|
|
export interface QuizCardProps {
|
|
toolName: "quiz" | "ask_user_question";
|
|
toolCallId: string;
|
|
input: QuizToolInput | AskToolInput;
|
|
onSubmit: (output: QuestionAnswerData) => void;
|
|
pendingText: string;
|
|
onPendingTextChange: (v: string) => void;
|
|
registerSubmit?: (api: QuizCardSubmitApi | null) => void;
|
|
}
|
|
|
|
export function QuizCard({ toolName, toolCallId, input, onSubmit, pendingText, onPendingTextChange, registerSubmit }: QuizCardProps) {
|
|
const kind = toolName === "quiz" ? ("quiz" as const) : ("ask" as const);
|
|
|
|
// Build the canonical QuestionData once per question. Quiz options are
|
|
// deterministically shuffled (seeded by toolCallId) so position never leaks
|
|
// correctness AND server/client render the same order (hydration-safe);
|
|
// the display order is snapshotted into the answer record at submit time.
|
|
const qd = useMemo<QuestionData>(() => {
|
|
const quizInput = kind === "quiz" ? (input as QuizToolInput) : null;
|
|
const askInput = kind === "ask" ? (input as AskToolInput) : null;
|
|
const multi = input.multiSelect === true;
|
|
const mode: QuestionMode =
|
|
kind === "quiz"
|
|
? multi
|
|
? "multi-select"
|
|
: "single-select"
|
|
: (askInput?.mode ?? (askInput?.options?.length ? (multi ? "multi-select" : "single-select") : "text"));
|
|
const options = normalizeOptions((quizInput?.options ?? askInput?.options ?? []) as { label: string; value?: string }[]);
|
|
const ordered = kind === "quiz" && options.length > 0 ? shuffleOptions(options, seededRandom(toolCallId)) : options;
|
|
const q: QuestionData = {
|
|
id: toolCallId,
|
|
kind,
|
|
question: input.question,
|
|
context: input.details,
|
|
mode,
|
|
options: ordered,
|
|
createdAt: new Date().toISOString(),
|
|
};
|
|
if (quizInput) {
|
|
const resolved = resolveCorrect(coerceCorrectAnswer(quizInput.correctAnswer), ordered);
|
|
if (resolved.error) console.error("[quiz] correctAnswer did not resolve:", resolved.error);
|
|
q.correctIndices = resolved.indices;
|
|
q.explanation = quizInput.explanation;
|
|
}
|
|
return q;
|
|
}, [toolCallId, kind, input]);
|
|
|
|
const [selected, setSelected] = useState<Set<number>>(new Set()); // 0-based indices
|
|
const [dontKnow, setDontKnow] = useState(false);
|
|
const [showOther, setShowOther] = useState(false);
|
|
const [other, setOther] = useState("");
|
|
// Free text lives in the composer blob: note (select modes) or answer (text mode).
|
|
const note = pendingText;
|
|
const text = pendingText;
|
|
|
|
const toggle = (idx: number) => {
|
|
setDontKnow(false);
|
|
setShowOther(false);
|
|
setSelected((prev) => {
|
|
if (qd.mode === "multi-select") {
|
|
const next = new Set(prev);
|
|
if (next.has(idx)) next.delete(idx);
|
|
else next.add(idx);
|
|
return next;
|
|
}
|
|
return new Set([idx]);
|
|
});
|
|
};
|
|
|
|
const pickDontKnow = () => {
|
|
setSelected(new Set());
|
|
setShowOther(false);
|
|
setDontKnow((v) => !v);
|
|
};
|
|
|
|
const pickOther = () => {
|
|
setSelected(new Set());
|
|
setDontKnow(false);
|
|
setShowOther(true);
|
|
};
|
|
|
|
const canSubmit =
|
|
qd.mode === "text"
|
|
? text.trim().length > 0
|
|
: dontKnow || (showOther && other.trim().length > 0) || selected.size > 0;
|
|
|
|
const submit = () => {
|
|
if (!canSubmit) return;
|
|
const req: AnswerRequest = {
|
|
dontKnow,
|
|
values: [...selected].map((i) => qd.options[i]!.value),
|
|
other: showOther ? other : undefined,
|
|
text: qd.mode === "text" ? text : undefined,
|
|
note: qd.mode !== "text" ? note.trim() || undefined : undefined,
|
|
};
|
|
onPendingTextChange("");
|
|
onSubmit(buildAnswer(qd, req));
|
|
};
|
|
|
|
// Let the composer blob submit on Enter (answer mode).
|
|
useEffect(() => {
|
|
if (!registerSubmit) return;
|
|
registerSubmit({ submit, canSubmit: () => canSubmit });
|
|
return () => registerSubmit(null);
|
|
});
|
|
|
|
return (
|
|
<div className="rounded-xl border bg-card p-4 text-card-foreground" data-testid="quiz-card">
|
|
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
|
{kind === "quiz" ? "Quiz" : "Question"}
|
|
{qd.mode === "multi-select" && " · select all that apply"}
|
|
</div>
|
|
<div className="mb-3 font-medium">
|
|
<MessageResponse>{qd.question}</MessageResponse>
|
|
</div>
|
|
{qd.context && (
|
|
<div className="mb-3 text-sm text-muted-foreground">
|
|
<MessageResponse>{qd.context}</MessageResponse>
|
|
</div>
|
|
)}
|
|
|
|
{qd.mode !== "text" && (
|
|
<div className="flex flex-col gap-2" role={qd.mode === "multi-select" ? "group" : "radiogroup"}>
|
|
{qd.options.map((opt, i) => {
|
|
const isSel = selected.has(i);
|
|
return (
|
|
<button
|
|
key={opt.value}
|
|
type="button"
|
|
role={qd.mode === "multi-select" ? "checkbox" : "radio"}
|
|
aria-checked={isSel}
|
|
onClick={() => toggle(i)}
|
|
className={cn(
|
|
"flex items-start gap-3 rounded-lg border px-3 py-2 text-left text-sm transition-colors",
|
|
isSel ? "border-primary bg-accent" : "hover:bg-accent/50",
|
|
)}
|
|
>
|
|
<span
|
|
className={cn(
|
|
"mt-0.5 flex size-4 shrink-0 items-center justify-center border",
|
|
qd.mode === "multi-select" ? "rounded-sm" : "rounded-full",
|
|
isSel ? "border-primary bg-primary text-primary-foreground" : "border-muted-foreground/40",
|
|
)}
|
|
>
|
|
{isSel && <span className={cn(qd.mode === "multi-select" ? "text-[10px]" : "size-1.5 rounded-full bg-current")}>{qd.mode === "multi-select" ? "✓" : ""}</span>}
|
|
</span>
|
|
<span>
|
|
<MessageResponse>{opt.label}</MessageResponse>
|
|
{opt.description && <span className="block text-xs text-muted-foreground">{opt.description}</span>}
|
|
</span>
|
|
</button>
|
|
);
|
|
})}
|
|
|
|
{kind === "quiz" && (
|
|
<button
|
|
type="button"
|
|
onClick={pickDontKnow}
|
|
aria-pressed={dontKnow}
|
|
className={cn(
|
|
"rounded-lg border border-dashed px-3 py-2 text-left text-sm text-muted-foreground transition-colors",
|
|
dontKnow && "border-primary text-foreground",
|
|
)}
|
|
>
|
|
I don't know
|
|
</button>
|
|
)}
|
|
|
|
{kind === "ask" && (
|
|
<button
|
|
type="button"
|
|
onClick={pickOther}
|
|
aria-pressed={showOther}
|
|
className={cn(
|
|
"rounded-lg border border-dashed px-3 py-2 text-left text-sm text-muted-foreground transition-colors",
|
|
showOther && "border-primary text-foreground",
|
|
)}
|
|
>
|
|
Other…
|
|
</button>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{showOther && (
|
|
<textarea
|
|
className="mt-2 w-full rounded-lg border bg-background px-3 py-2 text-sm outline-none focus:ring-1 focus:ring-ring"
|
|
rows={2}
|
|
placeholder="Type your own answer…"
|
|
value={other}
|
|
onChange={(e) => setOther(e.target.value)}
|
|
/>
|
|
)}
|
|
|
|
<div className="mt-3 flex justify-end">
|
|
<Button size="sm" onClick={submit} disabled={!canSubmit}>
|
|
Submit answer
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|