Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
63c20ab
docs: composer actions collapse + refresh extraction design spec
omridevk Aug 16, 2026
b43894c
docs: constant-slot-width fit arithmetic in composer actions spec
omridevk Aug 16, 2026
686b5d1
docs: composer actions collapse implementation plan
omridevk Aug 16, 2026
d96f5a1
docs: fold codex + frontend review findings into composer actions plan
omridevk Aug 16, 2026
05c76f3
docs: composer actions live in ui-kit-chat; extension package untouch…
omridevk Aug 16, 2026
73df597
feat(ui-kit-chat): ComposerActions compound primitives with overflow …
omridevk Aug 16, 2026
72c7023
feat(ui-kit-chat): atomic width delivery + ComposerActions stories
omridevk Aug 16, 2026
e4c8fce
feat(conciv): collapse composer actions into overflow menu
omridevk Aug 16, 2026
dbebac5
feat(conciv): launch menu flattens into composer overflow
omridevk Aug 16, 2026
8736c3e
feat(extensions): author composer buttons through ComposerActions
omridevk Aug 16, 2026
d473006
feat(extension-testkit): host composer actions coordinator; migrate l…
omridevk Aug 16, 2026
414c5cd
feat(conciv): session refresh moves to pane chrome, out of the composer
omridevk Aug 16, 2026
38dbfca
chore: changeset for composer actions collapse
omridevk Aug 16, 2026
98fc429
fix(extension-compiler): node split strips Component/Surface/views so…
omridevk Aug 16, 2026
aa9cc45
Merge remote-tracking branch 'origin/main' into worktree-composer-act…
omridevk Aug 16, 2026
8e8c82f
feat(ui-kit-chat,conciv): cap inline composer auto actions, tooltip t…
omridevk Aug 16, 2026
73b2715
feat(conciv,ui-kit-chat,whiteboard): hover tooltips on every icon-onl…
omridevk Aug 16, 2026
7497cc7
refactor(ui-kit-chat): headless ComposerActions coordinator, single-d…
omridevk Aug 16, 2026
bbf2000
refactor(conciv): chat store owns pane context, refresh handle regist…
omridevk Aug 16, 2026
0e5ab79
refactor(conciv): chat store as session-keyed memo, redundant keyed b…
omridevk Aug 16, 2026
21a3584
refactor(ui-kit-chat,conciv): composer actions down to one registrati…
omridevk Aug 16, 2026
62d1af9
fix(ui-kit-chat,conciv,extension-compiler,extensions): review finding…
omridevk Aug 16, 2026
dd978d2
fix(ui-kit-chat,embed,e2e): stable slot renders end composer subtree …
omridevk Aug 17, 2026
41dcbb0
feat(extensions): tanstack inspector chip wears the official TanStack…
omridevk Aug 17, 2026
c218248
fix(extension,tools,extension-compiler): scaffold dependency contract…
omridevk Aug 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/composer-actions-collapse.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions apps/conciv/src/app/pane-context.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -18,6 +19,7 @@ export type PaneContextValue = {
grabProvider: GrabProvider | undefined
attachments: PendingAttachmentQueue
newSession: () => void
chat: Accessor<ChatSession>
}

export function makePendingAttachmentQueue(): PendingAttachmentQueue {
Expand Down
10 changes: 8 additions & 2 deletions apps/conciv/src/app/pane-provider.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand All @@ -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,
Expand All @@ -42,6 +47,7 @@ export function PaneProvider(props: {
}
void openNewSession()
},
chat,
}

return <PaneContext.Provider value={value}>{props.children}</PaneContext.Provider>
Expand Down
23 changes: 14 additions & 9 deletions apps/conciv/src/composer/actions.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -96,24 +96,29 @@ export function ComposerActions(props: {

return (
<>
<TooltipIconButton
<Action.ActionButton
priority={40}
visible="always"
disabled={grabDisabled}
tooltip={grabDisabled() ? 'Nothing on this screen to select' : 'Select an element from the page'}
busy={picking()}
class={busyClass(picking())}
disabled={grabDisabled()}
onClick={() => void pick()}
>
<Crosshair class="size-5 block" />
</TooltipIconButton>
<TooltipIconButton tooltip="Start a new session" class={ACT} onClick={() => props.onNewSession()}>
</Action.ActionButton>
<Action.ActionButton priority={30} tooltip="Start a new session" class={ACT} onClick={() => props.onNewSession()}>
<SquarePen class="size-5 block" />
</TooltipIconButton>
<TooltipIconButton
</Action.ActionButton>
<Action.ActionButton
priority={20}
disabled={() => props.compacting}
tooltip="Compress the conversation"
class={busyClass(props.compacting)}
onClick={() => props.onCompact()}
>
<FoldVertical class="size-5 block" />
</TooltipIconButton>
</Action.ActionButton>
<Show when={meta.data === undefined || meta.data.harness.canLaunch}>
<LaunchMenu
harnessName={harnessName()}
Expand Down
105 changes: 65 additions & 40 deletions apps/conciv/src/composer/launch-menu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Match, Switch, splitProps, type JSX} from 'solid-js'
import {Match, Show, Switch, splitProps, type JSX} from 'solid-js'
import {Menu, TooltipIconButtonSlot} from '@conciv/ui-kit-system'
import {ComposerActions as Action} from '@conciv/ui-kit-chat'
import ClipboardCopy from 'lucide-solid/icons/clipboard-copy'
import RotateCw from 'lucide-solid/icons/rotate-cw'
import SquareTerminal from 'lucide-solid/icons/square-terminal'
Expand All @@ -21,45 +22,69 @@ export function LaunchMenu(props: {
}): JSX.Element {
const [local] = splitProps(props, ['harnessName', 'class', 'pending', 'failed', 'onOpen', 'onCopy', 'onRetry'])
return (
<Menu.Root>
<TooltipIconButtonSlot tooltip={`Terminal options for ${local.harnessName}`} class={local.class}>
{(buttonProps) => (
<Menu.Trigger
asChild={(triggerProps) => (
<button
{...buttonProps()}
{...triggerProps()}
disabled={local.pending === true}
aria-busy={local.pending === true}
>
<SquareTerminal class="size-5 block" aria-hidden="true" />
</button>
<Action.Action priority={10} disabled={() => local.pending === true}>
<Action.Inline>
<Menu.Root>
<TooltipIconButtonSlot tooltip={`Terminal options for ${local.harnessName}`} class={local.class}>
{(buttonProps) => (
<Menu.Trigger
asChild={(triggerProps) => (
<button
{...buttonProps()}
{...triggerProps()}
disabled={local.pending === true}
aria-busy={local.pending === true}
>
<SquareTerminal class="size-5 block" aria-hidden="true" />
</button>
)}
/>
)}
/>
)}
</TooltipIconButtonSlot>
<Menu.Positioner>
<Menu.Content aria-label={`Terminal options for ${local.harnessName}`}>
<Switch>
<Match when={local.failed === true}>
<Menu.Item value="retry" onSelect={() => local.onRetry?.()}>
<RotateCw class="size-4 block" aria-hidden="true" />
{optionsUnavailable(local.harnessName)} — {RETRY_LABEL}
</Menu.Item>
</Match>
<Match when={true}>
<Menu.Item value="open" onSelect={() => local.onOpen()}>
<SquareTerminal class="size-4 block" aria-hidden="true" />
Open in {local.harnessName}
</Menu.Item>
<Menu.Item value="copy" onSelect={() => local.onCopy()}>
<ClipboardCopy class="size-4 block" aria-hidden="true" />
Copy command
</Menu.Item>
</Match>
</Switch>
</Menu.Content>
</Menu.Positioner>
</Menu.Root>
</TooltipIconButtonSlot>
<Menu.Positioner>
<Menu.Content aria-label={`Terminal options for ${local.harnessName}`}>
<Switch>
<Match when={local.failed === true}>
<Menu.Item value="retry" onSelect={() => local.onRetry?.()}>
<RotateCw class="size-4 block" aria-hidden="true" />
{optionsUnavailable(local.harnessName)}: {RETRY_LABEL}
</Menu.Item>
</Match>
<Match when={true}>
<Menu.Item value="open" onSelect={() => local.onOpen()}>
<SquareTerminal class="size-4 block" aria-hidden="true" />
Open in {local.harnessName}
</Menu.Item>
<Menu.Item value="copy" onSelect={() => local.onCopy()}>
<ClipboardCopy class="size-4 block" aria-hidden="true" />
Copy command
</Menu.Item>
</Match>
</Switch>
</Menu.Content>
</Menu.Positioner>
</Menu.Root>
</Action.Inline>
<Show
when={local.failed === true}
fallback={
<>
<Action.ActionMenuItem label={`Open in ${local.harnessName}`} onSelect={() => local.onOpen()}>
<SquareTerminal class="size-4 block" aria-hidden="true" />
</Action.ActionMenuItem>
<Action.ActionMenuItem label="Copy command" onSelect={() => local.onCopy()}>
<ClipboardCopy class="size-4 block" aria-hidden="true" />
</Action.ActionMenuItem>
</>
}
>
<Action.ActionMenuItem
label={`${optionsUnavailable(local.harnessName)}: ${RETRY_LABEL}`}
onSelect={() => local.onRetry?.()}
>
<RotateCw class="size-4 block" aria-hidden="true" />
</Action.ActionMenuItem>
</Show>
</Action.Action>
)
}
6 changes: 2 additions & 4 deletions apps/conciv/src/pane/chat-pane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
type JSX,
} from 'solid-js'
import {useQuery} from '@tanstack/solid-query'
import {useChatSession} from '@conciv/client'
import {
AttachmentByMime,
ChatProvider,
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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(),
}}
>
Expand Down Expand Up @@ -340,6 +338,7 @@ export function ChatPane(props: {sessionId: string}): JSX.Element {
initialSelection={storage().restoredSelection}
busy={compacting() ? <CompactSpinner /> : undefined}
triggers={triggerSources}
trailingExtras={<SessionModelSelector sessionId={sessionId} />}
>
<Suspense fallback={<ComposerActionsPending />}>
<ComposerActions
Expand All @@ -350,7 +349,6 @@ export function ChatPane(props: {sessionId: string}): JSX.Element {
onStageGrab={stageGrab}
/>
<ExtensionSurface name="composer" instances={instances} />
<SessionModelSelector sessionId={sessionId} />
<ComposerWiring
onReady={(api) => {
composerApi.current = api
Expand Down
Loading
Loading