@workerdeck/ui 3.0.1 → 3.1.0

package/src/components/agent/SessionFilters.tsx

@@ -0,0 +1,266 @@
+import { useMemo } from 'react'
+import type { ReactNode } from 'react'
+import { Filter, X } from 'lucide-react'
+import { STATE_LABELS, STATE_ORDER, adaptersOf, displayCustomized, facetFilterCount, projectsOf } from '@workerdeck/protocol'
+import type { GroupBy, SessionRow, SessionState, SortBy, StepDisplay, ViewConfig, WorkspaceScope } from '@workerdeck/protocol'
+import { Button } from '../ui/Button.tsx'
+import { Popover, PopoverContent, PopoverTrigger } from '../ui/Popover.tsx'
+import { OptionSelect, Select, SelectContent, SelectItem, SelectItemText, SelectTrigger, SelectValue } from '../ui/Select.tsx'
+import { cn } from '../../lib/utils.ts'
+
+export type SessionFiltersProps = {
+  config: ViewConfig
+  onConfigChange: (config: ViewConfig) => void
+  rows: readonly SessionRow[]
+  scope?: WorkspaceScope
+  gateways?: readonly { id: string; name: string }[]
+  className?: string
+}
+
+export const STEP_DISPLAY_OPTIONS: readonly { value: StepDisplay; label: string }[] = [
+  { value: 'all', label: 'All' },
+  { value: 'active', label: 'Active' },
+  { value: 'none', label: 'Hide' },
+]
+
+export function SessionFilters({ config, onConfigChange, rows, scope, gateways: gatewaysProp, className }: SessionFiltersProps) {
+  const adapters = useMemo(() => adaptersOf(rows), [rows])
+  const projects = useMemo(() => projectsOf(rows), [rows])
+  const gateways = useMemo(() => {
+    if (gatewaysProp) {
+      return gatewaysProp
+    }
+    const seen = new Map<string, string>()
+    for (const row of rows) {
+      seen.set(row.hostId, row.hostName)
+    }
+    return [...seen].map(([id, name]) => ({ id, name }))
+  }, [rows, gatewaysProp])
+
+  const set = (patch: Partial<ViewConfig>) => onConfigChange({ ...config, ...patch })
+
+  return (
+    <div data-slot="session-filters" className={cn('flex flex-col gap-3', className)}>
+      <Section title="Filter">
+        {scope ? (
+          <FilterRow label="Scope">
+            <OptionSelect
+              className="w-full min-w-0"
+              label="Scope"
+              value={config.scoped ? 'scoped' : 'all'}
+              options={[
+                { value: 'scoped', label: scope.label },
+                { value: 'all', label: 'All folders' },
+              ]}
+              onChange={(value) => set({ scoped: value === 'scoped' })}
+            />
+          </FilterRow>
+        ) : null}
+        <FilterRow label="State">
+          <FacetSelect
+            label="State"
+            value={config.states}
+            options={STATE_ORDER.map((s) => ({ value: s, label: STATE_LABELS[s] }))}
+            onChange={(states) => set({ states: states as SessionState[] })}
+          />
+        </FilterRow>
+        {adapters.length > 1 ? (
+          <FilterRow label="Engine">
+            <FacetSelect
+              label="Engine"
+              value={config.adapters}
+              options={adapters.map((a) => ({ value: a, label: a }))}
+              onChange={(next) => set({ adapters: next })}
+            />
+          </FilterRow>
+        ) : null}
+        {gateways.length > 1 ? (
+          <FilterRow label="Gateway">
+            <FacetSelect
+              label="Gateway"
+              value={config.gateways}
+              options={gateways.map((g) => ({ value: g.id, label: g.name }))}
+              onChange={(next) => set({ gateways: next })}
+            />
+          </FilterRow>
+        ) : null}
+        {projects.length > 1 ? (
+          <FilterRow label="Project">
+            <FacetSelect
+              label="Project"
+              value={config.projects ?? []}
+              options={projects.map((p) => ({ value: p.key, label: p.label }))}
+              onChange={(next) => set({ projects: next })}
+            />
+          </FilterRow>
+        ) : null}
+      </Section>
+
+      <Section title="Layout">
+        <FilterRow label="Group">
+          <OptionSelect
+            className="w-full min-w-0"
+            label="Group"
+            value={config.groupBy}
+            options={[
+              { value: 'none', label: 'No grouping' },
+              { value: 'state', label: 'By state' },
+              { value: 'adapter', label: 'By engine' },
+              ...(projects.length > 1 ? [{ value: 'project' as const, label: 'By project' }] : []),
+              ...(gateways.length > 1 ? [{ value: 'gateway' as const, label: 'By gateway' }] : []),
+            ]}
+            onChange={(groupBy) => set({ groupBy: groupBy as GroupBy })}
+          />
+        </FilterRow>
+        <FilterRow label="Sort">
+          <OptionSelect
+            className="w-full min-w-0"
+            label="Sort"
+            value={config.sortBy}
+            options={[
+              { value: 'recent', label: 'Recent' },
+              { value: 'name', label: 'Name' },
+              { value: 'state', label: 'State' },
+              ...(projects.length > 1 ? [{ value: 'project' as const, label: 'Project' }] : []),
+              ...(gateways.length > 1 ? [{ value: 'gateway' as const, label: 'Gateway' }] : []),
+            ]}
+            onChange={(sortBy) => set({ sortBy: sortBy as SortBy })}
+          />
+        </FilterRow>
+      </Section>
+
+      <Section title="Show under each session">
+        <FilterRow label="Agents">
+          <StepDisplayControl label="Agents" value={config.subagents} onChange={(subagents) => set({ subagents })} />
+        </FilterRow>
+        <FilterRow label="Shells">
+          <StepDisplayControl label="Shells" value={config.shells ?? 'active'} onChange={(shells) => set({ shells })} />
+        </FilterRow>
+        <FilterRow label="Tasks">
+          <StepDisplayControl label="Tasks" value={config.tasks ?? 'active'} onChange={(tasks) => set({ tasks })} />
+        </FilterRow>
+      </Section>
+    </div>
+  )
+}
+
+export type SessionFiltersButtonProps = SessionFiltersProps & {
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+export function SessionFiltersButton({ open, onOpenChange, className, ...props }: SessionFiltersButtonProps) {
+  const count = facetFilterCount(props.config)
+  const engaged = count > 0 || displayCustomized(props.config)
+  return (
+    <Popover open={open} onOpenChange={onOpenChange}>
+      <PopoverTrigger
+        render={
+          <Button
+            variant="ghost"
+            size="icon-sm"
+            aria-label={count > 0 ? `Filters (${count} active)` : 'Filters'}
+            title={count > 0 ? `${count} filter${count === 1 ? '' : 's'} active` : 'Filters'}
+            className={className}
+          >
+            <Filter className={cn('size-3.5', engaged && 'fill-current text-fg-1')} />
+          </Button>
+        }
+      />
+      <PopoverContent className="w-80">
+        <SessionFilters {...props} />
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export function StepDisplayControl({
+  label,
+  value,
+  onChange,
+}: {
+  label: string
+  value: StepDisplay
+  onChange: (value: StepDisplay) => void
+}) {
+  return (
+    <div role="radiogroup" aria-label={label} className="flex w-full rounded-md border border-border p-px">
+      {STEP_DISPLAY_OPTIONS.map((option) => (
+        <button
+          key={option.value}
+          type="button"
+          role="radio"
+          aria-checked={option.value === value}
+          onClick={() => onChange(option.value)}
+          className={cn(
+            'min-w-0 flex-1 truncate rounded-[4px] px-1.5 py-0.5 text-label outline-none transition-colors',
+            'focus-visible:ring-2 focus-visible:ring-ring',
+            option.value === value ? 'bg-row-selected text-fg-1' : 'text-fg-3 hover:bg-row-hover hover:text-fg-1',
+          )}
+        >
+          {option.label}
+        </button>
+      ))}
+    </div>
+  )
+}
+
+function Section({ title, children }: { title: string; children: ReactNode }) {
+  return (
+    <div className="flex flex-col gap-1.5">
+      <div className="text-label font-medium uppercase tracking-wide text-fg-4">{title}</div>
+      {children}
+    </div>
+  )
+}
+
+function FilterRow({ label, children }: { label: string; children: ReactNode }) {
+  return (
+    <div className="flex items-center gap-2">
+      <span aria-hidden className="w-16 shrink-0 truncate text-label text-fg-3">
+        {label}
+      </span>
+      <div className="min-w-0 flex-1">{children}</div>
+    </div>
+  )
+}
+
+function FacetSelect({
+  label,
+  value,
+  options,
+  onChange,
+}: {
+  label: string
+  value: string[]
+  options: { value: string; label: string }[]
+  onChange: (value: string[]) => void
+}) {
+  return (
+    <div className="flex items-center gap-1">
+      <Select multiple value={value} onValueChange={(v) => onChange(v as string[])}>
+        <SelectTrigger aria-label={label} className="min-w-0 flex-1">
+          <SelectValue>
+            {value.length === 0
+              ? 'All'
+              : value.length === 1
+                ? (options.find((o) => o.value === value[0])?.label ?? 'All')
+                : `${value.length} selected`}
+          </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+          {options.map((option) => (
+            <SelectItem key={option.value} value={option.value}>
+              <SelectItemText>{option.label}</SelectItemText>
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+      {value.length > 0 ? (
+        <Button variant="ghost" size="icon-sm" aria-label={`Clear ${label}`} onClick={() => onChange([])}>
+          <X className="size-3 text-fg-4" />
+        </Button>
+      ) : null}
+    </div>
+  )
+}

package/src/components/agent/SessionInfoDialog.tsx

@@ -1,7 +1,5 @@
-import { useEffect, useState } from 'react'
 import type { WorkerDeckClient } from '@workerdeck/client'
-import type { SessionFileInfo } from '@workerdeck/protocol'
-import type { TranscriptState } from '@workerdeck/react'
+import { useAsync, type TranscriptState } from '@workerdeck/react'
 import { Download } from 'lucide-react'
 import { CopyButton } from '../ui/CopyButton.tsx'
 import { Dialog, DialogBody, DialogContent, DialogHeader, DialogRow } from '../ui/Dialog.tsx'
@@ -17,46 +15,59 @@ export interface SessionInfoDialogProps {
   onOpenChange: (open: boolean) => void
 }
 
+export interface SessionInfoPanelProps {
+  state: TranscriptState
+  client: WorkerDeckClient
+  sessionId: string | undefined
+  active?: boolean
+}
+
 export function SessionInfoDialog({ state, client, sessionId, open, onOpenChange }: SessionInfoDialogProps) {
-  const session = state.session
-  const mode = state.permissionMode ? permissionModeMeta(state.permissionMode) : undefined
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent>
-        <DialogHeader title="Session info" description={session?.title} />
+        <DialogHeader title="Session info" description={state.session?.title} />
         <DialogBody>
-          <div className="flex flex-col divide-y divide-border">
-            <div className="pb-2">
-              <DialogRow label="Engine">{state.engine ?? 'claude'}</DialogRow>
-              {session?.profile ? <DialogRow label="Profile">{session.profile}</DialogRow> : null}
-              {state.model ? (
-                <DialogRow label="Model" mono>
-                  {state.model}
-                </DialogRow>
-              ) : null}
-              {mode ? <DialogRow label="Permission mode">{mode.label}</DialogRow> : null}
-              {session?.apiKeySource ? <DialogRow label="Credentials">{session.apiKeySource}</DialogRow> : null}
-            </div>
-            <div className="py-2">
-              {state.cwd ? <CopyRow label="Working directory" value={state.cwd} /> : null}
-              {state.sdkSessionId ? <CopyRow label="Engine session id" value={state.sdkSessionId} /> : null}
-              {session ? <CopyRow label="Gateway session id" value={session.id} /> : null}
-            </div>
-            <div className="py-2">
-              {session?.createdAt ? <DialogRow label="Started">{formatRelativeTime(session.createdAt)}</DialogRow> : null}
-              {session?.numTurns !== undefined ? <DialogRow label="Turns">{session.numTurns}</DialogRow> : null}
-              <DialogRow label="Cost" mono>
-                {formatCost(state.costUsd ?? (state.totalCostUsd || undefined))}
-              </DialogRow>
-            </div>
-            {state.capabilities.vfs ? <SessionFiles client={client} sessionId={sessionId} open={open} /> : null}
-          </div>
+          <SessionInfoPanel state={state} client={client} sessionId={sessionId} active={open} />
         </DialogBody>
       </DialogContent>
     </Dialog>
   )
 }
 
+export function SessionInfoPanel({ state, client, sessionId, active = true }: SessionInfoPanelProps) {
+  const session = state.session
+  const mode = state.permissionMode ? permissionModeMeta(state.permissionMode) : undefined
+  return (
+    <div className="flex flex-col divide-y divide-border">
+      <div className="pb-2">
+        <DialogRow label="Engine">{state.engine ?? 'claude'}</DialogRow>
+        {session?.profile ? <DialogRow label="Profile">{session.profile}</DialogRow> : null}
+        {state.model ? (
+          <DialogRow label="Model" mono>
+            {state.model}
+          </DialogRow>
+        ) : null}
+        {mode ? <DialogRow label="Permission mode">{mode.label}</DialogRow> : null}
+        {session?.apiKeySource ? <DialogRow label="Credentials">{session.apiKeySource}</DialogRow> : null}
+      </div>
+      <div className="py-2">
+        {state.cwd ? <CopyRow label="Working directory" value={state.cwd} /> : null}
+        {state.sdkSessionId ? <CopyRow label="Engine session id" value={state.sdkSessionId} /> : null}
+        {session ? <CopyRow label="Gateway session id" value={session.id} /> : null}
+      </div>
+      <div className="py-2">
+        {session?.createdAt ? <DialogRow label="Started">{formatRelativeTime(session.createdAt)}</DialogRow> : null}
+        {session?.numTurns !== undefined ? <DialogRow label="Turns">{session.numTurns}</DialogRow> : null}
+        <DialogRow label="Cost" mono>
+          {formatCost(state.costUsd ?? (state.totalCostUsd || undefined))}
+        </DialogRow>
+      </div>
+      {state.capabilities.vfs ? <SessionFiles client={client} sessionId={sessionId} active={active} /> : null}
+    </div>
+  )
+}
+
 function CopyRow({ label, value }: { label: string; value: string }) {
   return (
     <div className="flex items-start justify-between gap-2 py-1.5">
@@ -69,37 +80,10 @@ function CopyRow({ label, value }: { label: string; value: string }) {
   )
 }
 
-function SessionFiles({ client, sessionId, open }: { client: WorkerDeckClient; sessionId: string | undefined; open: boolean }) {
-  const [files, setFiles] = useState<SessionFileInfo[] | undefined>()
-  const [loading, setLoading] = useState(false)
-
-  useEffect(() => {
-    if (!open || !sessionId) {
-      return
-    }
-    let cancelled = false
-    setLoading(true)
-    client
-      .listSessionFiles(sessionId)
-      .then((list) => {
-        if (!cancelled) {
-          setFiles(list)
-        }
-      })
-      .catch(() => {
-        if (!cancelled) {
-          setFiles([])
-        }
-      })
-      .finally(() => {
-        if (!cancelled) {
-          setLoading(false)
-        }
-      })
-    return () => {
-      cancelled = true
-    }
-  }, [client, sessionId, open])
+function SessionFiles({ client, sessionId, active }: { client: WorkerDeckClient; sessionId: string | undefined; active: boolean }) {
+  const { data: files, loading } = useAsync(() => client.listSessionFiles(sessionId!), [client, sessionId], {
+    enabled: active && !!sessionId,
+  })
 
   return (
     <div className="pt-3">

package/src/components/agent/SessionItem.tsx

@@ -1,7 +1,7 @@
 import { Fragment, useEffect, useRef, useState } from 'react'
 import type { ReactNode } from 'react'
 import { projectLabel, projectName, projectSubpath, sessionLabel } from '@workerdeck/protocol'
-import type { SessionRow, SubagentDisplay } from '@workerdeck/protocol'
+import type { SessionRow, SessionTask, StepDisplay, SubagentDisplay } from '@workerdeck/protocol'
 import { ContextRing } from './ContextRing.tsx'
 import { EngineIcon, vendorMarkClass, vendorTextClass } from './EngineIcon.tsx'
 import { ProjectIcon } from './ProjectIcon.tsx'
@@ -21,8 +21,12 @@ export interface SessionItemProps {
   showProject?: boolean
   projectIcons?: Record<string, string>
   subagents?: SubagentDisplay
+  shells?: StepDisplay
+  tasks?: StepDisplay
   onSelect?: (modifiers: SelectModifiers) => void
   onSelectSubagent?: (toolUseId: string) => void
+  onSelectTask?: (task: SessionTask) => void
+  onStopTask?: (toolUseId: string) => void
   onSelectShell?: (shellId: string) => void
   onKillShell?: (shellId: string) => void
   onShellAgentWrite?: (shellId: string, enabled: boolean) => void
@@ -45,8 +49,12 @@ export function SessionItem({
   showProject = true,
   projectIcons,
   subagents = 'active',
+  shells = 'active',
+  tasks = 'active',
   onSelect,
   onSelectSubagent,
+  onSelectTask,
+  onStopTask,
   onSelectShell,
   onKillShell,
   onShellAgentWrite,
@@ -98,12 +106,24 @@ export function SessionItem({
   for (const extra of extras) {
     parts.push(<span key={extra}>{extra}</span>)
   }
-  const steps = sessionSteps(info, (toolUseId) => (onSelectSubagent ? onSelectSubagent(toolUseId) : onSelect?.(NO_MODIFIERS)), subagents, {
-    now: now ?? Date.now(),
-    onSelect: (shellId) => (onSelectShell ? onSelectShell(shellId) : onSelect?.(NO_MODIFIERS)),
-    onKill: onKillShell,
-    onAgentWrite: onShellAgentWrite,
-  })
+  const steps = sessionSteps(
+    info,
+    (toolUseId) => (onSelectSubagent ? onSelectSubagent(toolUseId) : onSelect?.(NO_MODIFIERS)),
+    subagents,
+    {
+      now: now ?? Date.now(),
+      show: shells,
+      onSelect: (shellId) => (onSelectShell ? onSelectShell(shellId) : onSelect?.(NO_MODIFIERS)),
+      onKill: onKillShell,
+      onAgentWrite: onShellAgentWrite,
+    },
+    {
+      show: tasks,
+      live: info.status === 'running' || info.status === 'starting' || info.status === 'awaiting_approval',
+      onSelect: (task) => (onSelectTask ? onSelectTask(task) : onSelect?.(NO_MODIFIERS)),
+      onStop: onStopTask,
+    },
+  )
   const holdsOpenStep = steps.some((s) => s.key === activeStepKey)
 
   return (