+ {/* Mirrors the overlaid actions so only the first line wraps clear of them; the end margin cancels 12px of the band's 16px inset. + Its height matches that first line, so a 16px eyebrow does not push its second line clear too. */} + + {actionsHint} + {questionCount ? ( + {questionCount} + ) : null} + + {prompt.dismissible ? : null} + + {showHeader ? ( +

+ {activeQuestion.multiSelect + ? `${activeQuestion.header} · Select any` - - - - - {activeQuestion.multiSelect ? ( -

Select one or more options.

- ) : null} -

- {activeQuestion.options.map((option, index) => { +

+ ) : null} + +

+ {/* Row fills hang 12px past the text column so labels stay on its edge. */} +

+ {selectableOptionEntries.map(({ option, index }, selectableIndex) => { const optionValue = option.value ?? option.label; const isOptimisticallySelected = optimisticSingleSelect?.questionId === activeQuestion.id && optimisticSingleSelect.optionValue === optionValue; const isSelected = isOptimisticallySelected || draftSelectedOptions?.[index] === true; - const shortcutKey = index < 9 ? index + 1 : null; - const className = cn( - "group flex w-full items-center gap-2 rounded-md px-2.5 py-2 text-left outline-none transition-colors duration-150 focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-primary/25", - isSelected - ? "bg-muted/55 text-foreground" - : "bg-transparent text-foreground/85 hover:bg-muted/30", - (disabled || isResponding) && "opacity-50 cursor-not-allowed", - !disabled && !isResponding && "cursor-pointer", - ); - const content = ( - <> -

- {option.label} - {option.description && option.description !== option.label ? ( - {option.description} - ) : null} -

- {isSelected ? ( - - ) : shortcutKey !== null ? ( - - {shortcutKey} - - ) : null} - - ); return ( ); })} + {customAnswerOptions.map((option) => { + const optionValue = option.value ?? option.label; + return ( +

+ + {option.label} + + + {option.description && option.description !== option.label + ? option.description + : null} + + + + +

+ ); + })}

``` ## apps/web/src/pendingUserInput.test.ts Status: modified; +42; −0 ```diff @@ -134,9 +134,51 @@ }), ).toBeNull(); }); + + it("does not treat a custom-answer option as a selected answer", () => { + const question = { + ...singleSelectQuestion, + options: [ + ...singleSelectQuestion.options, + { + label: "Write my own answer", + description: "Write my own answer", + customAnswer: true, + }, + ], + }; + expect( + resolvePendingUserInputAnswer(question, { + selectedOptionValues: ["Write my own answer"], + }), + ).toBeNull(); + expect( + resolvePendingUserInputAnswer(question, { + customAnswer: "Start with the user-visible behavior", + }), + ).toBe("Start with the user-visible behavior"); + }); }); describe("togglePendingUserInputOptionSelection", () => { + it("ignores custom-answer options", () => { + const question = { + ...singleSelectQuestion, + options: [ + ...singleSelectQuestion.options, + { + label: "Write my own answer", + description: "Write my own answer", + customAnswer: true, + }, + ], + }; + const draft = { selectedOptionValues: ["Orchestration-first"] }; + expect(togglePendingUserInputOptionSelection(question, draft, "Write my own answer")).toBe( + draft, + ); + }); + it("selects and removes options with the same label independently", () => { const question = { ...nativeChoiceQuestion, multiSelect: true }; const firstSelected = togglePendingUserInputOptionSelection(question, undefined, " first\t"); ``` ## apps/web/src/pendingUserInput.ts Status: modified; +11; −1 ```diff @@ -80,7 +80,10 @@ } const selectedOptionValues = normalizeSelectedOptionValues(draft?.selectedOptionValues).filter( + (value) => + question.options.some( - (value) => question.options.some((option) => (option.value ?? option.label) === value), + (option) => option.customAnswer !== true && (option.value ?? option.label) === value, + ), ); if (question.multiSelect) { return selectedOptionValues.length > 0 @@ -162,6 +165,13 @@ draft: PendingUserInputDraftAnswer | undefined, optionValue: string, ): PendingUserInputDraftAnswer { + if ( + question.options.some( + (option) => option.customAnswer === true && (option.value ?? option.label) === optionValue, + ) + ) { + return draft ?? {}; + } if (question.multiSelect) { const selectedOptionValues = normalizeSelectedOptionValues(draft?.selectedOptionValues); const nextSelectedOptionValues = selectedOptionValues.includes(optionValue) ``` ## packages/client-runtime/src/state/threadDetail.test.ts Status: modified; +59; −0 ```diff @@ -2,7 +2,9 @@ EnvironmentId, EventId, MessageId, + NodeId, RunId, + RuntimeRequestId, TurnItemId, type OrchestrationV2ThreadProjection, type OrchestrationV2TurnItem, @@ -313,3 +315,60 @@ [assistant.id, 1], ]); }); + +describe("pendingRequestsAtom", () => { + it("keeps queue positions after an earlier question is answered", () => { + const nodeId = NodeId.make("question-node"); + const ids = ["a", "b", "c"].map((id) => RuntimeRequestId.make(id)); + const projection: OrchestrationV2ThreadProjection = { + ...v2Projection, + runtimeRequests: ids.map((id, index) => ({ + id, + nodeId, + providerTurnId: null, + nativeRequestRef: null, + kind: "user_input", + responseCapability: { type: "message" }, + createdAt: v2Now, + ...(index === 0 + ? { status: "resolved", resolvedAt: later } + : { status: "pending", resolvedAt: null }), + })), + turnItems: ids.map((id) => ({ + ...assistant, + id: TurnItemId.make(`${id}-item`), + status: "completed", + type: "user_input_request", + requestId: id, + responseMode: "message", + questions: [ + { + id, + header: "Next", + question: "Next?", + options: [], + required: true, + allowCustomAnswer: true, + }, + ], + })), + }; + const state = Atom.make( + AsyncResult.success({ ...EMPTY_ENVIRONMENT_THREAD_STATE, data: Option.some(projection) }), + ); + const pending = createEnvironmentThreadDetailAtoms(() => state).pendingRequestsAtom({ + environmentId: EnvironmentId.make("env"), + threadId: v2ThreadId, + }); + const registry = AtomRegistry.make(); + const unmount = registry.mount(pending); + + expect(registry.get(pending)?.userInputs[0]).toMatchObject({ + requestId: ids[1], + queueQuestionIndex: 1, + queueQuestionTotal: 3, + }); + unmount(); + registry.dispose(); + }); +}); ``` ## packages/client-runtime/src/state/threadDetail.ts Status: modified; +6; −1 ```diff @@ -379,8 +379,13 @@ value = null; return value; } + // Settled questions stay in so queue positions hold while the user answers. + const hasPendingUserInput = projection.runtimeRequests.some( + (request) => request.kind === "user_input" && request.status === "pending", + ); const runtimeRequests = projection.runtimeRequests.filter( + (request) => + request.status === "pending" || (hasPendingUserInput && request.kind === "user_input"), - (request) => request.status === "pending", ); const ids = new Set(runtimeRequests.map((request) => request.id)); const turnItems = ``` ## packages/client-runtime/src/state/threadRequests.test.ts Status: modified; +131; −0 ```diff @@ -5,6 +5,7 @@ TurnItemId, type OrchestrationV2ThreadProjection, } from "@t3tools/contracts"; +import * as DateTime from "effect/DateTime"; import { describe, expect, it, vi } from "vite-plus/test"; import { AsyncResult } from "effect/reactivity"; import * as Cause from "effect/Cause"; @@ -203,6 +204,8 @@ responseCapability: "message", responseMode: "message", dismissible: true, + queueQuestionIndex: 0, + queueQuestionTotal: 1, questions: [ { id: "next", @@ -236,6 +239,134 @@ }); }); +describe("pending question queues", () => { + const baseRequest = projection.runtimeRequests[0]!; + const baseItem = projection.turnItems[0]!; + if (baseItem.type !== "user_input_request") throw new Error("expected a question item"); + const question = baseItem.questions[0]!; + const at = (minute: number) => DateTime.add(v2Now, { minutes: minute }); + + const queue = ( + requests: ReadonlyArray<{ + readonly id: string; + readonly createdAt: number; + readonly resolvedAt?: number; + readonly questions?: number; + }>, + ) => { + const projected = { + ...projection, + runtimeRequests: requests.map((request) => ({ + ...baseRequest, + id: RuntimeRequestId.make(request.id), + createdAt: at(request.createdAt), + ...(request.resolvedAt === undefined + ? {} + : { status: "resolved" as const, resolvedAt: at(request.resolvedAt) }), + })), + turnItems: requests.map((request) => ({ + ...baseItem, + id: TurnItemId.make(`${request.id}-item`), + requestId: RuntimeRequestId.make(request.id), + questions: Array.from({ length: request.questions ?? 1 }, (_, index) => ({ + ...question, + id: `${request.id}-${index}`, + })), + })), + }; + return derivePendingThreadRequests(projected).userInputs.map((input) => [ + input.requestId, + input.queueQuestionIndex, + input.queueQuestionTotal, + ]); + }; + + it("orders pending questions by creation time, not projection order", () => { + expect( + queue([ + { id: "newer", createdAt: 2 }, + { id: "older", createdAt: 1 }, + ]), + ).toEqual([ + ["older", 0, 2], + ["newer", 1, 2], + ]); + }); + + it("counts simultaneous single-question requests as one queue", () => { + const ids = ["a", "b", "c", "d", "e"]; + expect(queue(ids.map((id, index) => ({ id, createdAt: index })))).toEqual( + ids.map((id, index) => [id, index, 5]), + ); + }); + + it("keeps queue positions after earlier questions are answered", () => { + expect( + queue([ + { id: "a", createdAt: 0, resolvedAt: 10 }, + { id: "b", createdAt: 0, resolvedAt: 11 }, + { id: "c", createdAt: 0 }, + { id: "d", createdAt: 0 }, + { id: "e", createdAt: 0 }, + ]), + ).toEqual([ + ["c", 2, 5], + ["d", 3, 5], + ["e", 4, 5], + ]); + }); + + it("starts a new queue for questions asked after the previous one resolved", () => { + expect( + queue([ + { id: "a", createdAt: 0, resolvedAt: 1 }, + { id: "b", createdAt: 2, resolvedAt: 3 }, + { id: "c", createdAt: 4 }, + ]), + ).toEqual([["c", 0, 1]]); + }); + + it("flattens multi-question prompts into the queue count", () => { + expect( + queue([ + { id: "a", createdAt: 0, questions: 3 }, + { id: "b", createdAt: 1 }, + ]), + ).toEqual([ + ["a", 0, 4], + ["b", 3, 4], + ]); + }); + + it("joins requests that overlap through a chain", () => { + expect( + queue([ + { id: "a", createdAt: 0, resolvedAt: 10 }, + { id: "b", createdAt: 5, resolvedAt: 20 }, + { id: "c", createdAt: 15 }, + ]), + ).toEqual([["c", 2, 3]]); + }); + + it("does not hold a queue open for a settled request without a resolution time", () => { + const projected = { + ...projection, + runtimeRequests: [ + { ...baseRequest, id: RuntimeRequestId.make("old"), status: "expired" as const }, + { ...baseRequest, id: requestId, createdAt: at(1) }, + ], + turnItems: [ + { ...baseItem, id: TurnItemId.make("old-item"), requestId: RuntimeRequestId.make("old") }, + baseItem, + ], + }; + expect(derivePendingThreadRequests(projected).userInputs[0]).toMatchObject({ + queueQuestionIndex: 0, + queueQuestionTotal: 1, + }); + }); +}); + it("restores old text answers without mutating history or replacing unchanged rows", () => { const project = createQuestionHistoryProjector(); const item = projection.turnItems[0]!; ``` ## packages/client-runtime/src/state/threadRequests.ts Status: modified; +89; −5 ```diff @@ -79,8 +79,16 @@ readonly responseCapability: OrchestrationV2RuntimeRequest["responseCapability"]["type"]; readonly responseMode?: "message"; readonly dismissible: boolean; + /** Questions asked before this prompt among requests whose pending intervals overlap it. */ + readonly queueQuestionIndex?: number; + readonly queueQuestionTotal?: number; } +// Adapters fall back to "Question" or "Question N" when the provider sends no title. +export function isGenericUserInputQuestionHeader(header: string) { + return /^question(?:\s+\d+)?$/i.test(header.trim()); +} + export interface PendingThreadRequests { readonly approvals: ReadonlyArray; readonly userInputs: ReadonlyArray; @@ -111,16 +119,23 @@ ): PendingThreadRequests { const approvals: ThreadPendingApproval[] = []; const userInputs: ThreadPendingUserInput[] = []; + const hasPendingUserInput = projection.runtimeRequests.some( + (request) => request.kind === "user_input" && request.status === "pending", + ); + const userInputItems = hasPendingUserInput + ? userInputItemsByRequestId(projection.turnItems) + : undefined; + const queuePositions = userInputItems + ? userInputQueuePositions(projection.runtimeRequests, userInputItems) + : undefined; for (const request of projection.runtimeRequests) { if (request.status !== "pending") continue; const responseCapability = request.responseCapability.type; if (request.kind === "user_input") { - const item = projection.turnItems.findLast( - (candidate) => - candidate.type === "user_input_request" && candidate.requestId === request.id, - ); + const item = userInputItems?.get(request.id); + if (item === undefined) continue; + const position = queuePositions?.get(request.id); - if (item === undefined || item.type !== "user_input_request") continue; userInputs.push({ requestId: request.id, createdAt: DateTime.formatIso(request.createdAt), @@ -133,6 +148,9 @@ ...(item.responseMode === "message" || responseCapability === "message" ? { responseMode: "message" as const } : {}), + ...(position + ? { queueQuestionIndex: position.index, queueQuestionTotal: position.total } + : {}), }); continue; } @@ -161,9 +179,75 @@ }); } + // Consumers activate the first entry; queue positions count in creation order. + userInputs.sort((left, right) => left.createdAt.localeCompare(right.createdAt)); return { approvals, userInputs }; } +type UserInputRequestItem = Extract< + ThreadStructure["turnItems"][number], + { type: "user_input_request" } +>; + +function userInputItemsByRequestId(turnItems: ThreadStructure["turnItems"]) { + const items = new Map(); + // Later items win, matching the previous findLast lookup. + for (const item of turnItems) { + if (item.type === "user_input_request") items.set(item.requestId, item); + } + return items; +} + +// Agents like Pi ask several one-question requests at once. Requests whose pending intervals +// overlap form one queue, so the composer can count across them; a question asked after the +// previous one resolved starts a fresh queue. +function userInputQueuePositions( + requests: ThreadStructure["runtimeRequests"], + items: ReadonlyMap, +) { + const intervals = requests.flatMap((request, order) => { + if (request.kind !== "user_input") return []; + const start = DateTime.toEpochMillis(request.createdAt); + const end = + request.resolvedAt !== null + ? DateTime.toEpochMillis(request.resolvedAt) + : request.status === "pending" + ? Number.POSITIVE_INFINITY + : // A settled request without a resolution time must not hold its queue open forever. + start; + // A request without its question item contributes nothing countable. + const questionCount = items.get(request.id)?.questions.length ?? 0; + return [ + { id: request.id, pending: request.status === "pending", start, end, order, questionCount }, + ]; + }); + intervals.sort((left, right) => left.start - right.start || left.order - right.order); + + const positions = new Map(); + let batchStart = 0; + let batchEnd = Number.NEGATIVE_INFINITY; + const flush = (batchStop: number) => { + const batch = intervals.slice(batchStart, batchStop); + if (!batch.some((interval) => interval.pending)) return; + const total = batch.reduce((sum, interval) => sum + interval.questionCount, 0); + let index = 0; + for (const interval of batch) { + if (interval.pending) positions.set(interval.id, { index, total }); + index += interval.questionCount; + } + }; + for (const [position, interval] of intervals.entries()) { + if (position > batchStart && interval.start > batchEnd) { + flush(position); + batchStart = position; + batchEnd = Number.NEGATIVE_INFINITY; + } + batchEnd = Math.max(batchEnd, interval.end); + } + flush(intervals.length); + return positions; +} + export function createQuestionHistoryProjector< Row extends ThreadStructureVisibleTurnItem = OrchestrationV2ThreadProjection["visibleTurnItems"][number], ``` ## packages/contracts/src/orchestrationV2.ts Status: modified; +1; −0 ```diff @@ -1143,6 +1143,7 @@ description: TrimmedNonEmptyString, value: Schema.optional(Schema.String), preview: Schema.optional(Schema.String), + customAnswer: Schema.optional(Schema.Boolean), }), ), multiSelect: Schema.optional(Schema.Boolean), ``` ## packages/contracts/src/providerRuntime.ts Status: modified; +1; −0 ```diff @@ -472,6 +472,7 @@ label: TrimmedNonEmptyStringSchema, description: Schema.String, value: Schema.optional(Schema.String), + customAnswer: Schema.optional(Schema.Boolean), }); export type UserInputQuestionOption = typeof UserInputQuestionOption.Type; ```