diff --git a/.changeset/composer-actions-collapse.md b/.changeset/composer-actions-collapse.md new file mode 100644 index 0000000000..5956b03f9f --- /dev/null +++ b/.changeset/composer-actions-collapse.md @@ -0,0 +1,5 @@ +--- +'@conciv/ui-kit-chat': patch +--- + +Composer actions collapse into a shared overflow menu; extensions author buttons through `ComposerActions.ActionButton` (or the `ComposerActions.Action` + `ActionMenuItem` pairing for divergent inline/menu content) and `ComposerActions.Inline` from @conciv/ui-kit-chat, registered with the host via context — no ids, no separate menu-item JSX to author by hand. `ComposerActionsHost` takes `maxInlineAuto` to cap how many unpinned auto actions may stay inline, and the conciv composer caps it at zero: only `visible="always"` buttons sit in the row. Session refresh moved out of the composer into pane chrome. `ComposerActionsHost` reads its regions from the `ComposerActions.Leading`, `ComposerActions.Trailing` and `ComposerActions.Trigger` slot components instead of leading/trailing/triggerContent props. diff --git a/apps/conciv/src/app/pane-context.ts b/apps/conciv/src/app/pane-context.ts index fee08a6023..3080e0a6ae 100644 --- a/apps/conciv/src/app/pane-context.ts +++ b/apps/conciv/src/app/pane-context.ts @@ -1,4 +1,5 @@ import {createContext, useContext, type Accessor} from 'solid-js' +import type {ChatSession} from '@conciv/client' import type {GrabProvider} from '@conciv/grab' import type {GrabStaging} from '../pane/grab-staging.js' @@ -18,6 +19,7 @@ export type PaneContextValue = { grabProvider: GrabProvider | undefined attachments: PendingAttachmentQueue newSession: () => void + chat: Accessor } export function makePendingAttachmentQueue(): PendingAttachmentQueue { diff --git a/apps/conciv/src/app/pane-provider.tsx b/apps/conciv/src/app/pane-provider.tsx index ba5760b987..87862518af 100644 --- a/apps/conciv/src/app/pane-provider.tsx +++ b/apps/conciv/src/app/pane-provider.tsx @@ -1,7 +1,8 @@ -import {type JSX} from 'solid-js' +import {createMemo, type JSX} from 'solid-js' import {useQuery} from '@tanstack/solid-query' import {useRouter} from '@tanstack/solid-router' -import {useAppData, useGrabProvider, useRpc} from './context.js' +import {useChatSession} from '@conciv/client' +import {useAppData, useConnectionGeneration, useGrabProvider, useRpc} from './context.js' import {PaneContext, makePendingAttachmentQueue, type PaneContextValue} from './pane-context.js' import {makeGrabStaging} from '../pane/grab-staging.js' import {resolveGrabSource} from '../pane/grab-source-resolve.js' @@ -14,6 +15,7 @@ export function PaneProvider(props: { const appData = useAppData() const rpc = useRpc() const router = useRouter() + const generation = useConnectionGeneration() const sessions = useQuery(() => appData.utils.sessions.list.queryOptions()) const row = () => (sessions.data ?? []).find((session) => session.id === props.sessionId) const running = () => row()?.running ?? false @@ -25,6 +27,9 @@ export function PaneProvider(props: { void router.navigate({to: '/panel/$sessionId', params: {sessionId}}) } + const chatKey = createMemo(() => ({sessionId: props.sessionId, generation: generation()})) + const chat = createMemo(() => useChatSession({rpc, sessionId: chatKey().sessionId})) + const value: PaneContextValue = { sessionId: () => props.sessionId, running, @@ -42,6 +47,7 @@ export function PaneProvider(props: { } void openNewSession() }, + chat, } return {props.children} diff --git a/apps/conciv/src/composer/actions.tsx b/apps/conciv/src/composer/actions.tsx index 04635b5673..2d7aaff5eb 100644 --- a/apps/conciv/src/composer/actions.tsx +++ b/apps/conciv/src/composer/actions.tsx @@ -1,6 +1,6 @@ import {Show, createSignal, type JSX} from 'solid-js' import {useQuery, useMutation} from '@tanstack/solid-query' -import {TooltipIconButton} from '@conciv/ui-kit-system' +import {ComposerActions as Action} from '@conciv/ui-kit-chat' import Crosshair from 'lucide-solid/icons/crosshair' import FoldVertical from 'lucide-solid/icons/fold-vertical' import SquarePen from 'lucide-solid/icons/square-pen' @@ -48,7 +48,7 @@ export function ComposerActions(props: { const grab = getHostApi().useGrab() const toast = getHostApi().useToast() const meta = useQuery(() => appData.utils.meta.models.queryOptions()) - const harnessName = () => meta.data?.harness.name ?? 'the harness' + const harnessName = () => (meta.isSuccess ? meta.data.harness.name : 'the harness') const terminal = terminalRpc() const grabDisabled = () => (grab.grabbable ? !grab.grabbable() : false) @@ -96,24 +96,29 @@ export function ComposerActions(props: { return ( <> - void pick()} > - - props.onNewSession()}> + + props.onNewSession()}> - - + props.compacting} tooltip="Compress the conversation" class={busyClass(props.compacting)} onClick={() => props.onCompact()} > - + - - {(buttonProps) => ( - ( - + local.pending === true}> + + + + {(buttonProps) => ( + ( + + )} + /> )} - /> - )} - - - - - - local.onRetry?.()}> - - - - local.onOpen()}> - - local.onCopy()}> - - - - - - + + + + + + local.onRetry?.()}> + + + + local.onOpen()}> + + local.onCopy()}> + + + + + + + + + local.onOpen()}> + + local.onCopy()}> + + + } + > + local.onRetry?.()} + > + + + ) } diff --git a/apps/conciv/src/pane/chat-pane.tsx b/apps/conciv/src/pane/chat-pane.tsx index 6cff39c841..64e48d9a7c 100644 --- a/apps/conciv/src/pane/chat-pane.tsx +++ b/apps/conciv/src/pane/chat-pane.tsx @@ -12,7 +12,6 @@ import { type JSX, } from 'solid-js' import {useQuery} from '@tanstack/solid-query' -import {useChatSession} from '@conciv/client' import { AttachmentByMime, ChatProvider, @@ -126,7 +125,7 @@ export function ChatPane(props: {sessionId: string}): JSX.Element { const instances = useInstances() const pane = usePane() const sessionId = untrack(() => props.sessionId) - const chat = useChatSession({rpc, sessionId}) + const chat = pane.chat() const isThinking = () => chat.status() === 'submitted' const isStreaming = () => chat.status() === 'streaming' @@ -267,7 +266,6 @@ export function ChatPane(props: {sessionId: string}): JSX.Element { value={{ onSend: messaging.onSend, onSendError: messaging.onSendError, - onRefresh: () => chat.refresh(), onCancel: () => chat.interruptAndFlush(), }} > @@ -340,6 +338,7 @@ export function ChatPane(props: {sessionId: string}): JSX.Element { initialSelection={storage().restoredSelection} busy={compacting() ? : undefined} triggers={triggerSources} + trailingExtras={} > }> - { composerApi.current = api diff --git a/apps/conciv/src/pane/pane-composer.tsx b/apps/conciv/src/pane/pane-composer.tsx index c35eee69d0..bd9fecffb8 100644 --- a/apps/conciv/src/pane/pane-composer.tsx +++ b/apps/conciv/src/pane/pane-composer.tsx @@ -1,11 +1,19 @@ -import {Show, type Component, type JSX} from 'solid-js' +import {Show, Suspense, type Component, type JSX} from 'solid-js' import {Dynamic} from 'solid-js/web' import ArrowUp from 'lucide-solid/icons/arrow-up' import Clock from 'lucide-solid/icons/clock' +import Ellipsis from 'lucide-solid/icons/ellipsis' import Paperclip from 'lucide-solid/icons/paperclip' -import RefreshCw from 'lucide-solid/icons/refresh-cw' import Square from 'lucide-solid/icons/square' -import {ComposerPrimitive, QueueItem, AttachmentUI, useComposer, type AttachmentAdapter} from '@conciv/ui-kit-chat' +import { + ComposerActions, + ComposerActionsHost, + ComposerPrimitive, + QueueItem, + AttachmentUI, + useComposer, + type AttachmentAdapter, +} from '@conciv/ui-kit-chat' import {TooltipIconButtonSlot} from '@conciv/ui-kit-system' import type {WebStorage} from '@conciv/storage-history' import {useEngineReachability} from '../app/reachability.js' @@ -22,6 +30,7 @@ export type PaneComposerProps = { placeholder: string inputLabel: string children?: JSX.Element + trailingExtras?: JSX.Element busy?: JSX.Element triggers?: ComposerTriggerSources onInputReady?: (handle: ComposerInputHandle) => void @@ -43,6 +52,10 @@ const QUEUE_ACTION = 'shrink-0 px-2 py-1 rounded-[var(--chat-radius-sm)] bg-transparent [border:none] cursor-pointer font-medium text-[length:var(--chat-text-md)] leading-[1.45] [transition:background-color_120ms_var(--chat-ease),color_120ms_var(--chat-ease),transform_100ms_var(--chat-ease)] hover:[background:var(--chat-fill-strong)] [&:active]:scale-[0.96]' const ENGINE_UNREACHABLE_LABEL = 'conciv lost connection to the engine' +const ATTACHMENT_LABEL = 'Add an attachment' +const SEND_LABEL = 'Send message' +const STOP_LABEL = 'Stop generating' +const MAX_INLINE_AUTO_ACTIONS = 0 function ComposerSendControl(): JSX.Element { const composer = useComposer() @@ -51,38 +64,35 @@ function ComposerSendControl(): JSX.Element { - - ) -} - -function TrailingControls(): JSX.Element { - return ( - <> - + {(buttonProps) => ( - - + + )} - - + ) } export function PaneComposer(props: PaneComposerProps): JSX.Element { + let inputHandle: ComposerInputHandle | undefined + const receiveInputHandle = (handle: ComposerInputHandle): void => { + inputHandle = handle + props.onInputReady?.(handle) + } return ( -
- - - - - {props.children} -
- }> + inputHandle?.focus()}> + + + + + + {(buttonProps) => ( + + + )} + + + + + }>{props.trailingExtras} + }> {props.busy} -
-
+ + {props.children} +
) diff --git a/apps/conciv/src/routes/panel.$sessionId.tsx b/apps/conciv/src/routes/panel.$sessionId.tsx index 4fa56b4bc3..641c6f03a3 100644 --- a/apps/conciv/src/routes/panel.$sessionId.tsx +++ b/apps/conciv/src/routes/panel.$sessionId.tsx @@ -7,8 +7,18 @@ import Unplug from 'lucide-solid/icons/unplug' import {For, Show, Suspense, createMemo, createSignal, type JSX} from 'solid-js' import {Dynamic} from 'solid-js/web' import {isSessionId} from '@conciv/protocol/chat-types' -import {useAnnounce, useAppData, useDisconnect, useGrabProvider, useInstances, useRpc} from '../app/context.js' +import {useChatSession} from '@conciv/client' +import { + useAnnounce, + useAppData, + useConnectionGeneration, + useDisconnect, + useGrabProvider, + useInstances, + useRpc, +} from '../app/context.js' import {PaneContext, makePendingAttachmentQueue, type PaneContextValue} from '../app/pane-context.js' +import {RefreshButton} from '../shell/refresh-button.js' import {makeGrabStaging} from '../pane/grab-staging.js' import {resolveGrabSource} from '../pane/grab-source-resolve.js' import {SessionSelector} from '../composer/session-selector.js' @@ -32,6 +42,7 @@ export const Route = createFileRoute('/panel/$sessionId')({ function PanelSession(): JSX.Element { const params = Route.useParams() + const generation = useConnectionGeneration() const appData = useAppData() const rpc = useRpc() const announce = useAnnounce() @@ -94,6 +105,9 @@ function PanelSession(): JSX.Element { running() && next.pathname.startsWith('/panel') && next.pathname !== current.pathname, }) + const chatKey = createMemo(() => ({sessionId: params().sessionId, generation: generation()})) + const chat = createMemo(() => useChatSession({rpc, sessionId: chatKey().sessionId})) + const paneValue: PaneContextValue = { sessionId: () => params().sessionId, running, @@ -105,6 +119,7 @@ function PanelSession(): JSX.Element { grabProvider, attachments: makePendingAttachmentQueue(), newSession: () => void newSession(), + chat, } return ( @@ -129,20 +144,16 @@ function PanelSession(): JSX.Element { }> + + + + - disconnect?.()} - > + disconnect?.()}> - panelChrome.close()} - > + panelChrome.close()}> diff --git a/apps/conciv/src/routes/pip.$sessionId.tsx b/apps/conciv/src/routes/pip.$sessionId.tsx index 8b86f3437c..464824a2cc 100644 --- a/apps/conciv/src/routes/pip.$sessionId.tsx +++ b/apps/conciv/src/routes/pip.$sessionId.tsx @@ -3,18 +3,27 @@ import {Show, createSignal, onCleanup, onMount, type JSX} from 'solid-js' import {makeEventListener} from '@solid-primitives/event-listener' import {Portal} from 'solid-js/web' import {EnvironmentProvider} from '@conciv/ui-kit-system' +import {useConnectionGeneration} from '../app/context.js' import {PaneProvider} from '../app/pane-provider.js' import {ChatPane} from '../pane/chat-pane.js' +import {RefreshButton} from '../shell/refresh-button.js' import {openPipWindow, type PipWindow} from '../shell/pip.js' import {NoticeContextProvider, NoticeSurface} from '../shell/notice-context.js' import {EngineStaleNotice, EngineUnreachableNotice} from '../shell/engine-notice.js' +const PIP_ACTION = 'text-pw-text-2 leading-none size-8 hover:text-pw-text hover:bg-pw-fill-strong' + export const Route = createFileRoute('/pip/$sessionId')({component: PipSession}) function PipSession(): JSX.Element { const params = Route.useParams() const router = useRouter() + const generation = useConnectionGeneration() const [pip, setPip] = createSignal(null) + const paneKey = () => { + const sessionId = params().sessionId + return sessionId ? {sessionId, generation: generation()} : undefined + } onMount(() => { const opened = openPipWindow({title: 'conciv'}) @@ -36,14 +45,17 @@ function PipSession(): JSX.Element { target.root}> - - {(sessionId) => ( - + + {(key) => ( +
- +
+ +
+
)} diff --git a/apps/conciv/src/routes/quick.tsx b/apps/conciv/src/routes/quick.tsx index 40d93f11a0..613c4d4211 100644 --- a/apps/conciv/src/routes/quick.tsx +++ b/apps/conciv/src/routes/quick.tsx @@ -7,10 +7,11 @@ import ChevronUp from 'lucide-solid/icons/chevron-up' import Columns2 from 'lucide-solid/icons/columns-2' import PictureInPicture2 from 'lucide-solid/icons/picture-in-picture-2' import X from 'lucide-solid/icons/x' -import {useAppData, useRpc, useSuppressed} from '../app/context.js' +import {useAppData, useConnectionGeneration, useRpc, useSuppressed} from '../app/context.js' import {useEngineReachability} from '../app/reachability.js' import {PaneProvider} from '../app/pane-provider.js' import {ChatPane} from '../pane/chat-pane.js' +import {RefreshButton} from '../shell/refresh-button.js' import {ContextTracker} from '../pane/context-tracker.js' import {SessionSelector} from '../composer/session-selector.js' import {SessionPillPending, UsagePending} from '../shell/pending.js' @@ -21,7 +22,7 @@ import {QuickSearchSchema, quickPaneIds, quickSearchFor} from '../lib/quick-sear const CLOSE = 'bg-transparent [border:none] text-pw-text-2 text-[1.375rem] cursor-pointer inline-flex items-center justify-center size-9.5 rounded-[0.5625rem] trans-color-bg hover:text-pw-text hover:bg-pw-fill-strong' -const CLOSE_PANE = 'text-pw-text-3 leading-none ml-auto size-6' +const PANE_ACTION = 'text-pw-text-3 leading-none size-6' const ADD_PANE_FAILED_MESSAGE = 'conciv could not start a pane. Check the engine connection and retry.' @@ -96,6 +97,7 @@ function QuickLayer(): JSX.Element { const rpc = useRpc() const suppressed = useSuppressed() const router = useRouter() + const generation = useConnectionGeneration() const search = Route.useSearch() const paneIds = () => quickPaneIds(search()) const focusedIndex = () => Math.min(search().focus, Math.max(0, paneIds().length - 1)) @@ -227,45 +229,45 @@ function QuickLayer(): JSX.Element { onPointerDown={onGutterDown} />
-
focusPane(index())} - onFocusIn={() => { - if (focusedIndex() !== index()) focusPane(index()) - }} - > -
- }> - id} - onActivate={(next) => activatePane(index(), next)} - onNewSession={triggerAddPane} - /> - - }> - - - { - e.stopPropagation() - closePane(index()) - }} - > - + +
focusPane(index())} + onFocusIn={() => { + if (focusedIndex() !== index()) focusPane(index()) + }} + > +
+ }> + id} + onActivate={(next) => activatePane(index(), next)} + onNewSession={triggerAddPane} + /> + + }> + + + + + { + e.stopPropagation() + closePane(index()) + }} + > + +
+ + {(paneKey) => } +
- - {(sessionId) => ( - - - - )} - -
+ )} diff --git a/apps/conciv/src/shell/fab.tsx b/apps/conciv/src/shell/fab.tsx index 065ca46152..4a5eadd998 100644 --- a/apps/conciv/src/shell/fab.tsx +++ b/apps/conciv/src/shell/fab.tsx @@ -1,4 +1,5 @@ import {Show, Suspense, type JSX} from 'solid-js' +import {Tooltip} from '@conciv/ui-kit-system' import type {TriggerPosition} from '@conciv/protocol/config-types' import type {DraggablePosition} from '../lib/draggable-position.js' import {FabRobot} from './fab-robot.js' @@ -22,6 +23,10 @@ function fabClass(position: TriggerPosition, dragging: boolean): string { return `${FAB_BASE} ${FAB_POS[position]}${dragging ? ` ${FAB_DRAGGING}` : ''}` } +function tooltipPlacement(position: TriggerPosition): 'left' | 'right' { + return position.endsWith('-left') ? 'right' : 'left' +} + function fabLabel(open: boolean): string { return open ? 'Minimize conciv chat' : 'Open conciv chat' } @@ -35,28 +40,33 @@ export function ShellFab(props: { onToggle: () => void }): JSX.Element { return ( - + + props.fab.onPointerDown(event)} + onClick={() => { + if (!props.fab.consumeClick()) props.onToggle() + }} + > + + + + + + + + {fabLabel(props.open())} + + ) } diff --git a/apps/conciv/src/shell/refresh-button.tsx b/apps/conciv/src/shell/refresh-button.tsx new file mode 100644 index 0000000000..cd3c8f4b47 --- /dev/null +++ b/apps/conciv/src/shell/refresh-button.tsx @@ -0,0 +1,19 @@ +import type {JSX} from 'solid-js' +import RefreshCw from 'lucide-solid/icons/refresh-cw' +import {TooltipIconButton} from '@conciv/ui-kit-system' +import {chatBusy} from '@conciv/ui-kit-chat' +import {usePane} from '../app/pane-context.js' + +export function RefreshButton(props: {class?: string}): JSX.Element { + const pane = usePane() + return ( + pane.chat().refresh()} + > + + ) +} diff --git a/apps/conciv/test/chat-pane.browser.test.tsx b/apps/conciv/test/chat-pane.browser.test.tsx index b69eb59dad..8d8762de20 100644 --- a/apps/conciv/test/chat-pane.browser.test.tsx +++ b/apps/conciv/test/chat-pane.browser.test.tsx @@ -7,6 +7,7 @@ import pageExtension from '@conciv/extension-page/client' import {GRAB_FILE_NAME, GRAB_MIME} from '@conciv/grab/grab-attachment' import type {Grab} from '@conciv/grab' import {ChatPane} from '../src/pane/chat-pane.js' +import {RefreshButton} from '../src/shell/refresh-button.js' import {coreControl} from './helpers/core-control.js' import {coreRpc, createSession, openTranscriptStream, runTurn, seedDraft, sendTurn} from './helpers/core-session.js' import { @@ -60,7 +61,12 @@ function mountChatPane( sessionId: string, options: Pick = {}, ): PaneMount { - const mount = mountPane({base: core.base, sessionId, ...options}, () => ) + const mount = mountPane({base: core.base, sessionId, ...options}, () => ( + <> + + + + )) active.pane = mount return mount } diff --git a/apps/conciv/test/composer-overflow.browser.test.tsx b/apps/conciv/test/composer-overflow.browser.test.tsx new file mode 100644 index 0000000000..75088e3581 --- /dev/null +++ b/apps/conciv/test/composer-overflow.browser.test.tsx @@ -0,0 +1,130 @@ +import './helpers/utilities.css' +import {afterAll, afterEach, beforeAll, expect, test} from 'vitest' +import {page, userEvent} from 'vitest/browser' +import {createSignal, For} from 'solid-js' +import {ChatPane} from '../src/pane/chat-pane.js' +import {coreControl} from './helpers/core-control.js' +import {coreRpc, createSession} from './helpers/core-session.js' +import {mountPane, type PaneMount} from './helpers/pane-harness.js' +import {trackedFaults} from './helpers/tracked-faults.js' + +const COMPACT_PATH = ['sessions', 'compact'] +const NARROW_PX = 160 +const WIDE_PX = 460 + +const core = {base: ''} +const active: {pane: PaneMount | null} = {pane: null} +const faults = trackedFaults() + +beforeAll(async () => { + const booted = await coreControl.bootCore({id: 'composer-overflow', allowedOrigins: [window.location.origin]}) + core.base = booted.base +}, 60_000) + +afterAll(async () => { + await coreControl.closeCore() +}, 30_000) + +afterEach(() => { + active.pane?.dispose() + active.pane = null +}) + +const input = () => page.getByRole('textbox', {name: 'Message the conciv agent'}) +const grabButton = () => page.getByRole('button', {name: 'Select an element from the page'}) +const newSessionButton = () => page.getByRole('button', {name: 'Start a new session'}) +const compactButton = () => page.getByRole('button', {name: 'Compress the conversation'}) +const trigger = () => page.getByRole('button', {name: 'More composer actions'}) +const attachButton = () => page.getByRole('button', {name: 'Add an attachment'}) +const sendButton = () => page.getByRole('button', {name: 'Send message'}) +const newSessionItem = () => page.getByRole('menuitem', {name: 'Start a new session'}) +const compactItem = () => page.getByRole('menuitem', {name: 'Compress the conversation'}) + +async function mountComposer(width?: number): Promise { + const sessionId = await createSession(coreRpc(core.base)) + const [requests, setRequests] = createSignal([]) + const mount = mountPane( + { + base: core.base, + sessionId, + width, + onNewSession: () => setRequests((current) => [...current, 'a new session']), + }, + () => ( + <> +
    + {(request) =>
  • {`the pane requested ${request}`}
  • }
    +
+ + + ), + ) + active.pane = mount + await expect.element(input()).toBeVisible() + return mount +} + +test('a wide composer keeps only the pinned grab action inline and runs the rest from the overflow menu', async () => { + await mountComposer(WIDE_PX) + + await expect.element(grabButton()).toBeVisible() + await expect.element(trigger()).toHaveAttribute('aria-haspopup', 'menu') + await expect.element(newSessionButton()).not.toBeInTheDocument() + await expect.element(compactButton()).not.toBeInTheDocument() + + await userEvent.click(trigger()) + await expect.element(compactItem()).toBeVisible() + await userEvent.click(newSessionItem()) + + await expect.element(page.getByText('the pane requested a new session')).toBeVisible() + await expect.element(newSessionItem()).not.toBeInTheDocument() +}) + +test('the attachment button carries the same tooltip-backed name as the rest of the row', async () => { + await mountComposer(WIDE_PX) + + await expect.element(attachButton()).toBeVisible() + + await userEvent.hover(attachButton()) + + await expect.element(page.getByRole('tooltip')).toHaveTextContent('Add an attachment') +}) + +test('the send button carries the same tooltip-backed name as the rest of the row', async () => { + await mountComposer(WIDE_PX) + + await expect.element(sendButton()).toBeVisible() + + await userEvent.hover(sendButton()) + + await expect.element(page.getByRole('tooltip')).toHaveTextContent('Send message') +}) + +test('a narrow composer still keeps the pinned grab action inline beside the overflow trigger', async () => { + const mount = await mountComposer() + + mount.setWidth(NARROW_PX) + + await expect.element(grabButton()).toBeVisible() + await expect.element(trigger()).toBeVisible() + await expect.element(newSessionButton()).not.toBeInTheDocument() +}) + +test('a session that is already compacting cannot be compacted again from the overflow menu', async () => { + const gate = await faults.install({kind: 'gate', path: COMPACT_PATH}) + await mountComposer(WIDE_PX) + + await userEvent.click(trigger()) + await userEvent.click(compactItem()) + await coreControl.awaitFaultPending(gate, 1) + + await userEvent.click(trigger()) + await expect.element(compactItem()).toHaveAttribute('aria-disabled', 'true') + + await userEvent.keyboard('{ArrowDown}') + await userEvent.keyboard('{Enter}') + + await expect.element(page.getByText('the pane requested a new session')).toBeVisible() + await expect.element(compactItem()).not.toBeInTheDocument() + expect(await coreControl.faultPending(gate)).toBe(1) +}) diff --git a/apps/conciv/test/connection-generation-remount.browser.test.tsx b/apps/conciv/test/connection-generation-remount.browser.test.tsx new file mode 100644 index 0000000000..6a3069464b --- /dev/null +++ b/apps/conciv/test/connection-generation-remount.browser.test.tsx @@ -0,0 +1,38 @@ +import './helpers/utilities.css' +import {afterEach, expect, test} from 'vitest' +import {page} from 'vitest/browser' +import {bootedCore} from './helpers/booted-core.js' +import {coreControl} from './helpers/core-control.js' +import {coreRpc, createSession} from './helpers/core-session.js' +import {createShellHarness} from './helpers/shell-harness.js' +import {trackedFaults} from './helpers/tracked-faults.js' + +const DRAFT_GET_PATH = ['drafts', 'get'] + +const coreBase = bootedCore('connection-generation-remount') +const harness = createShellHarness(coreBase) +const faults = trackedFaults() + +afterEach(async () => { + await coreControl.releaseTurn() + harness.dispose() +}) + +const editor = () => page.getByRole('textbox', {name: 'Message the conciv agent'}) +const refresh = () => page.getByRole('button', {name: 'Refresh the conversation'}) + +test('bumping the connection generation recreates the quick pane chat store', async () => { + const sessionId = await createSession(coreRpc(coreBase())) + harness.mountShell(`/quick?panes=${sessionId}&focus=0`) + await expect.element(editor(), {timeout: 8000}).toBeVisible() + + const gate = await faults.install({kind: 'gate', path: DRAFT_GET_PATH}) + harness.bumpConnectionGeneration() + + await expect.element(editor()).not.toBeInTheDocument() + await expect.element(refresh(), {timeout: 8000}).toBeVisible() + + await coreControl.releaseFault(gate) + + await expect.element(editor(), {timeout: 8000}).toBeVisible() +}, 30_000) diff --git a/apps/conciv/test/helpers/booted-core.ts b/apps/conciv/test/helpers/booted-core.ts new file mode 100644 index 0000000000..2016270b77 --- /dev/null +++ b/apps/conciv/test/helpers/booted-core.ts @@ -0,0 +1,14 @@ +import {afterAll, beforeAll} from 'vitest' +import {coreControl} from './core-control.js' + +export function bootedCore(id: string): () => string { + const core = {base: ''} + beforeAll(async () => { + const booted = await coreControl.bootCore({id, allowedOrigins: [window.location.origin]}) + core.base = booted.base + }, 60_000) + afterAll(async () => { + await coreControl.closeCore() + }, 30_000) + return () => core.base +} diff --git a/apps/conciv/test/helpers/pane-harness.tsx b/apps/conciv/test/helpers/pane-harness.tsx index 905ffb7994..3df3247720 100644 --- a/apps/conciv/test/helpers/pane-harness.tsx +++ b/apps/conciv/test/helpers/pane-harness.tsx @@ -1,4 +1,4 @@ -import {createRoot, createSignal, type JSX} from 'solid-js' +import {createMemo, createRoot, createSignal, type JSX} from 'solid-js' import {render} from '@solidjs/testing-library' import {QueryClientProvider, type QueryClient} from '@tanstack/solid-query' import {browserRpcConnection, closeBrowserRpcConnection} from '@conciv/contract' @@ -9,6 +9,7 @@ import {makeAppContextValue} from './app-context-value.js' import {EngineReachabilityContext, makeEngineReachability} from '../../src/app/reachability.js' import type {AnyExtension} from '@conciv/extension' import type {Grab, GrabProvider} from '@conciv/grab' +import {useChatSession} from '@conciv/client' import {PaneContext, makePendingAttachmentQueue, type PaneContextValue} from '../../src/app/pane-context.js' import {createInstances} from '../../src/extension/create-instances.js' import {makeGrabStaging} from '../../src/pane/grab-staging.js' @@ -21,6 +22,8 @@ export type PaneMountOptions = { grabProvider?: GrabProvider extensions?: AnyExtension[] ground?: (grab: Grab) => Promise + width?: number + onNewSession?: () => void } export type PaneMount = { @@ -30,8 +33,11 @@ export type PaneMount = { data: AppData queryClient: QueryClient refetch: () => Promise + setWidth: (pixels: number) => void } +const DEFAULT_PANE_WIDTH_PX = 400 + function AnnounceLog(props: {entries: () => string[]}): JSX.Element { return (
@@ -45,12 +51,17 @@ export function mountPane(options: PaneMountOptions, view: (pane: PaneContextVal browserRpcConnection(options.base, 'fetch') const instances = createInstances(options.extensions ?? []) const [announced, setAnnounced] = createSignal([]) + const [width, setWidth] = createSignal(options.width ?? DEFAULT_PANE_WIDTH_PX) const app = makeAppContextValue({ base: options.base, announce: (message) => setAnnounced((entries) => [...entries, message]), instances, }) const {rpc, data, queryClient} = app + const chatRoot = createRoot((disposeChat) => { + const chat = createMemo(() => useChatSession({rpc, sessionId: options.sessionId})) + return {chat, dispose: disposeChat} + }) const pane: PaneContextValue = { sessionId: () => options.sessionId, running: () => false, @@ -61,7 +72,8 @@ export function mountPane(options: PaneMountOptions, view: (pane: PaneContextVal grabStaging: makeGrabStaging({ground: options.ground ?? (async () => null)}), grabProvider: options.grabProvider, attachments: makePendingAttachmentQueue(), - newSession: () => {}, + newSession: () => options.onNewSession?.(), + chat: chatRoot.chat, } const reachabilityRoot = createRoot((disposeReachability) => ({ reachability: makeEngineReachability(), @@ -74,7 +86,7 @@ export function mountPane(options: PaneMountOptions, view: (pane: PaneContextVal ''} toast={(message) => app.announce(message)}> -
+
{view(pane)}
@@ -90,6 +102,7 @@ export function mountPane(options: PaneMountOptions, view: (pane: PaneContextVal dispose: () => { mounted.unmount() for (const instance of instances) instance.dispose() + chatRoot.dispose() reachabilityRoot.dispose() closeBrowserRpcConnection(options.base) delete window.__CONCIV_API_BASE__ @@ -99,5 +112,6 @@ export function mountPane(options: PaneMountOptions, view: (pane: PaneContextVal data, queryClient, refetch: () => queryClient.invalidateQueries({queryKey: data.utils.meta.engine.key()}), + setWidth, } } diff --git a/apps/conciv/test/helpers/shell-harness.tsx b/apps/conciv/test/helpers/shell-harness.tsx index 9b158f283a..eb54abf6bc 100644 --- a/apps/conciv/test/helpers/shell-harness.tsx +++ b/apps/conciv/test/helpers/shell-harness.tsx @@ -1,3 +1,4 @@ +import {createSignal} from 'solid-js' import {onlineManager} from '@tanstack/query-core' import {render} from '@solidjs/testing-library' import {RouterProvider, createMemoryHistory} from '@tanstack/solid-router' @@ -9,11 +10,13 @@ import {createConcivRouter, disposeConcivRouter} from '../../src/router.js' export type ShellHarness = { mountShell: (entry: string, extensions?: AnyExtension[]) => void + bumpConnectionGeneration: () => void dispose: () => void } export function createShellHarness(base: () => string): ShellHarness { const mounted: {router: ReturnType | null} = {router: null} + const [connectionGeneration, setConnectionGeneration] = createSignal(0) const mountShell = (entry: string, extensions: AnyExtension[] = []): void => { const apiBase = base() @@ -24,12 +27,17 @@ export function createShellHarness(base: () => string): ShellHarness { environment: {rootNode: document, document}, settings: parseConcivSettings(''), apiBase: () => apiBase, + connectionGeneration, extensions, }) mounted.router = router render(() => ) } + const bumpConnectionGeneration = (): void => { + setConnectionGeneration((current) => current + 1) + } + const dispose = (): void => { if (mounted.router) disposeConcivRouter(mounted.router) mounted.router = null @@ -38,5 +46,5 @@ export function createShellHarness(base: () => string): ShellHarness { delete window.__CONCIV_API_BASE__ } - return {mountShell, dispose} + return {mountShell, bumpConnectionGeneration, dispose} } diff --git a/apps/conciv/test/launch-actions.browser.test.tsx b/apps/conciv/test/launch-actions.browser.test.tsx index 6e9141a9df..007d4546ce 100644 --- a/apps/conciv/test/launch-actions.browser.test.tsx +++ b/apps/conciv/test/launch-actions.browser.test.tsx @@ -1,7 +1,9 @@ +import './helpers/utilities.css' import {afterAll, afterEach, beforeAll, expect, test} from 'vitest' import {page} from 'vitest/browser' import type {GrabApi} from '@conciv/grab' import {HostApiProvider} from '@conciv/extension/host' +import {ComposerActions as ComposerActionsPrimitive, ComposerActionsHost} from '@conciv/ui-kit-chat' import {ComposerActions} from '../src/composer/actions.js' import {coreControl} from './helpers/core-control.js' import {coreRpc, createSession} from './helpers/core-session.js' @@ -51,13 +53,18 @@ async function mountActions(): Promise { const sessionId = await createSession(coreRpc(core.base)) mounted.pane = mountPane({base: core.base, sessionId}, () => ( {}}> - {}} - onNewSession={() => {}} - onStageGrab={() => {}} - /> + + + + {}} + onNewSession={() => {}} + onStageGrab={() => {}} + /> + )) } diff --git a/apps/conciv/test/launch-menu.browser.test.tsx b/apps/conciv/test/launch-menu.browser.test.tsx index e126a0f80f..729618f4b8 100644 --- a/apps/conciv/test/launch-menu.browser.test.tsx +++ b/apps/conciv/test/launch-menu.browser.test.tsx @@ -1,28 +1,53 @@ +import './helpers/utilities.css' import {expect, test} from 'vitest' -import {page} from 'vitest/browser' +import {page, userEvent} from 'vitest/browser' import {render} from '@solidjs/testing-library' import {createSignal, For} from 'solid-js' +import {ComposerActions, ComposerActionsHost} from '@conciv/ui-kit-chat' import {LaunchMenu} from '../src/composer/launch-menu.js' -function mountMenu(state: {pending?: boolean; failed?: boolean} = {}): void { +const NARROW_PX = 70 +const WIDE_PX = 460 + +type MenuMount = {setWidth: (pixels: number) => void} + +function mountMenu(state: {pending?: boolean; failed?: boolean} = {}): MenuMount { const [made, setMade] = createSignal([]) + const [width, setWidth] = createSignal(WIDE_PX) const choose = (choice: string) => setMade((choices) => [...choices, choice]) render(() => ( <>
    {(choice) =>
  • chose {choice}
  • }
- choose('open')} - onCopy={() => choose('copy')} - onRetry={() => choose('retry')} - /> +
+ + + + + + + + choose('earlier')}> + + choose('open')} + onCopy={() => choose('copy')} + onRetry={() => choose('retry')} + /> + choose('later')}> + + +
)) + return {setWidth} } const chosen = (): string[] => @@ -31,6 +56,19 @@ const chosen = (): string[] => .elements() .map((item) => item.textContent ?? '') +const overflowTrigger = () => page.getByRole('button', {name: 'More composer actions'}) +const launchTrigger = () => page.getByRole('button', {name: 'Terminal options for Claude'}) +const openItem = () => page.getByRole('menuitem', {name: 'Open in Claude'}) +const copyItem = () => page.getByRole('menuitem', {name: 'Copy command'}) +const retryItem = () => page.getByRole('menuitem', {name: /Terminal options unavailable for Claude/}) +const laterItem = () => page.getByRole('menuitem', {name: 'Later action'}) + +const menuItemLabels = (): string[] => + page + .getByRole('menuitem') + .elements() + .map((item) => item.textContent ?? '') + test('offers opening the terminal or copying the command', async () => { mountMenu() const trigger = page.getByRole('button', {name: 'Terminal options for Claude'}) @@ -73,3 +111,48 @@ test('a harness that could not be read says so and offers another go', async () await expect.element(page.getByText('chose retry')).toBeVisible() expect(chosen()).toEqual(['chose retry']) }) + +test('a narrow composer folds the launch options into the shared overflow menu, kept together', async () => { + const mount = mountMenu() + await expect.element(launchTrigger()).toBeVisible() + + mount.setWidth(NARROW_PX) + + await expect.element(launchTrigger()).not.toBeInTheDocument() + await userEvent.click(overflowTrigger()) + await expect.element(openItem()).toBeVisible() + await expect.element(copyItem()).toBeVisible() + await expect.element(laterItem()).toBeVisible() + expect(menuItemLabels()).toEqual(['Earlier action', 'Open in Claude', 'Copy command', 'Later action']) + + await userEvent.click(openItem()) + await expect.element(page.getByText('chose open')).toBeVisible() + expect(chosen()).toEqual(['chose open']) +}) + +test('a collapsed launch menu offers the retry instead when the harness could not be read', async () => { + const mount = mountMenu({failed: true}) + await expect.element(launchTrigger()).toBeVisible() + + mount.setWidth(NARROW_PX) + + await userEvent.click(overflowTrigger()) + await expect.element(retryItem()).toBeVisible() + await expect.element(openItem()).not.toBeInTheDocument() + await expect.element(copyItem()).not.toBeInTheDocument() + + await userEvent.click(retryItem()) + await expect.element(page.getByText('chose retry')).toBeVisible() + expect(chosen()).toEqual(['chose retry']) +}) + +test('a collapsed launch menu stays untouchable until the harness answers', async () => { + const mount = mountMenu({pending: true}) + await expect.element(launchTrigger()).toBeVisible() + + mount.setWidth(NARROW_PX) + + await userEvent.click(overflowTrigger()) + await expect.element(openItem()).toHaveAttribute('aria-disabled', 'true') + await expect.element(copyItem()).toHaveAttribute('aria-disabled', 'true') +}) diff --git a/apps/conciv/test/panel-view-tabs.browser.test.tsx b/apps/conciv/test/panel-view-tabs.browser.test.tsx new file mode 100644 index 0000000000..ba70b344b4 --- /dev/null +++ b/apps/conciv/test/panel-view-tabs.browser.test.tsx @@ -0,0 +1,56 @@ +import './helpers/utilities.css' +import {afterEach, expect, test} from 'vitest' +import {page} from 'vitest/browser' +import type {JSX} from 'solid-js' +import {defineExtension} from '@conciv/extension' +import {bootedCore} from './helpers/booted-core.js' +import {coreControl} from './helpers/core-control.js' +import {coreRpc, createSession, runTurn} from './helpers/core-session.js' +import {createShellHarness} from './helpers/shell-harness.js' +import {trackedFaults} from './helpers/tracked-faults.js' + +const SUBSCRIBE_PATH = ['chat', 'subscribe'] +const NOTES_BODY = 'the notes view body' +const REPLY_TEXT = 'the transcript that outlives a tab switch' + +function NotesView(): JSX.Element { + return

{NOTES_BODY}

+} + +const notesExtension = defineExtension({ + name: 'panel-view-survival', + views: [{id: 'notes', label: 'Notes', Component: NotesView}], +}) + +const coreBase = bootedCore('panel-view-tabs') +const harness = createShellHarness(coreBase) +const faults = trackedFaults() + +afterEach(harness.dispose) + +const reply = () => page.getByText(REPLY_TEXT) +const notes = () => page.getByText(NOTES_BODY) +const skeleton = () => page.getByRole('status', {name: 'Loading conversation'}) +const chatTab = () => page.getByRole('tab', {name: 'Chat'}) +const notesTab = () => page.getByRole('tab', {name: 'Notes'}) + +test('the panel keeps its chat stream alive across a view tab round trip', async () => { + const rpc = coreRpc(coreBase()) + const sessionId = await createSession(rpc) + await coreControl.scriptTurn({toolCalls: [], text: REPLY_TEXT}) + await runTurn(rpc, sessionId, 'seed the transcript') + harness.mountShell(`/panel/${sessionId}?open=true`, [notesExtension]) + + await expect.element(reply(), {timeout: 8000}).toBeVisible() + + await notesTab().click() + await expect.element(notes(), {timeout: 8000}).toBeVisible() + + const gate = await faults.install({kind: 'gate', path: SUBSCRIBE_PATH}) + await chatTab().click() + + await expect.element(reply(), {timeout: 8000}).toBeVisible() + await expect.element(skeleton()).not.toBeInTheDocument() + + await coreControl.releaseFault(gate) +}, 30_000) diff --git a/apps/conciv/test/quick-refresh.browser.test.tsx b/apps/conciv/test/quick-refresh.browser.test.tsx new file mode 100644 index 0000000000..356ad51e0a --- /dev/null +++ b/apps/conciv/test/quick-refresh.browser.test.tsx @@ -0,0 +1,72 @@ +import './helpers/utilities.css' +import {afterAll, afterEach, beforeAll, expect, test} from 'vitest' +import {page, userEvent} from 'vitest/browser' +import {coreControl} from './helpers/core-control.js' +import {coreRpc, createSession} from './helpers/core-session.js' +import {createShellHarness} from './helpers/shell-harness.js' +import {trackedFaults} from './helpers/tracked-faults.js' + +const DRAFT_GET_PATH = ['drafts', 'get'] + +const core = {base: ''} +const harness = createShellHarness(() => core.base) +const faults = trackedFaults() + +beforeAll(async () => { + const booted = await coreControl.bootCore({id: 'quick-refresh', allowedOrigins: [window.location.origin]}) + core.base = booted.base +}, 60_000) + +afterAll(async () => { + await coreControl.closeCore() +}, 30_000) + +afterEach(async () => { + await coreControl.releaseTurn() + harness.dispose() +}) + +const editor = () => page.getByRole('textbox', {name: 'Message the conciv agent'}) +const refresh = () => page.getByRole('button', {name: 'Refresh the conversation'}) +const stopButton = () => page.getByRole('button', {name: 'Stop generating'}) + +test('the quick terminal pane bar carries refresh while the composer is still loading', async () => { + const sessionId = await createSession(coreRpc(core.base)) + const gate = await faults.install({kind: 'gate', path: DRAFT_GET_PATH}) + harness.mountShell(`/quick?panes=${sessionId}&focus=0`) + + await expect.element(refresh(), {timeout: 8000}).toBeVisible() + await expect.element(editor()).not.toBeInTheDocument() + + await coreControl.releaseFault(gate) + + await expect.element(editor(), {timeout: 8000}).toBeVisible() + await expect.element(refresh()).toBeVisible() +}, 30_000) + +test('each quick terminal pane bar carries exactly one refresh affordance', async () => { + const sessionId = await createSession(coreRpc(core.base)) + const gate = await faults.install({kind: 'gate', path: DRAFT_GET_PATH}) + harness.mountShell(`/quick?panes=${sessionId}&focus=0`) + await expect.element(refresh(), {timeout: 8000}).toBeVisible() + + await page.getByRole('button', {name: 'Split pane (Mod+D)'}).click() + + await expect.element(refresh().nth(1), {timeout: 8000}).toBeVisible() + await expect.element(refresh().nth(2)).not.toBeInTheDocument() + + await coreControl.releaseFault(gate) +}, 30_000) + +test('a quick terminal pane disables its refresh affordance while the run streams', async () => { + const sessionId = await createSession(coreRpc(core.base)) + await coreControl.holdTurn() + harness.mountShell(`/quick?panes=${sessionId}&focus=0`) + await expect.element(editor(), {timeout: 8000}).toBeVisible() + + await editor().fill('start a run') + await userEvent.keyboard('{Enter}') + + await expect.element(stopButton()).toBeVisible() + await expect.element(refresh()).toBeDisabled() +}, 30_000) diff --git a/apps/examples/tanstack-start/conciv/extensions/deploy-button.tsx b/apps/examples/tanstack-start/conciv/extensions/deploy-button.tsx index eeb84e8655..b03cf36ca0 100644 --- a/apps/examples/tanstack-start/conciv/extensions/deploy-button.tsx +++ b/apps/examples/tanstack-start/conciv/extensions/deploy-button.tsx @@ -1,5 +1,6 @@ import {z} from 'zod' import {defineExtension, defineTool, getExtensionApi} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' const DEPLOY_NAME = 'deploy' @@ -38,9 +39,9 @@ function DeploySurface() { const notify = host.useToast() if (slot === 'composer') return ( - + ) if (slot === 'status') return env: staging return null diff --git a/apps/examples/tanstack-start/package.json b/apps/examples/tanstack-start/package.json index 63390415b3..05476b7e2b 100644 --- a/apps/examples/tanstack-start/package.json +++ b/apps/examples/tanstack-start/package.json @@ -21,6 +21,7 @@ "@conciv/extension-tanstack": "workspace:*", "@conciv/it": "workspace:*", "@conciv/protocol": "workspace:*", + "@conciv/ui-kit-chat": "workspace:*", "@tailwindcss/vite": "^4.3.2", "@tanstack/react-devtools": "^0.10.8", "@tanstack/react-form": "^1.33.0", diff --git a/apps/site/content/docs/extending/widget-ui.mdx b/apps/site/content/docs/extending/widget-ui.mdx index 500658757d..2530e0f7cf 100644 --- a/apps/site/content/docs/extending/widget-ui.mdx +++ b/apps/site/content/docs/extending/widget-ui.mdx @@ -19,17 +19,28 @@ nothing for slots you do not care about. ```tsx title="conciv/extensions/deploy.tsx" import {Show} from 'solid-js' import {defineExtension} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' const deploy = defineExtension({name: 'deploy', tools: [deployRun]}) function DeployButton() { const slot = deploy.useSlot() const context = deploy.useContext() + const send = () => context.insert('deploy this branch to staging') return ( - + + + ) } @@ -40,12 +51,56 @@ export default Object.assign(deploy, {Component: DeployButton}) Slots: `header`, `footer`, `composer`, `empty` (the blank-thread state), `status`, and `widget` (a free-floating layer). +## Composer actions + +The composer toolbar is shared: the built-in actions, every extension, and the send button all live +in one row, so it runs out of room on a narrow panel. Declare each action once with +`ComposerActions.ActionButton` from `@conciv/ui-kit-chat` and the composer places it for you: it +renders inline while it fits, and once it doesn't, the host builds a menu item from that same +registration — same tooltip, icon, and `onClick` — in the shared overflow menu. There is no separate +menu-item JSX to author. The conciv composer keeps the row short: it holds back every `visible="auto"` +button (the default), so plan on your action living in the overflow menu unless you pass +`visible="always"`. + + boolean', description: 'Disables both the inline button and the menu item.'}, + 'ActionButton.busy': {type: 'boolean', description: 'Marks the action in progress without disabling it.'}, + Inline: { + type: '{priority?, visible?, children}', + description: + 'Escape hatch for a control that is already its own trigger (a menu, a status chip). Counts toward the fit budget, has no menu form: hidden entirely once collapsed.', + }, + 'Action + ActionMenuItem': { + type: '{priority?, visible?, disabled?, children} + {label, onSelect, children?}', + description: + 'The divergent case: wrap an ActionButton (or Inline) together with explicit ActionMenuItem children when the inline and collapsed representations must differ.', + }, + }} +/> + +A raw ` + )} + /> + )} + + +``` + +`TRIGGER_CLASS` is a local constant on the `TooltipIconButton` ghost variant sizing (`'size-8.5'`); `triggerContent` keeps icon choice with the app (no lucide import here — this package's public API stays icon-agnostic like the rest of its primitives). + +- `anyCollapsed()` = any active root with `itemCount > 0` not inline. +- **Menu-open collapse race:** control the menu (`Menu.Root open={menuOpen()} onOpenChange={...}`). A `createEffect` watching `anyCollapsed()`: on transition to false while open, close the menu and call `props.onOverflowDismissed` (app focuses the composer input); default focus target is the first inline action button. +- `Button`: sets `hasButton` + pinned via `root.update` synchronously, `onCleanup` resets `hasButton: false`. Renders `` → `TooltipIconButton` with `class`/`variant` passthrough, `aria-busy={props.busy}`, `disabled={root.disabled()}`. +- `Inline`: same registration as `Button` (never pinned), renders children when `root.inline()`. +- `DropdownItem`: `root.update` increments `itemCount` synchronously, `onCleanup` decrements. Renders + +```tsx + + {(mount) => ( + + props.onSelect()}> + {props.children} + {props.label} + + + )} + +``` + +- Root outside a coordinator: renders nothing. +- Row JSX: `Menu.Root` wraps `div class="pt-0.5 flex gap-1 items-center"` containing leading wrapper, `{props.children}`, trigger slot, trailing wrapper (`ml-auto` + `empty:hidden`), then `Menu.Positioner > Menu.Content` with the group `For`. + +**Component-level browser tests** (`composer-actions.browser.test.tsx`, in-package — mount `ComposerActionsHost` directly with synthetic roots in a width-controlled container, following the package's existing browser-test mounting pattern): + +- wide: all buttons inline, no trigger; narrow: low-priority roots collapse, trigger appears with `aria-haspopup`/`aria-expanded`, items fire `onSelect` and the menu closes. +- pinned root stays inline at any width; button-only root hidden when collapsed; item-only root menu-only; multi-item root's items contiguous in priority order. +- Root `disabled` accessor disables inline button AND menu item (`aria-disabled`), item not invocable. +- duplicate id: only last root renders. +- widening while menu open closes it without stranding focus (assert menu hidden + `onOverflowDismissed` observable effect). +- keyboard: Enter opens, ArrowDown highlights, Escape closes and returns focus to trigger. + +- [ ] **Step 1: Write the failing browser tests.** +- [ ] **Step 2: Run to verify failure** — `pnpm vitest run test/composer-actions.browser.test.tsx` (cwd `packages/ui-kit-chat`). +- [ ] **Step 3: Implement `composer-actions.tsx` per the contract; export from `index.tsx`.** +- [ ] **Step 4: Gates** — focused browser suite green, then `pnpm turbo run typecheck --filter=@conciv/ui-kit-chat && pnpm turbo run build --filter=@conciv/ui-kit-chat && pnpm turbo run test --filter=@conciv/ui-kit-chat`, then the bundling guard: `pnpm turbo run build --filter=@conciv/embed && pnpm turbo run test --filter=@conciv/embed` (mount-externals stays green). +- [ ] **Step 5: Commit** (`feat(ui-kit-chat): ComposerActions compound primitives with overflow coordinator`, pathspec `packages/ui-kit-chat`). + +--- + +### Task 2b: Storybook coverage + +**Files:** + +- Create: `packages/ui-kit-chat/src/primitives/composer/composer-actions.stories.tsx` (`apps/storybook` already globs `packages/ui-kit-chat/src/**/*.stories.*` — zero config) + +**Stories (rich, following `packages/ui-kit-system/src/menu.stories.tsx` conventions):** + +- `AllInline` — wide fixed-width host, five mixed roots. +- `Collapsed` — narrow host, pinned + overflow trigger visible. +- `PinnedOnly` — `visible="always"` alongside collapsing autos. +- `MenuOnlyRoot` — item-only root. +- `MultiItemRoot` — launch-style root with conditional item set. +- `DisabledRoot` — disabled accessor live-toggled via story control. +- `ResizablePlayground` — host inside a CSS `resize: horizontal` container for manual dragging. +- Play functions (storybook vitest) on `Collapsed`, `DisabledRoot`, `MultiItemRoot`: open menu, assert menuitems by role/name, assert `aria-disabled`, select fires. + +- [ ] **Step 1: Write stories + play functions.** +- [ ] **Step 2: Gate** — the storybook test gate for this package's stories (`pnpm turbo run test --filter=conciv-storybook` — confirm the app's real package name from `apps/storybook/package.json`). +- [ ] **Step 3: Commit** (`feat(ui-kit-chat): ComposerActions stories`, pathspec `packages/ui-kit-chat apps/storybook`). + +--- + +### Task 3: Wire the coordinator into `PaneComposer`, migrate built-ins + +**Files:** + +- Modify: `apps/conciv/src/pane/pane-composer.tsx`, `apps/conciv/src/composer/actions.tsx`, `apps/conciv/src/pane/chat-pane.tsx` +- Modify: `apps/conciv/test/helpers/pane-harness.tsx` (width control) +- Test: `apps/conciv/test/composer-overflow.browser.test.tsx` (new — app-level wiring: built-ins + extension surface through the real pane) + +**Interfaces:** + +- Consumes: `ComposerActionsHost`, `ComposerActions` from `@conciv/ui-kit-chat` (import alias `ComposerActions as Action` in `actions.tsx` — the app component of the same name keeps its export). +- Produces: toolbar row contract — leading = attachment button; managed = built-ins + `ExtensionSurface name="composer"`; trailing = `trailingExtras` (model selector, own `Suspense` with slot-sized fallback) + refresh + send/cancel; trigger named `'More composer actions'`. Harness API: `mountPane(options & {width?: number})` returning `setWidth(px: number)` (reactive style width; `w-100` hardcode becomes the 400px default). + +**pane-composer.tsx** — REFRESH STAYS UNTIL TASK 7 (`TrailingControls` unchanged in this task): + +```tsx + +``` + +(`focusComposerInput` = whatever handle the composer input adapter already exposes — reuse `onInputReady`'s handle, don't invent focus plumbing.) `PaneComposerProps` gains `trailingExtras?: JSX.Element`; `chat-pane.tsx` moves `` into it. + +**actions.tsx** — built-ins on the primitives (grab pinned, launch coordinator-registered via `Inline` from day one so the fit budget counts it): + +```tsx + + void pick()} + > + + + + + props.onNewSession()}> + + + props.onNewSession()}> + + + props.compacting}> + props.onCompact()}> + + + props.onCompact()}> + + + + + + + + + +``` + +Grab keeps ACT/busyClass styling and is NOT disabled while picking (`busy` only). + +**pane-harness.tsx**: `w-100` → `style={{width: \`${width()}px\`}}`, signal default 400; `mountPane`accepts`width?`, returns `setWidth`. Verify with the fit constants that 400px keeps every built-in inline (≈342px used) so neighbor suites keep their inline locators; raise the default if the real trailing cluster measures wider, and say so in the commit. + +**App-level tests** (`composer-overflow.browser.test.tsx`) — wiring-focused (primitives' own behavior is covered in-package by Task 2): + +- wide: all built-ins inline, no trigger. +- narrow: grab pinned inline, new-session/compact collapsed into the menu, menu item fires the real action (assert via harness fixture callbacks: `expectNewSessionRequested`). +- disabled compacting root not invocable from menu (`aria-disabled`, `expectNoCompactRequested`). +- resize back and forth settles; expanding with menu open closes it. +- (keyboard lifecycle already covered in-package; don't duplicate here.) + +- [ ] **Step 1: Write failing tests** (harness options `compacting`, `expectNewSessionRequested`, `expectNoCompactRequested` wired to fixture callbacks — extend harness options, never app state). +- [ ] **Step 2: Run to verify failure** — `pnpm vitest run test/composer-overflow.browser.test.tsx` (cwd `apps/conciv`). +- [ ] **Step 3: Implement pane-composer + actions migration + harness width control.** +- [ ] **Step 4: Run new suite AND neighbors** — `pnpm vitest run test/composer-overflow.browser.test.tsx test/chat-pane.browser.test.tsx test/launch-menu.browser.test.tsx test/launch-actions.browser.test.tsx test/model-selector.browser.test.tsx` — PASS (refresh untouched, its tests stay green). +- [ ] **Step 5: Package gate + adoption grep + commit** (`feat(conciv): collapse composer actions into overflow menu`, pathspec `apps/conciv`). + +--- + +### Task 4: Launch menu flattening (multi-item root) + +**Files:** + +- Modify: `apps/conciv/src/composer/launch-menu.tsx`, `apps/conciv/src/composer/actions.tsx` +- Test: extend `apps/conciv/test/launch-menu.browser.test.tsx` + +`LaunchMenu` owns both renderings — the `Action.Root id="conciv.launch"` moves from `actions.tsx` into `LaunchMenu` itself (`actions.tsx` renders bare ``): + +```tsx + local.pending === true}> + {existing Menu.Root block, unchanged} + + local.onOpen()}> + + local.onCopy()}> + + + } + > + local.onRetry?.()} + > + + + +``` + +- [ ] **Step 1: Failing tests** — narrow: `Open in ` + `Copy command` menuitems contiguous in the shared menu; failure state shows the retry item instead. Wide: existing launch tests unchanged. +- [ ] **Step 2: Run to verify failure.** +- [ ] **Step 3: Implement.** +- [ ] **Step 4: Run launch + overflow + chat-pane suites; package gate.** +- [ ] **Step 5: Commit** (`feat(conciv): launch menu flattens into composer overflow`, pathspec `apps/conciv`). + +--- + +### Task 5: Migrate extension clients, scaffolds, authoring docs + +**Files:** + +- Modify: `packages/extensions/whiteboard/src/client.tsx`, `packages/extensions/tanstack/src/client.tsx` (both add `import {ComposerActions} from '@conciv/ui-kit-chat'` — check each package.json declares `@conciv/ui-kit-chat`; add the workspace dep if absent, it's an internal workspace ref, not a new third-party dep) +- Modify (TEMPLATE STRINGS ONLY — no runtime code in this package): `packages/extension/src/catalog.ts` (`composer-action` + `full` templates now emit `import {ComposerActions} from '@conciv/ui-kit-chat'` examples; composer slot description names the primitives), `packages/extension/test/catalog.test.ts` (assertions match new verbatim strings) +- Modify: `packages/harness/plugins/claude/skills/conciv-extensions/SKILL.md`, `apps/site/content/docs/extending/widget-ui.mdx` + +Whiteboard composer branch: + +```tsx + + + toggle()}> + + + toggle()}> + + + + + void pickComment()}> + + + void pickComment()}> + + + + +``` + +Tanstack: same transform. No authoring surface anywhere still demonstrates a raw composer button. + +- [ ] **Step 1: Update `catalog.test.ts` expectations (failing)** — `pnpm vitest run test/catalog.test.ts` (cwd `packages/extension`) — FAIL. +- [ ] **Step 2: Apply all migrations.** +- [ ] **Step 3: Gates** — `pnpm turbo run test --filter=@conciv/extension`; tanstack package gate; whiteboard typecheck + build + lint ONLY; adoption grep. +- [ ] **Step 4: Commit** (`feat(extensions): author composer buttons through ComposerActions`, pathspec touched packages + site docs). + +--- + +### Task 6: Extension-testkit host support + fixture + +**Files:** + +- Modify: `packages/extension-testkit/src/host/host-runtime.tsx` (wrap the composer-slot mount in `ComposerActionsHost` — testkit already depends on `@conciv/ui-kit-chat` — inside a width-controllable container with a labeled width control), `packages/extension-testkit/fixtures/ping/client.tsx` (fixture gains a `ComposerActions` root: Button + two DropdownItems) +- Test: new `packages/extension-testkit/test/composer-actions.it.test.ts` following the existing `test/*.it.test.ts` + `fixtureHost` pattern (NOT `e2e/` — that holds websocket/RPC probes) + +- [ ] **Step 1: Failing test** — wide host: fixture button inline; narrow (set via the labeled width control with `userEvent`): button gone, `More composer actions` opens, both fixture items present and fire (assert via the fixture's observable effect). +- [ ] **Step 2: Implement host wrap + width control + fixture root.** +- [ ] **Step 3: Run** — `pnpm turbo run test --filter=@conciv/extension-testkit`. +- [ ] **Step 4: Commit** (`feat(extension-testkit): host composer actions coordinator`, pathspec `packages/extension-testkit`). + +--- + +### Task 7: Extract refresh from the composer + +**Files:** + +- Modify (delete): `packages/ui-kit-chat/src/primitives/composer/composer.tsx` (`Refresh` + export), `composer-handlers.tsx` (`onRefresh`), refresh-specific tests in `packages/ui-kit-chat/test/composer-completion.browser.test.tsx` (deleted, not rewired) +- Modify: `apps/conciv/src/app/pane-context.ts`, `apps/conciv/src/app/pane-provider.tsx`, `apps/conciv/src/routes/panel.$sessionId.tsx` (context value + header button), `apps/conciv/src/pane/chat-pane.tsx` (register handle, drop `onRefresh`), `apps/conciv/src/pane/pane-composer.tsx` (delete `TrailingControls`, trailing keeps only `ComposerSendControl`), `apps/conciv/src/routes/quick.tsx` (LIFT `PaneProvider` to wrap the whole `data-pw-qt-pane` div — the session bar sits outside it and `usePane()` would throw; button goes in that bar), `apps/conciv/src/routes/pip.$sessionId.tsx` (slim `flex justify-end px-2 pt-1` row above `ChatPane`) +- Modify: `apps/conciv/test/helpers/pane-harness.tsx` (THIRD `PaneContextValue` construction site — gains the signal pair; harness view renders `` alongside `ChatPane`) +- Create: `apps/conciv/src/shell/refresh-button.tsx` +- Test: `apps/conciv/test/chat-pane.browser.test.tsx` (two refresh tests rewired against the harness-mounted `RefreshButton`), `apps/conciv/test/quick-refresh.browser.test.tsx` (quick per-pane presence + disabled-while-streaming) + pip presence in the pip suite if one exists (else cover pip mounting in quick-refresh file via its route scaffolding) + +**Interfaces:** + +- `type RefreshHandle = {run: () => void; busy: () => boolean}` in `pane-context.ts`; `PaneContextValue` gains `refresh: Accessor`, `registerRefresh: (handle: RefreshHandle | null) => void`. ALL THREE construction sites get `const [refreshHandle, setRefreshHandle] = createSignal(null)`. +- `chat-pane.tsx` registers in the component body: `pane.registerRefresh({run: () => chat.refresh(), busy: () => chatBusy(chat)})` + `onCleanup(() => pane.registerRefresh(null))` (`chatBusy` exported from `@conciv/ui-kit-chat`). +- `refresh-button.tsx`: + +```tsx +import {Show, type JSX} from 'solid-js' +import RefreshCw from 'lucide-solid/icons/refresh-cw' +import {TooltipIconButton} from '@conciv/ui-kit-system' +import {usePane} from '../app/pane-context.js' + +export function RefreshButton(props: {class?: string}): JSX.Element { + const pane = usePane() + return ( + + {(handle) => ( + handle().run()} + > + + )} + + ) +} +``` + +Placements: panel header right cluster before the close button (`CLOSE` class); quick per-pane session bar (inside the lifted provider); pip chrome row. + +- [ ] **Step 1: Fallow trace BEFORE deleting** — `pnpm exec fallow dead-code --trace 'packages/ui-kit-chat/src/primitives/composer/composer.tsx:Refresh'` — confirm consumers are exactly `PaneComposer` + the ui-kit tests slated for deletion. +- [ ] **Step 2: Rewire tests (FAIL first)** — refresh tests target the harness-mounted `RefreshButton` (role button `'Refresh the conversation'`, `toBeDisabled()` while streaming); quick/pip presence tests. +- [ ] **Step 3: Implement — deletions, context handle, `RefreshButton`, three placements, quick provider lift, harness update.** +- [ ] **Step 4: Run** — `pnpm turbo run test --filter=@conciv/ui-kit-chat`, then `pnpm vitest run test/chat-pane.browser.test.tsx test/composer-overflow.browser.test.tsx test/quick-refresh.browser.test.tsx` (cwd `apps/conciv`), then the app package gate. +- [ ] **Step 5: Commit** (`feat(conciv): session refresh moves to pane chrome, out of the composer`, pathspec `packages/ui-kit-chat apps/conciv`). + +--- + +### Task 8: Full gates + changeset + +**Files:** + +- Create: `.changeset/composer-actions-collapse.md` + +- [ ] **Step 1: Changeset** + +```md +--- +'@conciv/ui-kit-chat': patch +--- + +Composer actions collapse into a shared overflow menu; extensions author buttons through ComposerActions.Root/Button/DropdownItem/Inline from @conciv/ui-kit-chat. Session refresh moved out of the composer into pane chrome. +``` + +- [ ] **Step 2: Coverage check** — `pnpm exec conciv-publish check-changesets --require-coverage --base origin/main`. +- [ ] **Step 3: Final gates** — `pnpm turbo run build --filter=@conciv/embed`, `pnpm typecheck && pnpm test:affected`, `pnpm exec fallow audit --changed-since main --format json` — fix anything INTRODUCED. +- [ ] **Step 4: Commit** (`chore: changeset for composer actions collapse`, pathspec `.changeset`). + +--- + +## Self-Review Notes + +- Placement: `@conciv/ui-kit-chat` per user direction (2026-08-16) — supersedes the spec's `@conciv/extension` export-surface line. `packages/extension` sees template-string edits only (Task 5). +- Spec deviations recorded: (a) `RefreshButton` reads `PaneContext` on every surface — quick's bar and panel header both sit above `ChatProvider`; quick's `PaneProvider` lifted per-pane. (b) Menu ordering = per-root group nodes in host DOM order — zag walks DOM order; CSS `order` desyncs keyboard from visuals. (c) Placement change above. +- Root-level `disabled: () => boolean` is the ONLY disabled mechanism; `Button.busy` styling-only. +- Type names consistent: `FitInput`, `Registration`, `Coordinator`, `RootState`, `RefreshHandle`, `ComposerActionsHost`, `ComposerActions.{Root,Button,DropdownItem,Inline}`. diff --git a/docs/superpowers/specs/2026-08-16-composer-actions-collapse-design.md b/docs/superpowers/specs/2026-08-16-composer-actions-collapse-design.md new file mode 100644 index 0000000000..9e76999e75 --- /dev/null +++ b/docs/superpowers/specs/2026-08-16-composer-actions-collapse-design.md @@ -0,0 +1,199 @@ +# Composer actions collapse & session refresh extraction + +> **Superseded by implementation.** This is a point-in-time planning doc; the shipped API diverges +> from what's described below. The shipped surface is `Action`/`ActionButton`/`ActionMenuItem`/`Inline` +> plus `Leading`/`Trailing`/`Trigger` slots from `@conciv/ui-kit-chat` — no ids, actions register with +> the host via context (not JSX tokens), and refresh lives on `PaneContext.chat` rather than a +> `RefreshHandle`. Source of truth: `packages/ui-kit-chat/src/primitives/composer/composer-actions.tsx`. + +Date: 2026-08-16 +Status: revised after codex (gpt-5.6-sol) adversarial review + +## Problem + +The widget composer toolbar row is saturated with icon buttons: attachment paperclip, grab +(select element), new session, compact, launch menu, extension-contributed buttons (whiteboard +canvas, whiteboard comment, tanstack), model selector, refresh, send/cancel. Every extension that +adds a composer button makes it worse, and nothing adapts to panel width. Additionally the +"Refresh the conversation" control (stream re-subscribe) is a session-level affordance that has no +business living in the composer. + +## Goals + +- Only a small number of action buttons visible inline in the composer; the rest live in a single + overflow dropdown menu. +- Extension authors keep authoring plain JSX: they declare _what_ to show; the host decides _when + and how_ (inline vs dropdown). +- Automatic collapse driven by measured container width, regardless of per-button config, so the + composer works at every panel size. +- Refresh removed from the composer contract entirely; standalone session-scoped `RefreshButton` + usable on any surface that has a chat context. + +## Non-goals + +- No declarative action-registry public API (rejected: extensions author JSX, not data). +- No `visible="menu"` state (dropdown-only expressed structurally: provide only `DropdownItem`s). +- No changes to attachment paperclip, model selector, or send/cancel — they are not "actions" and + stay outside the collapsible group (but their widths participate in the fit budget, see §2). +- No back-compat shims (v0). + +## Design + +### 1. `ComposerActions.*` compound primitives + +New public primitives, exported through the `@conciv/extension` surface (single import point for +extension authors). Authoring shape: + +```tsx +function MyExtensionButton() { + return ( + + + + + + + + + ) +} +``` + +- `Root` props: `id` (stable, unique), `priority` (higher = keeps inline slot longer; default 0), + `disabled?: () => boolean` — the single reactive disabled/pending source consumed by BOTH + renderings. Inline button and menu items can never disagree; disabled Ark items stay in the + collection but are skipped by arrow/typeahead navigation (Ark default). +- `Button` props: `visible?: 'auto' | 'always'` (default `'auto'`), `tooltip`, `onClick`. Renders + `TooltipIconButton`. +- `DropdownItem` props: `value` (required, stable; namespaced by the host as `${rootId}:${value}` + for Ark collection identity), `label`, `onSelect`, icon child. Renders an Ark `Menu.Item` + portaled into the host's shared overflow menu content node. +- A `Root` may contain MULTIPLE `DropdownItem`s, including conditional sets (`Show`/`Switch`). + When collapsed, all its items appear flattened in the overflow menu, grouped contiguously in + priority order. This is how the launch menu migrates (see §3). +- Semantics by structure: + - Button + item(s): inline when space, menu items when collapsed. + - Button only: inline when space, hidden when collapsed (`visible="always"` pins it inline). + - Item(s) only: menu-only. +- Extensions continue to gate on `useSlot() === 'composer'` exactly as today; only the JSX they + render inside that gate changes. +- Home: the primitives live with the widget UI kit surface (`packages/ui-kit-chat` or + `apps/conciv` + re-export via `@conciv/extension`); final placement decided at implementation by + where `TooltipIconButton`/`Menu` dependencies resolve without cycles. + +### 2. Host coordinator (invisible to extensions) + +**Ownership requirement:** the coordinator context AND the shared Ark `Menu.Root` must be +_logical Solid ancestors_ (owner-tree, not merely DOM ancestors) of everything that renders +`ComposerActions.*` — the built-in actions and ``. Concretely: +`PaneComposer` hosts `ComposerActionsProvider` + `Menu.Root` above `props.children`. Solid +`Portal` preserves context, so extension `Menu.Item`s portaled into the shared `Menu.Content` +node resolve Ark context correctly. Items that register before the content mount node exists +(Suspense) queue and portal once it mounts. + +**Registration:** each `Root` registers `{id, priority, visible, hasButton, itemCount, disabled}` +into a reactive store on mount, unregisters on cleanup. Duplicate id: dev warning, last wins. +`Root` outside a coordinator renders nothing. + +**Fit algorithm (pure arithmetic, no DOM measurement of candidates):** + +- Action buttons are uniform `TooltipIconButton` geometry, so per-slot width is a design-token + CONSTANT (`SLOT` = button width + gap) — candidate widths are never read from the DOM. +- Two passive `ResizeObserver`s (reuse `useSizeHandle`): one on the stable outer toolbar row, one + on the trailing non-collapsible cluster (attachment control, model selector, send/cancel — + model selector is the only variable-width occupant). Observers report already-computed + geometry; no forced layout reads. +- `visibleAutoCount = floor((rowWidth − trailingWidth − reservedTriggerWidth − pinnedCount·SLOT) / SLOT)` + — one subtraction and a division per resize event. +- The overflow-trigger width is ALWAYS reserved, removing the circular collapse condition + (trigger appearing forces another collapse). +- Fill: pinned (`visible="always"`) buttons always inline, then the top `visibleAutoCount` `auto` + buttons in priority-desc order; the rest collapse. Below a hard minimum budget all `auto` + buttons collapse. +- Hysteresis margin on the count boundary so drag-resizing across a threshold cannot flap + (visual stability; the arithmetic itself is negligible). +- Visibility changes never alter the observed row/cluster widths (buttons collapse into the + portaled menu, the reserved trigger slot is constant), so no observer feedback loop exists. +- Overflow trigger button: accessible name "More composer actions", rendered only when ≥1 item is + collapsed (space stays reserved regardless). Menu ordering: priority desc, then registration + order. + +### 3. Built-ins migrate to the same primitives + +`apps/conciv/src/composer/actions.tsx` (grab, new session, compact, launch menu) is rewritten on +`ComposerActions.*`: + +- Grab: `visible="always"` (primary, pinned) by default. +- New session, compact: `auto`, button + one dropdown item each. +- Launch: one `Root`; inline rendering keeps its own trigger + nested menu exactly as today; + collapsed rendering = its conditional item set (open-in-harness / copy-command / retry) + flattened into the shared overflow menu via multiple `DropdownItem`s. + +**Full migration surface (all authoring/guidance call sites):** + +- `packages/extensions/whiteboard/src/client.tsx`, `packages/extensions/tanstack/src/client.tsx`. +- `packages/extension/src/catalog.ts`: `composer-action` scaffold template, the `full` scaffold's + raw composer button, slot descriptions ("add buttons or actions"), and scaffold assertions in + `packages/extension/test/catalog.test.ts`. +- `packages/harness/plugins/claude/skills/conciv-extensions/SKILL.md` (teaches raw buttons today). +- `apps/site/content/docs/extending/widget-ui.mdx`. + +No authoring surface may keep demonstrating raw composer buttons — anything unmanaged bypasses +collapse. + +### 4. Refresh extracted from the composer + +- Delete `ComposerPrimitive.Refresh` (`packages/ui-kit-chat/src/primitives/composer/composer.tsx`) + and `onRefresh` from the composer handlers contract + (`packages/ui-kit-chat/src/primitives/composer/composer-handlers.tsx`); the composer no longer + knows refresh exists. +- New standalone self-contained `RefreshButton` in `apps/conciv`: internally calls + `useChatContext()`, runs `chat.refresh()` (stream re-subscribe), disabled while streaming. + Usable anywhere under a `ChatProvider`. +- Per-surface placement (`ChatProvider` stays where it is, inside `ChatPane`): + - **Panel:** header right cluster (`apps/conciv/src/routes/panel.$sessionId.tsx`). The header + renders above `ChatProvider`, so `ChatPane` relays a refresh command through `PaneContext` + (same pattern as the existing `newSession`); the header button consumes `pane.refresh`. + - **Quick mode:** per-pane placement (multiple sessions under one global header — a global + button has no target). Each pane's own chrome row hosts `RefreshButton` directly. + - **PiP:** no header exists; `RefreshButton` in pip chrome within the `ChatPane` region. +- ui-kit-chat's primitive-specific refresh browser tests are DELETED (not rewired — the header + button is an app component; ui-kit cannot depend on it). Refresh behavior + streaming-disable + coverage lives in the app-level browser suite. + +## Error handling + +- Duplicate `Root` id: dev-time warning, last registration wins. +- `Root` rendered outside a coordinator (e.g. non-composer slot): renders nothing. +- Zero collapsed items: no overflow trigger in the DOM (reserved space remains in the budget). +- Items registering before the shared menu content node mounts (Suspense): queued, portal on mount. + +## Testing + +Real-browser (Playwright/Chromium) tests against the prebuilt embed bundle, per repo rules: + +- Narrow panel: `auto` buttons leave the row, "More composer actions" trigger appears, menu items + present and fire the same actions; `visible="always"` button stays inline. +- Wide panel: all buttons inline, no trigger. +- Repeated resize across the exact threshold (drag back and forth): no oscillation, no + ResizeObserver loop errors. +- Button-only Root hidden when collapsed; item-only Root appears only in the menu; multi-item Root + (launch) shows its conditional set flattened. +- Disabled Root: inline button disabled AND menu item non-invocable, skipped by keyboard nav. +- Overflow menu keyboard lifecycle: `aria-haspopup`/expanded on trigger, arrow navigation, + typeahead, Escape dismissal, focus return to trigger, menu closes after selection, focus + behavior when a resize moves the focused action inline or unmounts an open menu. +- Extension-testkit: host runtime (`packages/extension-testkit/src/host/host-runtime.tsx`) gains + the coordinator + shared menu root + configurable width so fixtures can exercise the primitives; + fixture covering an extension using Button + DropdownItems. +- Refresh: re-subscribe + disabled-while-streaming tests move to the app-level suite against the + panel header button; per-surface presence checks for quick/pip. +- Assertions role/visibility-based; panel width driven through real resize affordances; no DOM + measurement assertions. + +## Open items (implementation-time) + +- Exact package placement of the primitives (dependency-cycle check). +- `ComposerActions.Button` needs an `asChild`-style escape for launch's inline rendering (the + inline control is itself a menu trigger, not a plain onClick button); follow the existing + `TooltipIconButtonSlot` + `Menu.Trigger asChild` pattern from `launch-menu.tsx`. diff --git a/e2e/nextjs/tests/widget.spec.ts b/e2e/nextjs/tests/widget.spec.ts index f972b1be51..5f439a8ea2 100644 --- a/e2e/nextjs/tests/widget.spec.ts +++ b/e2e/nextjs/tests/widget.spec.ts @@ -11,7 +11,7 @@ test('the terminal builtin server extension loaded and can hand back a real conn const failures = collectFailures(page) await page.goto('/', {waitUntil: 'domcontentloaded'}) await expectWidgetBoots(page, failures) - await page.getByRole('button', {name: /Terminal options for/}).click() + await page.getByRole('button', {name: 'More composer actions'}).click() await page.getByRole('menuitem', {name: 'Copy command'}).click() await expect(page.getByText(/--mcp-config/)).toBeVisible() }) diff --git a/packages/embed/tests/e2e/chat-send-parts.it.test.ts b/packages/embed/tests/e2e/chat-send-parts.it.test.ts index 823784b42c..f5b2366ead 100644 --- a/packages/embed/tests/e2e/chat-send-parts.it.test.ts +++ b/packages/embed/tests/e2e/chat-send-parts.it.test.ts @@ -28,7 +28,7 @@ test.describe('a send that carries an attachment', () => { await page.goto(suite.host().base, {waitUntil: 'domcontentloaded'}) await openPanel(page) - const addAttachment = page.getByRole('button', {name: 'Add attachment'}) + const addAttachment = page.getByRole('button', {name: 'Add an attachment'}) await expect(addAttachment).toBeEnabled({timeout: 30_000}) const opened = page.waitForEvent('filechooser', {timeout: 30_000}) await addAttachment.click() diff --git a/packages/embed/tests/e2e/fab-working.it.test.ts b/packages/embed/tests/e2e/fab-working.it.test.ts index 8d99e003a0..49d5956724 100644 --- a/packages/embed/tests/e2e/fab-working.it.test.ts +++ b/packages/embed/tests/e2e/fab-working.it.test.ts @@ -39,7 +39,8 @@ test('minimizing the panel mid-run leaves the closed launcher wearing the busy s test('switching to a new session mid-run hands the busy state over to the session list', async ({page}) => { await sendHeldTurn(page, suite) - await page.getByRole('button', {name: 'Start a new session'}).click() + await page.getByRole('button', {name: 'More composer actions'}).click() + await page.getByRole('menuitem', {name: 'Start a new session'}).click() await expect(stopButton(page)).toHaveCount(0, {timeout: IMMEDIATE_MS}) await expect(panelLauncher(page)).toHaveAttribute('aria-busy', 'true') diff --git a/packages/extension-compiler/package.json b/packages/extension-compiler/package.json index ed3eaa3185..97ee2aaec0 100644 --- a/packages/extension-compiler/package.json +++ b/packages/extension-compiler/package.json @@ -67,6 +67,7 @@ "oxc-parser": "^0.127.0" }, "devDependencies": { + "@conciv/ui-kit-chat": "workspace:*", "@conciv/vitest-config": "workspace:*", "@types/babel__core": "^7.20.5", "@types/node": "^22.19.21", diff --git a/packages/extension-compiler/src/split-extension.ts b/packages/extension-compiler/src/split-extension.ts index 3372321b06..32fb57ae07 100644 --- a/packages/extension-compiler/src/split-extension.ts +++ b/packages/extension-compiler/src/split-extension.ts @@ -24,6 +24,8 @@ const TERMINATOR_NAMES = new Set( Object.values(STRIPPED_TERMINATOR).flatMap((terminatorOf) => Object.values(terminatorOf)), ) +const NODE_STRIPPED_PROPERTIES = new Set(['Component', 'Surface', 'views']) + function isDeclarationPackage(source: string): boolean { return source === DECLARATION_PACKAGE || source.startsWith(`${DECLARATION_PACKAGE}/`) } @@ -55,6 +57,71 @@ function declarationKindOf(node: t.Node, path: NodePath, seen: Set): Dec return null } +function propertyKeyName(node: t.Node): string | null { + if (!t.isObjectProperty(node) && !t.isObjectMethod(node)) return null + if (node.computed) return null + if (t.isIdentifier(node.key)) return node.key.name + return t.isStringLiteral(node.key) ? node.key.value : null +} + +function isClientOnlyProperty(node: t.Node): boolean { + const key = propertyKeyName(node) + return key !== null && NODE_STRIPPED_PROPERTIES.has(key) +} + +function extensionConfigPath(path: NodePath): NodePath | null { + const callee = path.node.callee + if (!t.isIdentifier(callee)) return null + if (declarationKindOfBinding(callee.name, path, new Set()) !== 'extension') return null + const [config] = path.get('arguments') + return config && config.isObjectExpression() ? config : null +} + +function isObjectAssignCallee(callee: t.Node): boolean { + return ( + t.isMemberExpression(callee) && + t.isIdentifier(callee.object) && + callee.object.name === 'Object' && + t.isIdentifier(callee.property) && + callee.property.name === 'assign' + ) +} + +function objectAssignConfigPath(path: NodePath): NodePath | null { + if (!isObjectAssignCallee(path.node.callee)) return null + const [target, config] = path.get('arguments') + if (!target || !config || !config.isObjectExpression()) return null + if (declarationKindOf(target.node, path, new Set()) !== 'extension') return null + return config +} + +function stripClientOnlyProperties(path: NodePath): void { + const config = extensionConfigPath(path) ?? objectAssignConfigPath(path) + if (config === null) return + for (const property of config.get('properties')) { + if (isClientOnlyProperty(property.node)) property.remove() + } +} + +function terminatorName(callee: t.Node): string | null { + if (!t.isMemberExpression(callee) || !t.isIdentifier(callee.property)) return null + return TERMINATOR_NAMES.has(callee.property.name) ? callee.property.name : null +} + +function terminatorObject(callee: t.Node): t.Expression | null { + if (!t.isMemberExpression(callee) || !t.isExpression(callee.object)) return null + return callee.object +} + +function collapseTerminator(path: NodePath, stripped: Record): void { + const name = terminatorName(path.node.callee) + const object = terminatorObject(path.node.callee) + if (name === null || object === null) return + const kind = declarationKindOf(object, path, new Set()) + if (kind === null || stripped[kind] !== name) return + path.replaceWith(object) +} + export function splitExtension(code: string, id: string, env: SplitEnv): {code: string; map: string | null} | null { if (!CONTRACT_MARKER.test(code)) return null const ast = parseSync(code, { @@ -69,13 +136,8 @@ export function splitExtension(code: string, id: string, env: SplitEnv): {code: const strippedTerminator = STRIPPED_TERMINATOR[env] traverse(ast, { CallExpression(path) { - const callee = path.node.callee - if (!t.isMemberExpression(callee)) return - if (!t.isIdentifier(callee.property) || !TERMINATOR_NAMES.has(callee.property.name)) return - if (!t.isExpression(callee.object)) return - const kind = declarationKindOf(callee.object, path, new Set()) - if (kind === null || strippedTerminator[kind] !== callee.property.name) return - path.replaceWith(callee.object) + if (env === 'node') stripClientOnlyProperties(path) + collapseTerminator(path, strippedTerminator) }, }) deadCodeElimination(ast, referenced) diff --git a/packages/extension-compiler/test/load-server-extensions.it.test.ts b/packages/extension-compiler/test/load-server-extensions.it.test.ts index 44972f13fd..875171e125 100644 --- a/packages/extension-compiler/test/load-server-extensions.it.test.ts +++ b/packages/extension-compiler/test/load-server-extensions.it.test.ts @@ -58,6 +58,33 @@ test('a discovered module with no default export is fatal and names the file', a await expect(loadServerExtensions(root, [])).rejects.toThrow(/x\.tsx/) }) +const CLIENT_HEAVY = `import {z} from 'zod' +import {defineExtension, defineTool} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' + +const ping = defineTool({ + name: 'ping', + description: 'ping', + inputSchema: z.object({message: z.string()}), +}).server((input) => ({echo: input.message})) + +const extension = defineExtension({name: 'client-heavy', Component, tools: [ping]}) + +export default extension + +function Component() { + return ( + {}} /> + ) +}` + +test('an extension whose Component imports a client-only package still loads on the server', async () => { + const root = fixture({'client-heavy.tsx': CLIENT_HEAVY}) + const out = await loadServerExtensions(root, []) + expect(out.map((extension) => extension.name)).toEqual(['client-heavy']) + expect(out[0]?.tools?.map((tool) => tool.name)).toEqual(['ping']) +}) + test('built-in wins over a folder file of the same name', async () => { const {defineExtension} = await import('@conciv/extension') const builtin = defineExtension({name: 'terminal'}) diff --git a/packages/extension-compiler/test/split-extension.it.test.ts b/packages/extension-compiler/test/split-extension.it.test.ts index b49d5e93b8..495f684bd0 100644 --- a/packages/extension-compiler/test/split-extension.it.test.ts +++ b/packages/extension-compiler/test/split-extension.it.test.ts @@ -4,6 +4,11 @@ import {splitExtension} from '../src/split-extension.js' const ID = '/proj/conciv/extensions/canvas.tsx' +function splitCode(out: ReturnType): string { + if (out === null) throw new Error('splitExtension returned null') + return out.code +} + const SOURCE = `import {readFileSync} from 'node:fs' import {defineExtension, defineTool} from '@conciv/extension' import {Card} from './card.js' @@ -16,11 +21,60 @@ export default defineExtension({name: 'canvas', tools: [draw]}) .client(() => ({selection: CLIENT_BODY})) .server(() => ({systemPrompt: SERVER_BODY}))` +const SURFACE_SOURCE = `import {defineExtension} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' + +const extension = defineExtension({ + name: 'surface', + Component, + Surface, + views: [{id: 'panel', label: 'Panel', render: Panel}], +}) + +export default extension + +function Component() { + return +} + +function Surface() { + return +} + +function Panel() { + return +}` + +const METHOD_SURFACE_SOURCE = `import {defineExtension} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' + +const extension = defineExtension({ + name: 'method-surface', + Component() { + return + }, + Surface() { + return + }, +}) + +export default extension` + +const ASSIGN_SOURCE = `import {defineExtension} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' + +const deploy = defineExtension({name: 'deploy'}) + +function DeployButton() { + return +} + +export default Object.assign(deploy, {Component: DeployButton})` + describe('splitExtension', () => { it('browser: collapses .server(), keeps .client()/.render(), drops node-only imports', async () => { const out = splitExtension(SOURCE, ID, 'browser') - expect(out).not.toBeNull() - const code = out!.code + const code = splitCode(out) expect(code).not.toContain('.server(') expect(code).not.toContain('SERVER_BODY') expect(code).not.toContain('node:fs') @@ -32,8 +86,7 @@ describe('splitExtension', () => { it('node: collapses .client()/.render(), keeps .server(), drops client-only imports', async () => { const out = splitExtension(SOURCE, ID, 'node') - expect(out).not.toBeNull() - const code = out!.code + const code = splitCode(out) expect(code).not.toContain('.client(') expect(code).not.toContain('.render(') expect(code).not.toContain('CLIENT_BODY') @@ -48,6 +101,72 @@ describe('splitExtension', () => { expect(out).toBeNull() }) + it('node: drops Component/Surface/views and the client-only imports they hold alive', async () => { + const out = splitExtension(SURFACE_SOURCE, ID, 'node') + const code = splitCode(out) + expect(code).not.toContain('Component') + expect(code).not.toContain('Surface') + expect(code).not.toContain('views') + expect(code).not.toContain('Panel') + expect(code).not.toContain('@conciv/ui-kit-chat') + expect(code).toContain("name: 'surface'") + }) + + it('browser: keeps Component/Surface/views intact', async () => { + const out = splitExtension(SURFACE_SOURCE, ID, 'browser') + const code = splitCode(out) + expect(code).toContain('Component') + expect(code).toContain('Surface') + expect(code).toContain('views') + expect(code).toContain('@conciv/ui-kit-chat') + }) + + it('node: drops an object-method Component/Surface and the client-only imports they hold alive', async () => { + const out = splitExtension(METHOD_SURFACE_SOURCE, ID, 'node') + const code = splitCode(out) + expect(code).not.toContain('Component') + expect(code).not.toContain('Surface') + expect(code).not.toContain('@conciv/ui-kit-chat') + expect(code).toContain("name: 'method-surface'") + }) + + it('browser: keeps an object-method Component/Surface intact', async () => { + const out = splitExtension(METHOD_SURFACE_SOURCE, ID, 'browser') + const code = splitCode(out) + expect(code).toContain('Component') + expect(code).toContain('Surface') + expect(code).toContain('@conciv/ui-kit-chat') + }) + + it('node: strips Component from the Object.assign(extension, {Component}) form and its client-only imports', async () => { + const out = splitExtension(ASSIGN_SOURCE, ID, 'node') + const code = splitCode(out) + expect(code).not.toContain('DeployButton') + expect(code).not.toContain('Component') + expect(code).not.toContain('@conciv/ui-kit-chat') + expect(code).toContain("name: 'deploy'") + }) + + it('browser: keeps Component from the Object.assign(extension, {Component}) form intact', async () => { + const out = splitExtension(ASSIGN_SOURCE, ID, 'browser') + const code = splitCode(out) + expect(code).toContain('DeployButton') + expect(code).toContain('Component') + expect(code).toContain('@conciv/ui-kit-chat') + }) + + it.each(['composer-action', 'full'] as const)( + 'node: the %s scaffold keeps no client-only package import', + async (kind) => { + const source = scaffold(kind, {name: 'demo'}) + expect(source).toContain('@conciv/ui-kit-chat') + const node = splitExtension(source, ID, 'node') + expect(node).not.toBeNull() + expect(node!.code).not.toContain('@conciv/ui-kit-chat') + expect(splitExtension(source, ID, 'browser')!.code).toContain('@conciv/ui-kit-chat') + }, + ) + it('round-trips a scaffolded full extension through both sides', async () => { const source = scaffold('full', {name: 'demo'}) const browser = splitExtension(source, ID, 'browser') diff --git a/packages/extension-testkit/fixtures/ping/client.tsx b/packages/extension-testkit/fixtures/ping/client.tsx index f2e3085222..d828a153ff 100644 --- a/packages/extension-testkit/fixtures/ping/client.tsx +++ b/packages/extension-testkit/fixtures/ping/client.tsx @@ -1,5 +1,6 @@ import {createSignal, onMount, Show, type JSX} from 'solid-js' import {defineExtension, getExtensionApi, makeExtRpcClient} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' import type {PingRouter} from './router.js' const PING_NAME = 'ping' @@ -11,6 +12,7 @@ function Component(): JSX.Element { const [pinged, setPinged] = createSignal(false) const [picked, setPicked] = createSignal(null) const [pong, setPong] = createSignal(null) + const [composerAction, setComposerAction] = createSignal(null) const rpc = (): ReturnType> => makeExtRpcClient(apiBase(), PING_NAME) const callPing = async (value: string): Promise => { const result = await rpc().ping({value}) @@ -32,6 +34,16 @@ function Component(): JSX.Element { + + setComposerAction('button')}> + + setComposerAction('insert')} /> + setComposerAction('clear')} /> + + +

Composer action: {composerAction()}

+

Pinged

diff --git a/packages/extension-testkit/src/host/host-runtime.tsx b/packages/extension-testkit/src/host/host-runtime.tsx index 38d61cf536..5ab2210874 100644 --- a/packages/extension-testkit/src/host/host-runtime.tsx +++ b/packages/extension-testkit/src/host/host-runtime.tsx @@ -1,11 +1,17 @@ -import {createSignal, For, Show, type JSX} from 'solid-js' +import {createSignal, For, Show, splitProps, type JSX} from 'solid-js' import {Dynamic, render} from 'solid-js/web' import {z} from 'zod' import {makeRpcClient} from '@conciv/contract' import {collectAttachmentCards, type AnyExtension} from '@conciv/extension' import {HostApiProvider} from '@conciv/extension/host' import {MountedExtension, MountedSurface} from '@conciv/extension/client' -import {AttachmentByMime, AttachmentProvider, createDocumentAttachmentAdapter} from '@conciv/ui-kit-chat' +import { + AttachmentByMime, + AttachmentProvider, + ComposerActions, + ComposerActionsHost, + createDocumentAttachmentAdapter, +} from '@conciv/ui-kit-chat' import {Dialog, Popover} from '@conciv/ui-kit-system' import {makeHostGrab} from './grab.js' import {FixtureElement} from './fixture-element.js' @@ -43,6 +49,46 @@ function MountedViews(props: {extension: AnyExtension; clientValue: object}): JS ) } +const COMPOSER_WIDTH_DEFAULT_PX = 800 +const COMPOSER_WIDTH_MIN_PX = 80 +const COMPOSER_WIDTH_MAX_PX = 1600 + +function MountedComposerSlot(props: {extension: AnyExtension; clientValue: object}): JSX.Element { + const [local] = splitProps(props, ['extension', 'clientValue']) + const [width, setWidth] = createSignal(COMPOSER_WIDTH_DEFAULT_PX) + const applyWidth = (value: string): void => { + const parsed = Number.parseInt(value, 10) + if (Number.isNaN(parsed)) return + setWidth(Math.min(COMPOSER_WIDTH_MAX_PX, Math.max(COMPOSER_WIDTH_MIN_PX, parsed))) + } + return ( +
+ +
+ + + + + + + +
+
+ ) +} + function metaContent(name: string): string { return document.querySelector(`meta[name="${name}"]`)?.content ?? '' } @@ -156,7 +202,7 @@ export function startHost(extension: AnyExtension): void { viewLock={() => {}} viewLeave={() => {}} > - + diff --git a/packages/extension-testkit/test/composer-actions.it.test.ts b/packages/extension-testkit/test/composer-actions.it.test.ts new file mode 100644 index 0000000000..3baaa6ede0 --- /dev/null +++ b/packages/extension-testkit/test/composer-actions.it.test.ts @@ -0,0 +1,35 @@ +import {fileURLToPath} from 'node:url' +import {test} from 'vitest' +import {expect} from '@playwright/test' +import pingServer from '../fixtures/ping/server.js' +import {fixtureHost, getExtensionTestApi} from '../src/get-extension-test-api.js' + +const hostDist = fileURLToPath(new URL('../dist/test-host', import.meta.url)) + +test('collapses a composer-slot extension action into the shared overflow menu when the row narrows', async () => { + const api = await getExtensionTestApi({server: pingServer, host: fixtureHost(hostDist)}) + const composerButton = api.page.getByRole('button', {name: 'Echo from the composer'}) + const overflowTrigger = api.page.getByRole('button', {name: 'More composer actions'}) + try { + await expect(composerButton).toBeVisible() + await expect(overflowTrigger).toHaveCount(0) + + await api.page.getByLabel('Composer row width').fill('100') + + await expect(composerButton).toHaveCount(0) + await expect(overflowTrigger).toBeVisible() + + await overflowTrigger.click() + await expect(api.page.getByRole('menuitem', {name: 'Insert an echo'})).toBeVisible() + await expect(api.page.getByRole('menuitem', {name: 'Clear the echo'})).toBeVisible() + + await api.page.getByRole('menuitem', {name: 'Insert an echo'}).click() + await expect(api.page.getByText('Composer action: insert')).toBeVisible() + + await overflowTrigger.click() + await api.page.getByRole('menuitem', {name: 'Clear the echo'}).click() + await expect(api.page.getByText('Composer action: clear')).toBeVisible() + } finally { + await api.dispose() + } +}) diff --git a/packages/extension-testkit/uno.config.ts b/packages/extension-testkit/uno.config.ts new file mode 100644 index 0000000000..d2e077f335 --- /dev/null +++ b/packages/extension-testkit/uno.config.ts @@ -0,0 +1,7 @@ +import {presetConciv} from '@conciv/uno-preset' +import {defineConfig} from 'unocss' + +export default defineConfig({ + content: {filesystem: ['src/**/*.{ts,tsx}', 'fixtures/**/*.{ts,tsx}']}, + presets: [presetConciv()], +}) diff --git a/packages/extension/src/catalog.ts b/packages/extension/src/catalog.ts index 7fb6a2ad4e..ed534c3b03 100644 --- a/packages/extension/src/catalog.ts +++ b/packages/extension/src/catalog.ts @@ -3,7 +3,11 @@ import {TOKENS} from '@conciv/ui-kit-system/tokens' const SLOTS = [ {name: 'header', description: 'Above the message list (panel header region).'}, {name: 'footer', description: 'Below the composer (panel footer region).'}, - {name: 'composer', description: 'Inside the input toolbar: add buttons or actions.'}, + { + name: 'composer', + description: + 'Inside the input toolbar: declare actions with ComposerActions.ActionButton from @conciv/ui-kit-chat so they collapse into the shared overflow menu when the row runs out of room. That import needs @conciv/ui-kit-chat as a package.json dependency: add it (matching the version range already pinned for @conciv/extension, since @conciv/* releases in lockstep) if the project does not list it yet.', + }, {name: 'empty', description: 'The empty chat state (greeting + starters) shown before any messages.'}, {name: 'status', description: 'A status line region.'}, {name: 'widget', description: 'A free-form panel widget region.'}, @@ -101,6 +105,7 @@ export default defineExtension({ }) `, 'composer-action': (name) => `import {defineExtension} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' const extension = defineExtension({name: '${name}', Component}) @@ -111,9 +116,18 @@ function Component() { const insert = extension.useContext((context) => context.insert) if (slot() !== 'composer') return null return ( - + insert('…')}> + + ) } `, @@ -155,6 +169,7 @@ function Component() { `, full: (name) => `import {z} from 'zod' import {defineExtension, defineTool} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' const ${name}Do = defineTool({ name: '${name}_do', @@ -180,9 +195,18 @@ function Component() { if (slot() === 'status') return ${name} ready if (slot() === 'composer') return ( - + insert('hello from ${name}')}> + + ) return null } diff --git a/packages/extension/test/catalog.test.ts b/packages/extension/test/catalog.test.ts index c561b537e0..81c6b2e7cf 100644 --- a/packages/extension/test/catalog.test.ts +++ b/packages/extension/test/catalog.test.ts @@ -38,6 +38,27 @@ describe('extension catalog (new contract projection)', () => { expect(src).toContain('useSlot') }) + it('describes the composer slot through the ComposerActions primitives', () => { + const composer = buildCatalog().slots.find((slot) => slot.name === 'composer') + expect(composer?.description).toContain('ComposerActions') + expect(composer?.description).toContain('@conciv/ui-kit-chat') + }) + + it('warns the authoring agent that @conciv/ui-kit-chat needs a package.json dependency', () => { + const composer = buildCatalog().slots.find((slot) => slot.name === 'composer') + expect(composer?.description).toContain('package.json') + expect(composer?.description).toMatch(/dependency|dependencies/) + }) + + it('scaffolds composer buttons through the ComposerActions primitives, never a raw button', () => { + for (const kind of ['composer-action', 'full'] as ScaffoldKind[]) { + const src = scaffold(kind, {name: 'demo'}) + expect(src).toContain("import {ComposerActions} from '@conciv/ui-kit-chat'") + expect(src).toContain(' { for (const kind of ['theme', 'composer-action', 'tool', 'tool-renderer', 'component', 'full'] as ScaffoldKind[]) { const src = scaffold(kind, {name: 'demo'}) diff --git a/packages/extensions/tanstack/src/client.tsx b/packages/extensions/tanstack/src/client.tsx index 0e3ae6c0cd..a94f23ca42 100644 --- a/packages/extensions/tanstack/src/client.tsx +++ b/packages/extensions/tanstack/src/client.tsx @@ -1,5 +1,6 @@ import {Show, type JSX} from 'solid-js' import {defineExtension, getExtensionApi} from '@conciv/extension' +import {ComposerActions} from '@conciv/ui-kit-chat' import {InspectorChip} from './client/inspector-chip.js' import {tanstackVerbTools} from './client/verbs.js' import {installRuntimeErrorListeners} from './client/error-ring.js' @@ -26,7 +27,9 @@ function Component(): JSX.Element { const slot = getExtensionApi(TANSTACK_NAME).useSlot() return ( - + + + ) } diff --git a/packages/extensions/tanstack/src/client/inspector-chip.tsx b/packages/extensions/tanstack/src/client/inspector-chip.tsx index 697ffcd7d9..6634bd7975 100644 --- a/packages/extensions/tanstack/src/client/inspector-chip.tsx +++ b/packages/extensions/tanstack/src/client/inspector-chip.tsx @@ -1,7 +1,7 @@ import type {JSX} from 'solid-js' -import Waypoints from 'lucide-solid/icons/waypoints' import {Tooltip} from '@conciv/ui-kit-system' import {CONCIV_TANSTACK_CLIENT_LABEL} from '../client-sentinel.js' +import {TanStackLogo} from './tanstack-logo.js' export function InspectorChip(): JSX.Element { return ( @@ -14,7 +14,7 @@ export function InspectorChip(): JSX.Element { aria-label={CONCIV_TANSTACK_CLIENT_LABEL} class="text-pw-text-2 inline-flex shrink-0 size-8.5 items-center justify-center" > -
+ + ) +} + +function OverflowDismissal(props: {collapsed: () => boolean; onDismissed: () => void}): JSX.Element { + const [local] = splitProps(props, ['collapsed', 'onDismissed']) + onCleanup(() => { + if (untrack(local.collapsed)) return + local.onDismissed() + }) + return null +} + +function OverflowGroup(props: {action: RegisteredAction}): JSX.Element { + const [local] = splitProps(props, ['action']) + return ( + + {(entry) => ( + entry.onSelect()}> + {entry.icon()} + {entry.label()} + + )} + + ) +} + +export type ComposerActionsSlotProps = {children: JSX.Element} + +function createSlot(slot: SlotName) { + return function ComposerActionsSlot(props: ComposerActionsSlotProps): JSX.Element { + const coordinator = useContext(CoordinatorContext) + if (coordinator === undefined) return null + const [local] = splitProps(props, ['children']) + coordinator.registerSlot({slot, render: () => local.children}) + return null + } +} + +const Leading = createSlot('leading') +const Trailing = createSlot('trailing') +const Trigger = createSlot('trigger') + +export type ComposerActionsActionProps = { + priority?: number + visible?: 'auto' | 'always' + disabled?: () => boolean + children: JSX.Element +} + +function Action(props: ComposerActionsActionProps): JSX.Element { + const coordinator = useContext(CoordinatorContext) + if (coordinator === undefined) return null + const [local] = splitProps(props, ['priority', 'visible', 'disabled', 'children']) + const disabled = (): boolean => local.disabled?.() === true + const paired = coordinator.registerPaired({ + priority: () => local.priority ?? 0, + pinned: () => local.visible === 'always', + disabled, + }) + const pairing: ActionPairing = { + disabled, + inline: paired.isInline, + claimInline: paired.claimInline, + registerMenuEntry: paired.registerMenuEntry, + } + return {local.children} +} + +export type ComposerActionsActionButtonProps = { + priority?: number + visible?: 'auto' | 'always' + tooltip: string + onClick: () => void + disabled?: () => boolean + busy?: boolean + class?: string + variant?: 'ghost' | 'solid' + children: JSX.Element +} + +function ActionButton(props: ComposerActionsActionButtonProps): JSX.Element { + const [local] = splitProps(props, [ + 'priority', + 'visible', + 'tooltip', + 'onClick', + 'disabled', + 'busy', + 'class', + 'variant', + 'children', + ]) + const pairing = useContext(PairingContext) + const disabled = (): boolean => pairing?.disabled() === true || local.disabled?.() === true + const entries: ActionMenuEntry[] = [ + {key: createUniqueId(), label: () => local.tooltip, icon: () => local.children, onSelect: () => local.onClick()}, + ] + const inline = usePlacement({ + priority: () => local.priority ?? 0, + pinned: () => local.visible === 'always', + disabled, + inlineContent: () => true, + menuContent: () => entries, + }) + return ( + + local.onClick()} + > + {local.children} + + + ) +} + +export type ComposerActionsActionMenuItemProps = { + label: string + onSelect: () => void + children?: JSX.Element +} + +function ActionMenuItem(props: ComposerActionsActionMenuItemProps): JSX.Element { + const pairing = useContext(PairingContext) + if (pairing === undefined) return null + const [local] = splitProps(props, ['label', 'onSelect', 'children']) + pairing.registerMenuEntry({ + key: createUniqueId(), + label: () => local.label, + icon: () => local.children, + onSelect: () => local.onSelect(), + }) + return null +} + +export type ComposerActionsInlineProps = { + priority?: number + visible?: 'auto' | 'always' + children: JSX.Element +} + +function Inline(props: ComposerActionsInlineProps): JSX.Element { + const [local] = splitProps(props, ['priority', 'visible', 'children']) + const inline = usePlacement({ + priority: () => local.priority ?? 0, + pinned: () => local.visible === 'always', + disabled: () => false, + inlineContent: () => true, + menuContent: () => NO_MENU_CONTENT, + }) + return {local.children} +} + +export const ComposerActions = {Action, ActionButton, ActionMenuItem, Inline, Leading, Trailing, Trigger} diff --git a/packages/ui-kit-chat/src/primitives/composer/composer-handlers.tsx b/packages/ui-kit-chat/src/primitives/composer/composer-handlers.tsx index a4015179c8..2c956c946e 100644 --- a/packages/ui-kit-chat/src/primitives/composer/composer-handlers.tsx +++ b/packages/ui-kit-chat/src/primitives/composer/composer-handlers.tsx @@ -4,7 +4,6 @@ import type {MultimodalContent} from '@tanstack/ai-client' export type ComposerHandlers = { onSend?: (content: string | MultimodalContent) => void | Promise onSendError?: (error: unknown) => void - onRefresh?: () => void onCancel?: () => void onSteer?: () => void | Promise onSteerError?: (error: unknown) => void diff --git a/packages/ui-kit-chat/src/primitives/composer/composer.tsx b/packages/ui-kit-chat/src/primitives/composer/composer.tsx index 102200788d..422313bd6f 100644 --- a/packages/ui-kit-chat/src/primitives/composer/composer.tsx +++ b/packages/ui-kit-chat/src/primitives/composer/composer.tsx @@ -1,6 +1,5 @@ import { createEffect, - createMemo, createSignal, For, onMount, @@ -16,7 +15,6 @@ import type {MultimodalContent} from '@tanstack/ai-client' import {TextArea, type TextAreaProps} from '@conciv/ui-kit-system' import type {WebStorage} from '@conciv/storage-history' import {useChatContext, useComposer} from '../../store/chat-context.js' -import {chatBusy} from '../../store/chat-busy.js' import {readComposerDraft} from '../../behaviors/composer-draft-storage.js' import {useComposerDraftPersistence} from '../../behaviors/use-composer-draft.js' import {Primitive} from '../util/primitive.js' @@ -435,11 +433,11 @@ function Send(props: JSX.ButtonHTMLAttributes): JSX.Element { const [local, rest] = splitProps(props, ['disabled']) return ( + )} + /> + )} + diff --git a/packages/ui-kit-chat/src/styled/attachment-ui.stories.tsx b/packages/ui-kit-chat/src/styled/attachment-ui.stories.tsx index 5fe20ae602..482abde43e 100644 --- a/packages/ui-kit-chat/src/styled/attachment-ui.stories.tsx +++ b/packages/ui-kit-chat/src/styled/attachment-ui.stories.tsx @@ -74,6 +74,9 @@ export const ImageAndFileTiles: Story = { await waitFor(() => expect(c.getByRole('img', {name: 'diagram.png'})).toBeVisible()) await expect(c.getByRole('button', {name: 'Remove diagram.png'})).toBeInTheDocument() + await userEvent.hover(c.getByRole('button', {name: 'Remove diagram.png'})) + await waitFor(() => expect(c.getByRole('tooltip')).toHaveTextContent('Remove diagram.png')) + await userEvent.click(c.getByRole('button', {name: 'Remove diagram.png'})) await waitFor(() => expect(c.queryByRole('img', {name: 'diagram.png'})).toBeNull()) await expect(c.getByRole('button', {name: 'Remove notes.pdf'})).toBeInTheDocument() diff --git a/packages/ui-kit-chat/src/styled/attachment-ui.tsx b/packages/ui-kit-chat/src/styled/attachment-ui.tsx index 4ea6a0b649..279275091f 100644 --- a/packages/ui-kit-chat/src/styled/attachment-ui.tsx +++ b/packages/ui-kit-chat/src/styled/attachment-ui.tsx @@ -1,7 +1,7 @@ import {onCleanup, Show, type JSX} from 'solid-js' import FileText from 'lucide-solid/icons/file-text' import X from 'lucide-solid/icons/x' -import {Tooltip} from '@conciv/ui-kit-system' +import {Tooltip, TooltipIconButtonSlot} from '@conciv/ui-kit-system' import {Attachment, useAttachment} from '../primitives/attachment/attachment.js' import {isCompleteAttachment, type AttachmentContentPart} from '../primitives/attachment/attachment-adapter.js' import {FOCUS, FOCUS_INSET} from './classes.js' @@ -9,7 +9,8 @@ import {FOCUS, FOCUS_INSET} from './classes.js' const TILE = 'relative size-14 overflow-hidden rounded-[var(--chat-radius-md)] [border:1px_solid_var(--chat-line)] [background:var(--chat-fill)] cursor-default anim-presence-in' -const REMOVE = `absolute end-0.5 top-0.5 inline-flex items-center justify-center size-6 rounded-[var(--chat-radius-pill)] [background:var(--chat-panel)] [color:var(--chat-text-2)] shadow-[var(--chat-shadow-lg)] cursor-pointer hover:[color:var(--chat-danger)] ${FOCUS}` +const REMOVE_WRAPPER = 'absolute end-0.5 top-0.5' +const REMOVE = `inline-flex items-center justify-center size-6 rounded-[var(--chat-radius-pill)] [background:var(--chat-panel)] [color:var(--chat-text-2)] shadow-[var(--chat-shadow-lg)] cursor-pointer hover:[color:var(--chat-danger)] ${FOCUS}` type AttachmentState = ReturnType type ImagePart = Extract @@ -69,9 +70,13 @@ export function AttachmentUI(props: {removable?: boolean}): JSX.Element { - - - + + {(buttonProps) => ( + + + + )} + diff --git a/packages/ui-kit-chat/src/styled/composer.stories.tsx b/packages/ui-kit-chat/src/styled/composer.stories.tsx index f74ec47599..d1e01d7e1d 100644 --- a/packages/ui-kit-chat/src/styled/composer.stories.tsx +++ b/packages/ui-kit-chat/src/styled/composer.stories.tsx @@ -38,6 +38,9 @@ export const Idle: Story = { const c = within(canvasElement) await expect(c.getByRole('button', {name: 'Send message'})).toBeVisible() await expect(c.queryByRole('button', {name: 'Stop generating'})).toBeNull() + + await userEvent.hover(c.getByRole('button', {name: 'Send message'})) + await waitFor(() => expect(c.getByRole('tooltip')).toHaveTextContent('Send message')) }, } @@ -46,6 +49,8 @@ export const StreamingAlwaysShowsStopAndQueuesOnEnter: Story = { play: async ({canvasElement}) => { const c = within(canvasElement) await waitFor(() => expect(c.getByRole('button', {name: 'Stop generating'})).toBeVisible()) + await userEvent.hover(c.getByRole('button', {name: 'Stop generating'})) + await waitFor(() => expect(c.getByRole('tooltip')).toHaveTextContent('Stop generating')) await userEvent.type(c.getByLabelText('Message'), 'queued follow-up') await expect(c.getByRole('button', {name: 'Stop generating'})).toBeVisible() await expect(c.queryByRole('button', {name: 'Send message'})).toBeNull() diff --git a/packages/ui-kit-chat/src/styled/composer.tsx b/packages/ui-kit-chat/src/styled/composer.tsx index 849f2f5b2c..52cf34282a 100644 --- a/packages/ui-kit-chat/src/styled/composer.tsx +++ b/packages/ui-kit-chat/src/styled/composer.tsx @@ -4,7 +4,7 @@ import ArrowUp from 'lucide-solid/icons/arrow-up' import Clock from 'lucide-solid/icons/clock' import Paperclip from 'lucide-solid/icons/paperclip' import Square from 'lucide-solid/icons/square' -import {Swap} from '@conciv/ui-kit-system' +import {Swap, TooltipIconButtonSlot} from '@conciv/ui-kit-system' import {Composer as ComposerPrimitive} from '../primitives/composer/composer.js' import {useComposerContext} from '../primitives/composer/composer-context.js' import {useComposerHandlers} from '../primitives/composer/composer-handlers.js' @@ -32,6 +32,9 @@ const SEND = `${BTN} [background:var(--chat-accent)] text-[color:var(--chat-on-a const CANCEL = `${BTN} [background:var(--chat-text-3)] [color:var(--chat-on-accent)] [&:hover]:[background:var(--chat-text-2)]` const INPUT = 'block max-h-30 px-2 pb-1 pt-2 [color:var(--chat-text)] text-[length:var(--chat-text-md)] leading-[1.45] placeholder:[color:var(--chat-text-3)]' +const ATTACHMENT_LABEL = 'Add an attachment' +const SEND_LABEL = 'Send message' +const STOP_LABEL = 'Stop generating' const QUEUE_ACTION = `${FOCUS} shrink-0 px-2 py-1 rounded-[var(--chat-radius-sm)] bg-transparent [border:none] cursor-pointer font-medium text-[length:var(--chat-text-md)] leading-[1.45] [transition:background-color_120ms_var(--chat-ease),color_120ms_var(--chat-ease),transform_100ms_var(--chat-ease)] hover:[background:var(--chat-fill-strong)] [&:active]:scale-[0.96]` function TrailingControls(): JSX.Element { @@ -42,26 +45,30 @@ function TrailingControls(): JSX.Element { const cancel = () => (handlers.onCancel ? handlers.onCancel() : composer.cancel()) const sendDisabled = () => context.sendingAttachments() || (!composer.canSend() && context.attachments().length === 0) return ( - + + {(buttonProps) => ( + + )} + ) } @@ -102,11 +109,16 @@ export function Composer(props: ComposerProps): JSX.Element { />
- - + + {(buttonProps) => ( + + + )} + {props.children}
diff --git a/packages/ui-kit-chat/src/styled/now-line.stories.tsx b/packages/ui-kit-chat/src/styled/now-line.stories.tsx index 1fe2c5e17d..4b2ee9b74a 100644 --- a/packages/ui-kit-chat/src/styled/now-line.stories.tsx +++ b/packages/ui-kit-chat/src/styled/now-line.stories.tsx @@ -1,6 +1,6 @@ import {type JSX} from 'solid-js' import type {Meta, StoryObj} from 'storybook-solidjs-vite' -import {expect, waitFor, within} from 'storybook/test' +import {expect, userEvent, waitFor, within} from 'storybook/test' import {NowLine} from './now-line.js' const meta: Meta = {title: 'ui-kit-chat/styled/NowLine'} @@ -17,6 +17,9 @@ export const Running: Story = { const c = within(canvasElement) await waitFor(() => expect(c.getByText('Running pnpm test')).toBeVisible()) await waitFor(() => expect(c.getByRole('button', {name: 'Stop'})).toBeVisible()) + + await userEvent.hover(c.getByRole('button', {name: 'Stop'})) + await waitFor(() => expect(c.getByRole('tooltip')).toHaveTextContent('Stop')) }, } diff --git a/packages/ui-kit-chat/src/styled/now-line.tsx b/packages/ui-kit-chat/src/styled/now-line.tsx index 6d2b1ac909..2f6fe1f58e 100644 --- a/packages/ui-kit-chat/src/styled/now-line.tsx +++ b/packages/ui-kit-chat/src/styled/now-line.tsx @@ -1,7 +1,11 @@ import {Show, type JSX} from 'solid-js' import Square from 'lucide-solid/icons/square' +import {TooltipIconButtonSlot} from '@conciv/ui-kit-system' import {FOCUS} from './classes.js' +const STOP_LABEL = 'Stop' +const STOP_BUTTON = `text-[color:var(--chat-text-2)] hover:text-[color:var(--chat-danger)] text-[length:var(--chat-text-xs)] rounded-[var(--chat-radius-sm)] inline-flex flex-none size-5.5 cursor-pointer [background:var(--chat-fill)] [border:1px_solid_var(--chat-line)] items-center justify-center hover:[background:var(--chat-fill-strong)] ${FOCUS}` + export function NowLine(props: {title: string; onStop?: () => void}): JSX.Element { return (
void}): JSX.Elemen /> {props.title} - + + {(buttonProps) => ( + + )} +
) diff --git a/packages/ui-kit-chat/test/composer-actions-core.test.ts b/packages/ui-kit-chat/test/composer-actions-core.test.ts new file mode 100644 index 0000000000..cdd58abeac --- /dev/null +++ b/packages/ui-kit-chat/test/composer-actions-core.test.ts @@ -0,0 +1,262 @@ +import {createRoot} from 'solid-js' +import {createStore} from 'solid-js/store' +import {expect, it} from 'vitest' +import { + createActionsCoordinator, + type ActionSource, + type RegionWidths, +} from '../src/primitives/composer/composer-actions-core.js' + +const WIDE_ROW_PX = 600 +const NARROW_ROW_PX = 120 + +function source(overrides: Partial): ActionSource { + return { + priority: () => 0, + pinned: () => false, + disabled: () => false, + inlineContent: () => true, + menuContent: () => [], + ...overrides, + } +} + +function buttonSource(label: string, priority: number, overrides: Partial = {}): ActionSource { + return source({ + priority: () => priority, + menuContent: () => [{key: label, label: () => label, icon: () => null, onSelect: () => undefined}], + ...overrides, + }) +} + +function menuEntry(label: string) { + return {key: label, label: () => label, icon: () => null, onSelect: () => undefined} +} + +function widthsOf(row: number): RegionWidths { + const [widths] = createStore({row, leading: 0, trailing: 0}) + return widths +} + +it('keeps every registered action inline when the row is wide', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX)}) + const first = coordinator.register(buttonSource('first', 30)) + const second = coordinator.register(buttonSource('second', 20)) + + expect(coordinator.isInline(first)).toBe(true) + expect(coordinator.isInline(second)).toBe(true) + expect(coordinator.anyCollapsed()).toBe(false) + dispose() + }) +}) + +it('drops an action out of the coordinator when its owner disposes', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX), maxInlineAuto: () => 0}) + coordinator.register(buttonSource('kept', 30)) + const disposeTransient = createRoot((disposeInner) => { + coordinator.register(buttonSource('transient', 20)) + return disposeInner + }) + + expect(coordinator.menuActions().map((action) => action.priority())).toEqual([30, 20]) + + disposeTransient() + + expect(coordinator.menuActions().map((action) => action.priority())).toEqual([30]) + dispose() + }) +}) + +it('orders overflow actions by priority regardless of registration order', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX), maxInlineAuto: () => 0}) + coordinator.register(buttonSource('low', 5)) + coordinator.register(buttonSource('high', 50)) + coordinator.register(buttonSource('middle', 20)) + + const labels = coordinator.menuActions().flatMap((action) => action.menuContent().map((item) => item.key)) + + expect(labels).toEqual(['high', 'middle', 'low']) + dispose() + }) +}) + +it('keeps pinned actions inline while every auto action collapses', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(NARROW_ROW_PX)}) + const pinned = coordinator.register(buttonSource('pinned', 40, {pinned: () => true})) + const auto = coordinator.register(buttonSource('auto', 30)) + + expect(coordinator.isInline(pinned)).toBe(true) + expect(coordinator.isInline(auto)).toBe(false) + expect(coordinator.anyCollapsed()).toBe(true) + dispose() + }) +}) + +it('caps how many auto actions stay inline even when the row has room', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX), maxInlineAuto: () => 1}) + const first = coordinator.register(buttonSource('first', 30)) + const second = coordinator.register(buttonSource('second', 20)) + + expect(coordinator.isInline(first)).toBe(true) + expect(coordinator.isInline(second)).toBe(false) + dispose() + }) +}) + +it('charges the leading and trailing regions against the fit budget', () => { + createRoot((dispose) => { + const [widths, setWidths] = createStore({row: 220, leading: 0, trailing: 0}) + const coordinator = createActionsCoordinator({widths}) + const first = coordinator.register(buttonSource('first', 30)) + const second = coordinator.register(buttonSource('second', 20)) + expect(coordinator.isInline(second)).toBe(true) + + setWidths({leading: 60, trailing: 60}) + + expect(coordinator.isInline(first)).toBe(true) + expect(coordinator.isInline(second)).toBe(false) + dispose() + }) +}) + +it('never lists an action without menu content in the overflow menu', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX), maxInlineAuto: () => 0}) + const inlineOnly = coordinator.register(source({priority: () => 10})) + + expect(coordinator.isInline(inlineOnly)).toBe(false) + expect(coordinator.menuActions()).toEqual([]) + expect(coordinator.anyCollapsed()).toBe(false) + dispose() + }) +}) + +it('keeps an action with no inline rendering out of the fit and always in the menu', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX)}) + const button = coordinator.register(buttonSource('button', 30)) + const menuOnly = coordinator.register( + source({ + priority: () => 10, + inlineContent: () => false, + menuContent: () => [menuEntry('only')], + }), + ) + + expect(coordinator.isInline(button)).toBe(true) + expect(coordinator.isInline(menuOnly)).toBe(false) + expect(coordinator.menuActions().map((action) => action.key)).toEqual([menuOnly]) + dispose() + }) +}) + +it('carries a paired action on its own claims and keeps every claim scoped to that action', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(NARROW_ROW_PX)}) + coordinator.register(buttonSource('pinned', 40, {pinned: () => true})) + const first = coordinator.registerPaired({priority: () => 30, pinned: () => false, disabled: () => false}) + const second = coordinator.registerPaired({priority: () => 20, pinned: () => false, disabled: () => false}) + first.registerMenuEntry(menuEntry('first one')) + first.registerMenuEntry(menuEntry('first two')) + second.registerMenuEntry(menuEntry('second one')) + + const menu = coordinator.menuActions().map((action) => action.menuContent().map((item) => item.key)) + + expect(menu).toEqual([['first one', 'first two'], ['second one']]) + expect(first.isInline()).toBe(false) + dispose() + }) +}) + +it('keeps a paired action out of the fit until one of its children claims inline rendering', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX), maxInlineAuto: () => 1}) + const claimed = coordinator.registerPaired({priority: () => 30, pinned: () => false, disabled: () => false}) + const unclaimed = coordinator.registerPaired({priority: () => 20, pinned: () => false, disabled: () => false}) + claimed.registerMenuEntry(menuEntry('claimed item')) + unclaimed.registerMenuEntry(menuEntry('unclaimed item')) + + expect(claimed.isInline()).toBe(false) + + claimed.claimInline() + + expect(claimed.isInline()).toBe(true) + expect(unclaimed.isInline()).toBe(false) + dispose() + }) +}) + +it('keeps a paired action inline while any of its two inline claims is still live', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX)}) + const paired = coordinator.registerPaired({priority: () => 30, pinned: () => false, disabled: () => false}) + paired.registerMenuEntry(menuEntry('paired item')) + + const disposeFirstClaim = createRoot((disposeInner) => { + paired.claimInline() + return disposeInner + }) + const disposeSecondClaim = createRoot((disposeInner) => { + paired.claimInline() + return disposeInner + }) + + expect(paired.isInline()).toBe(true) + + disposeFirstClaim() + + expect(paired.isInline()).toBe(true) + expect(coordinator.menuActions()).toEqual([]) + + disposeSecondClaim() + + expect(paired.isInline()).toBe(false) + expect(coordinator.menuActions().map((action) => action.menuContent().map((item) => item.key))).toEqual([ + ['paired item'], + ]) + dispose() + }) +}) + +it('lets the later slot registration override an earlier one for the same slot', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX)}) + coordinator.registerSlot({slot: 'trigger', render: () => 'first trigger'}) + const disposeSecond = createRoot((disposeInner) => { + coordinator.registerSlot({slot: 'trigger', render: () => 'second trigger'}) + return disposeInner + }) + + expect(coordinator.slotRender('trigger')?.()).toBe('second trigger') + + disposeSecond() + + expect(coordinator.slotRender('trigger')?.()).toBe('first trigger') + dispose() + }) +}) + +it('renders a registered slot through the coordinator and forgets it when its owner disposes', () => { + createRoot((dispose) => { + const coordinator = createActionsCoordinator({widths: widthsOf(WIDE_ROW_PX)}) + coordinator.registerSlot({slot: 'leading', render: () => 'leading content'}) + const disposeTrailing = createRoot((disposeInner) => { + coordinator.registerSlot({slot: 'trailing', render: () => 'trailing content'}) + return disposeInner + }) + + expect(coordinator.slotRender('leading')?.()).toBe('leading content') + expect(coordinator.slotRender('trailing')?.()).toBe('trailing content') + expect(coordinator.slotRender('trigger')).toBeUndefined() + + disposeTrailing() + + expect(coordinator.slotRender('trailing')).toBeUndefined() + dispose() + }) +}) diff --git a/packages/ui-kit-chat/test/composer-actions-fit.test.ts b/packages/ui-kit-chat/test/composer-actions-fit.test.ts new file mode 100644 index 0000000000..90f9ab04d0 --- /dev/null +++ b/packages/ui-kit-chat/test/composer-actions-fit.test.ts @@ -0,0 +1,53 @@ +import {describe, expect, it} from 'vitest' +import { + ACTION_SLOT_PX, + computeVisibleAutoCount, + FIT_HYSTERESIS_PX, + REGION_GAP_PX, +} from '../src/primitives/composer/composer-actions-fit.js' + +const base = { + slotWidth: ACTION_SLOT_PX, + regionGapPx: REGION_GAP_PX, + hysteresisPx: FIT_HYSTERESIS_PX, + leadingWidth: 34, + trailingWidth: 120, + pinnedCount: 1, + autoCount: 4, + previousCount: null, +} + +const used = (autoSlots: number): number => + base.leadingWidth + + base.trailingWidth + + 2 * REGION_GAP_PX + + ACTION_SLOT_PX + + base.pinnedCount * ACTION_SLOT_PX + + autoSlots * ACTION_SLOT_PX + +describe('computeVisibleAutoCount', () => { + it('shows every auto action when the budget covers them', () => { + expect(computeVisibleAutoCount({...base, rowWidth: used(4) + 40})).toBe(4) + }) + + it('clamps to the available whole slots', () => { + expect(computeVisibleAutoCount({...base, rowWidth: used(2) + 10})).toBe(2) + }) + + it('never returns a negative count', () => { + expect(computeVisibleAutoCount({...base, rowWidth: 100})).toBe(0) + }) + + it('never exceeds the registered auto count', () => { + expect(computeVisibleAutoCount({...base, rowWidth: 5000})).toBe(4) + }) + + it('shrinks immediately when the row narrows', () => { + expect(computeVisibleAutoCount({...base, rowWidth: used(1) + 2, previousCount: 4})).toBe(1) + }) + + it('expands only once the budget clears the hysteresis margin', () => { + expect(computeVisibleAutoCount({...base, rowWidth: used(2) + 4, previousCount: 1})).toBe(1) + expect(computeVisibleAutoCount({...base, rowWidth: used(2) + FIT_HYSTERESIS_PX, previousCount: 1})).toBe(2) + }) +}) diff --git a/packages/ui-kit-chat/test/composer-actions.browser.test.tsx b/packages/ui-kit-chat/test/composer-actions.browser.test.tsx new file mode 100644 index 0000000000..83a98a445c --- /dev/null +++ b/packages/ui-kit-chat/test/composer-actions.browser.test.tsx @@ -0,0 +1,432 @@ +import 'virtual:uno.css' +import {createSignal, For, Show, splitProps, type JSX} from 'solid-js' +import {range} from 'es-toolkit' +import {expect, it} from 'vitest' +import {page, userEvent} from 'vitest/browser' +import {ComposerActions, ComposerActionsHost} from '../src/primitives/composer/composer-actions.js' +import {mountView} from './mount-view.js' + +const WIDE_PX = 400 +const ONE_SLOT_PX = 170 +const NO_SLOT_PX = 100 +const LEADING_BUDGET_PX = 220 +const RACE_PX = 230 + +function Glyph(): JSX.Element { + return