5eea87882a
* refactor(desktop): split clarify-tool.tsx into a clarify/ folder
Pure moves, no behaviour change. Parsing, the question-card core
(shell, choice rows, question block), the delivery watchdog, and each
pending/settled card get their own file so the core can be reused.
* feat(clarify): one questions[] shape with per-question status and one outcome
The clarify tool now takes only questions=[{question, choices?, multi_select?}].
A wrong shape is a tool error that names the right one, so a model that
sends the old top-level question/choices corrects itself on the next call.
Every result has the same shape on every surface: each response carries
status (answered, skipped, unanswered) with user_response null unless
answered, and the result carries one outcome (submitted, cancelled,
timed_out, undelivered) plus an optional surface-written notice. The
timeout and cancel sentences that used to pose as the user's answer are
gone, and the compressor reads status instead of matching their prefixes.
The callback contract is callback(questions) -> {answers, outcome, notice?}
(None = skipped, missing qid = unanswered). tui_gateway settles a batch the
same way for the last lock, a cancel, an interrupt and the deadline, and
clarify.lock keeps a null answer as a skip. A multi-select answer that is
not a JSON array counts as one typed ("Other") answer. The tool-row preview
reads the first question.
* feat(clarify): every surface asks through the one question card
CLI: the batch panel is the only panel; Enter on an empty field skips a
question, Ctrl+C cancels and keeps the locked answers, the deadline returns
timed_out. -q and -z return undelivered with a no-user notice.
Ink TUI: the single-question prompt is gone; the card supports multi-select
(Space or a digit toggles, Enter locks, typed Other text joins the picks),
an empty submit skips, Esc cancels, and "Batch" names are dropped.
Desktop: the single-question card is deleted and its keyboard handling moved
into the one card (arrows, letters and digits, auto-advance, Enter picks then
confirms). Confirm enables at one answer; blank questions lock null; Skip and
a composer message cancel; the settled card shows No answer for unanswered
questions. The bots room card follows the same contract.
Messaging: one card per question with a "Reply skip to skip" line in every
locale; timeouts and delivery failures map to timed_out and undelivered.
* fix(clarify): cancelled for a released messaging card, labels win over the skip word
A prose reply to a messaging choice card, /new and session end released
the wait with "", which read as timed_out. They now resolve with a
CANCELLED marker and the tool gets outcome cancelled.
A typed reply that matches a choice label ("Skip") now resolves to that
choice; the skip word applies only when no choice matches.
The bots room card sends the picked labels as they are; the tool already
strips the recommendation label. Unused OUTCOMES and a new docstring and
comment are removed.
* fix(tui): re-editing a multi-select answer keeps its picks
The Ink card stored a multi-select answer as display text ("A, B"), so
revisiting the question put the whole string into Other and re-locked it
as one item. The answers map now keeps the raw JSON array, the card
restores the picks on revisit, and only the display lines format it.
Comments that earlier edits reworded are restored to their original
words, minus the phrases the change made wrong. The compute-host clarify
lock accepts None for a skipped question.
* test(clarify): align three checks with the one-answer confirm and the regenerated keys
The desktop Cmd+Enter test now expects a send with one answer (the blank
question locks null), the compressor test expects the single-answer summary
the code gives, and locales/_keys.desktop.json is regenerated for the
removed and added clarify strings.
* test(tui): the one-question card header is singular
127 lines
5.3 KiB
TypeScript
127 lines
5.3 KiB
TypeScript
/**
|
|
* E2E batch clarify test — the multi-question clarify card must mount ONCE.
|
|
*
|
|
* Regression coverage for the duplicated-card bug: `tool.start` carries the
|
|
* model's tool_call_id while `clarify.request` carries a gateway-generated
|
|
* request_id. A batch payload has no top-level `question`, so the two rows
|
|
* only merge when the correlation key comes from the question list
|
|
* (`batchClarifyMatchValue` in lib/chat-messages/tool-parts.ts). Before that
|
|
* fix this exact flow rendered two identical interactive cards.
|
|
*
|
|
* The flow runs the real chain: composer → gateway → agent → clarify tool →
|
|
* clarify.request event → renderer, against the mock inference server.
|
|
*/
|
|
|
|
import {
|
|
BATCH_CLARIFY_QUESTIONS,
|
|
BATCH_CLARIFY_TRIGGER,
|
|
SINGLE_BATCH_CLARIFY_QUESTIONS,
|
|
SINGLE_BATCH_CLARIFY_TRIGGER
|
|
} from '../../../tests-js/scripts/mock-server'
|
|
|
|
import { type MockBackendFixture, setupMockBackend, waitForAppReady } from './fixtures'
|
|
import { expect, test } from './test'
|
|
|
|
let fixture: MockBackendFixture | null = null
|
|
|
|
test.beforeAll(async () => {
|
|
fixture = await setupMockBackend()
|
|
await waitForAppReady(fixture!, 120_000)
|
|
})
|
|
|
|
test.afterAll(async () => {
|
|
await fixture?.cleanup()
|
|
fixture = null
|
|
})
|
|
|
|
test.describe('batch clarify card', () => {
|
|
test('renders exactly one card and completes via per-question locks', async () => {
|
|
const page = fixture!.page
|
|
const composer = page.locator('[contenteditable="true"]').first()
|
|
await composer.waitFor({ state: 'visible', timeout: 10_000 })
|
|
|
|
await composer.click()
|
|
await composer.type(BATCH_CLARIFY_TRIGGER, { delay: 20 })
|
|
await page.keyboard.press('Enter')
|
|
|
|
// The live batch form marks itself with data-clarify-batch=<count>.
|
|
const batchCard = page.locator('form[data-clarify-batch]')
|
|
await batchCard.first().waitFor({ state: 'visible', timeout: 60_000 })
|
|
|
|
// THE regression assertion: one card, not two.
|
|
await expect(batchCard).toHaveCount(1)
|
|
await expect(batchCard).toHaveAttribute('data-clarify-batch', String(BATCH_CLARIFY_QUESTIONS.length))
|
|
|
|
// Both questions render inside the single card.
|
|
for (const entry of BATCH_CLARIFY_QUESTIONS) {
|
|
await expect(batchCard.getByText(entry.question)).toHaveCount(1)
|
|
}
|
|
|
|
// Each question text also appears exactly once in the whole transcript —
|
|
// catches a duplicate that mounts outside a form[data-clarify-batch].
|
|
for (const entry of BATCH_CLARIFY_QUESTIONS) {
|
|
await expect(page.getByText(entry.question)).toHaveCount(1)
|
|
}
|
|
|
|
// Answer both questions: stage picks locally (no server traffic yet).
|
|
const confirmButton = batchCard.locator('button[type="submit"]')
|
|
await expect(confirmButton).toBeDisabled()
|
|
|
|
await batchCard.getByRole('button', { name: /Coffee/ }).click()
|
|
await expect(confirmButton).toBeEnabled()
|
|
|
|
await batchCard.getByRole('button', { name: /Morning/ }).click()
|
|
await expect(confirmButton).toBeEnabled()
|
|
|
|
// ONE confirm submits the whole batch.
|
|
await confirmButton.click()
|
|
|
|
// The settled card lists both questions with their locked answers.
|
|
const settled = page.locator('[data-clarify-settled]')
|
|
await settled.waitFor({ state: 'visible', timeout: 30_000 })
|
|
await expect(settled.getByText(BATCH_CLARIFY_QUESTIONS[0].question)).toBeVisible()
|
|
await expect(settled.getByText('Coffee', { exact: true })).toBeVisible()
|
|
await expect(settled.getByText(BATCH_CLARIFY_QUESTIONS[1].question)).toBeVisible()
|
|
await expect(settled.getByText('Morning', { exact: true })).toBeVisible()
|
|
|
|
// And still no duplicate live card lingering after settle.
|
|
await expect(page.locator('form[data-clarify-batch]')).toHaveCount(0)
|
|
})
|
|
|
|
// #98645: since the questions[]-only schema (#95907) a single question is a
|
|
// one-entry batch on both the tool args and the gateway wire. The card must
|
|
// mount and answer exactly like the 2+ case — a blank or spinner-only
|
|
// section that eats the 10-minute tool timeout is the reported failure.
|
|
test('renders and answers a one-entry batch like the 2+ case', async () => {
|
|
const page = fixture!.page
|
|
const composer = page.locator('[contenteditable="true"]').first()
|
|
await composer.waitFor({ state: 'visible', timeout: 10_000 })
|
|
|
|
await composer.click()
|
|
await composer.type(SINGLE_BATCH_CLARIFY_TRIGGER, { delay: 20 })
|
|
await page.keyboard.press('Enter')
|
|
|
|
const batchCard = page.locator('form[data-clarify-batch]')
|
|
await batchCard.first().waitFor({ state: 'visible', timeout: 60_000 })
|
|
|
|
await expect(batchCard).toHaveCount(1)
|
|
await expect(batchCard).toHaveAttribute('data-clarify-batch', '1')
|
|
|
|
await expect(batchCard.getByText(SINGLE_BATCH_CLARIFY_QUESTIONS[0]!.question)).toHaveCount(1)
|
|
|
|
const confirmButton = batchCard.locator('button[type="submit"]')
|
|
await expect(confirmButton).toBeDisabled()
|
|
|
|
await batchCard.getByRole('button', { name: /Espresso/ }).click()
|
|
await expect(confirmButton).toBeEnabled()
|
|
await confirmButton.click()
|
|
|
|
const settled = page.locator('[data-clarify-settled]')
|
|
await settled.waitFor({ state: 'visible', timeout: 30_000 })
|
|
await expect(settled.getByText(SINGLE_BATCH_CLARIFY_QUESTIONS[0]!.question)).toBeVisible()
|
|
await expect(settled.getByText('Espresso', { exact: true })).toBeVisible()
|
|
|
|
await expect(page.locator('form[data-clarify-batch]')).toHaveCount(0)
|
|
})
|
|
})
|