The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
[codex] Polish routine layout follow-ups (#7858)
Dottafae7e920a953
diff --git a/ui/src/components/EnvVarEditor.tsx b/ui/src/components/EnvVarEditor.tsxindex 08c7f58b29..faabf9db09 100644--- a/ui/src/components/EnvVarEditor.tsx+++ b/ui/src/components/EnvVarEditor.tsx@@ -1,11 +1,35 @@import { useEffect, useRef, useState } from "react";import type { CompanySecret, EnvBinding, SecretVersionSelector } from "@paperclipai/shared";-import { AlertCircle, X } from "lucide-react";+import { AlertCircle, KeyRound, X } from "lucide-react";import { cn } from "../lib/utils";+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/ui/select";const inputClass ="w-full rounded-md border border-border px-2.5 py-1.5 bg-transparent outline-none text-sm font-mono placeholder:text-muted-foreground/40";+// shadcn Select trigger sized to line up with the mono inputs above.+const selectTriggerClass =+ "h-[34px] min-h-[34px] rounded-md border-border bg-transparent px-2.5 text-sm font-mono shadow-none";++/** Radix Select forbids empty-string item values; use a sentinel for "unset". */+const SECRET_UNSET = "__unset__";++/** Suggest an env-var-style KEY from a secret name (UPPER_SNAKE). */+function envKeyFromSecretName(name: string): string {+ return name+ .trim()+ .toUpperCase()+ .replace(/[^A-Z0-9_]+/g, "_")+ .replace(/^_+|_+$/g, "")+ .slice(0, 64);+}+type Row = {key: string;source: "plain" | "secret";@@ -69,11 +93,17 @@ export function EnvVarEditor({secrets,onCreateSecret,onChange,+ recentlyUsedSecrets,}: {value: Record<string, EnvBinding>;secrets: CompanySecret[];onCreateSecret: (name: string, value: string) => Promise<CompanySecret>;onChange: (env: Record<string, EnvBinding> | undefined) => void;+ /**+ * Optional project-scoped secrets to surface as one-tap "quick bind" chips+ * below the editor (§3.4). Already-bound secrets are filtered out.+ */+ recentlyUsedSecrets?: CompanySecret[];}) {const [rows, setRows] = useState<Row[]>(() => toRows(value));const [sealError, setSealError] = useState<string | null>(null);@@ -140,6 +170,26 @@ export function EnvVarEditor({emit(next);}+ function bindRecentSecret(secret: CompanySecret) {+ // Fill the trailing empty row (or append one) with this secret bound.+ const next = rows.map((row) => ({ ...row }));+ const trailing = next[next.length - 1];+ let target: Row;+ if (trailing && !trailing.key && !trailing.plainValue && !trailing.secretId) {+ target = trailing;+ } else {+ target = emptyRow();+ next.push(target);+ }+ target.source = "secret";+ target.secretId = secret.id;+ target.version = "latest";+ if (!target.key) target.key = envKeyFromSecretName(secret.name);+ next.push(emptyRow());+ setRows(next);+ emit(next);+ }+function defaultSecretName(key: string) {return key.trim()@@ -185,62 +235,86 @@ export function EnvVarEditor({value={row.key}onChange={(event) => updateRow(index, { key: event.target.value })}/>- <select- className={cn(inputClass, "flex-[1] bg-background")}+ <Selectvalue={row.source}- onChange={(event) =>+ onValueChange={(next) =>updateRow(index, {- source: event.target.value === "secret" ? "secret" : "plain",- ...(event.target.value === "plain" ? { secretId: "" } : {}),+ source: next === "secret" ? "secret" : "plain",+ ...(next === "plain" ? { secretId: "" } : {}),})}>- <option value="plain">Plain</option>- <option value="secret">Secret</option>- </select>+ <SelectTrigger className={cn(selectTriggerClass, "flex-[1]")} aria-label="Binding mode">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="plain">Plain</SelectItem>+ <SelectItem value="secret">Secret</SelectItem>+ </SelectContent>+ </Select>{row.source === "secret" ? (<>- <select- className={cn(inputClass, "flex-[3] bg-background", row.secretId && !secrets.some((s) => s.id === row.secretId) && "border-destructive text-destructive")}- value={row.secretId}- onChange={(event) => updateRow(index, { secretId: event.target.value })}+ <Select+ value={row.secretId || SECRET_UNSET}+ onValueChange={(next) =>+ updateRow(index, { secretId: next === SECRET_UNSET ? "" : next })+ }>- <option value="">Select secret...</option>- {row.secretId && !secrets.some((s) => s.id === row.secretId) ? (- <option value={row.secretId}>Missing ({row.secretId.slice(0, 8)}…)</option>- ) : null}- {secrets.map((secret) => (- <option key={secret.id} value={secret.id}>- {secret.name}- {secret.status !== "active" ? ` (${secret.status})` : ""}- </option>- ))}- </select>- <select- className={cn(inputClass, "flex-[1] bg-background")}+ <SelectTrigger+ aria-label="Secret"+ className={cn(+ selectTriggerClass,+ "flex-[3]",+ row.secretId &&+ !secrets.some((s) => s.id === row.secretId) &&+ "border-destructive text-destructive",+ )}+ >+ <SelectValue placeholder="Select secret..." />+ </SelectTrigger>+ <SelectContent>+ {row.secretId && !secrets.some((s) => s.id === row.secretId) ? (+ <SelectItem value={row.secretId}>+ Missing ({row.secretId.slice(0, 8)}…)+ </SelectItem>+ ) : null}+ {secrets.map((secret) => (+ <SelectItem key={secret.id} value={secret.id}>+ {secret.name}+ {secret.status !== "active" ? ` (${secret.status})` : ""}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <Selectvalue={row.version === "latest" ? "latest" : String(row.version)}- onChange={(event) => {- const raw = event.target.value;- updateRow(index, { version: raw === "latest" ? "latest" : Number.parseInt(raw, 10) });- }}+ onValueChange={(raw) =>+ updateRow(index, {+ version: raw === "latest" ? "latest" : Number.parseInt(raw, 10),+ })+ }disabled={!row.secretId}- aria-label="Version">- <option value="latest">latest</option>- {(() => {- const selected = secrets.find((s) => s.id === row.secretId);- if (!selected) return null;- return Array.from({ length: Math.max(0, selected.latestVersion) }, (_, idx) => {- const version = selected.latestVersion - idx;- if (version <= 0) return null;- return (- <option key={version} value={version}>- v{version}- </option>- );- });- })()}- </select>+ <SelectTrigger className={cn(selectTriggerClass, "flex-[1]")} aria-label="Version">+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="latest">latest</SelectItem>+ {(() => {+ const selected = secrets.find((s) => s.id === row.secretId);+ if (!selected) return null;+ return Array.from({ length: Math.max(0, selected.latestVersion) }, (_, idx) => {+ const version = selected.latestVersion - idx;+ if (version <= 0) return null;+ return (+ <SelectItem key={version} value={String(version)}>+ v{version}+ </SelectItem>+ );+ });+ })()}+ </SelectContent>+ </Select><buttontype="button"className="inline-flex items-center rounded-md border border-border px-2 py-0.5 text-xs text-muted-foreground hover:bg-accent/50 transition-colors shrink-0"@@ -284,6 +358,34 @@ export function EnvVarEditor({</div>);})}+ {(() => {+ const boundIds = new Set(+ rows.filter((row) => row.source === "secret" && row.secretId).map((row) => row.secretId),+ );+ const quick = (recentlyUsedSecrets ?? [])+ .filter((secret) => secret.status === "active" && !boundIds.has(secret.id))+ .slice(0, 8);+ if (quick.length === 0) return null;+ return (+ <div className="flex flex-wrap items-center gap-1.5 pt-0.5">+ <span className="inline-flex items-center gap-1 text-[11px] text-muted-foreground/70">+ <KeyRound className="h-3 w-3" />+ Recently used:+ </span>+ {quick.map((secret) => (+ <button+ key={secret.id}+ type="button"+ onClick={() => bindRecentSecret(secret)}+ className="inline-flex items-center gap-1 rounded-full border border-border px-2 py-0.5 font-mono text-[11px] text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground"+ title={`Bind ${secret.name}`}+ >+ + {secret.name}+ </button>+ ))}+ </div>+ );+ })()}{sealError && <p className="text-[11px] text-destructive">{sealError}</p>}{(() => {const issues: { key: string; reason: string }[] = [];diff --git a/ui/src/components/RoutineList.tsx b/ui/src/components/RoutineList.tsxindex a4abe4cb9c..5c19bf524e 100644--- a/ui/src/components/RoutineList.tsx+++ b/ui/src/components/RoutineList.tsx@@ -63,6 +63,7 @@ export function RoutineListRow<TRoutine extends RoutineListRowItem>({disableRunNow = false,disableToggle = false,hideArchiveAction = false,+ divider = true,onRunNow,onToggleEnabled,onToggleArchived,@@ -80,6 +81,8 @@ export function RoutineListRow<TRoutine extends RoutineListRowItem>({disableRunNow?: boolean;disableToggle?: boolean;hideArchiveAction?: boolean;+ /** Render a bottom divider between consecutive rows. Off when the group is its own card. */+ divider?: boolean;onRunNow: (routine: TRoutine) => void;onToggleEnabled: (routine: TRoutine, enabled: boolean) => void;onToggleArchived?: (routine: TRoutine) => void;@@ -95,7 +98,9 @@ export function RoutineListRow<TRoutine extends RoutineListRowItem>({return (<Linkto={href}- className="group flex flex-col gap-3 border-b border-border px-3 py-3 transition-colors hover:bg-accent/50 last:border-b-0 sm:flex-row sm:items-center no-underline text-inherit"+ className={`group flex flex-col gap-3 px-3 py-3 transition-colors hover:bg-accent/50 sm:flex-row sm:items-center no-underline text-inherit${+ divider ? " border-b border-border last:border-b-0" : ""+ }`}><div className="min-w-0 flex-1 space-y-1.5"><div className="flex flex-wrap items-center gap-2">diff --git a/ui/src/components/RoutineSaveBar.test.tsx b/ui/src/components/RoutineSaveBar.test.tsxindex 7c387aaa3d..a5dd6ad2aa 100644--- a/ui/src/components/RoutineSaveBar.test.tsx+++ b/ui/src/components/RoutineSaveBar.test.tsx@@ -1,11 +1,16 @@// @vitest-environment jsdom-import { act } from "react";+import type React from "react";+import { flushSync } from "react-dom";import { createRoot } from "react-dom/client";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import { RoutineSaveBar } from "./RoutineSaveBar";import type { RoutineHistoryDirtyFieldDescriptor } from "./RoutineHistoryTab";+function act(callback: () => void) {+ flushSync(callback);+}+let container: HTMLDivElement;let root: ReturnType<typeof createRoot>;diff --git a/ui/src/components/RoutineSubSidebar.test.tsx b/ui/src/components/RoutineSubSidebar.test.tsxindex f0b029b798..2a028c88aa 100644--- a/ui/src/components/RoutineSubSidebar.test.tsx+++ b/ui/src/components/RoutineSubSidebar.test.tsx@@ -1,6 +1,7 @@// @vitest-environment jsdom-import { act, type AnchorHTMLAttributes, type ReactNode } from "react";+import type { AnchorHTMLAttributes, ReactNode } from "react";+import { flushSync } from "react-dom";import { createRoot } from "react-dom/client";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";@@ -22,6 +23,10 @@ vi.mock("@/lib/router", () => ({import { RoutineSubSidebar } from "./RoutineSubSidebar";import type { RoutineSectionKey } from "./routine-sections/context";+function act(callback: () => void) {+ flushSync(callback);+}+let container: HTMLDivElement;let root: ReturnType<typeof createRoot>;diff --git a/ui/src/components/RoutineSubSidebar.tsx b/ui/src/components/RoutineSubSidebar.tsxindex 1b8fc2cb7f..13da728f94 100644--- a/ui/src/components/RoutineSubSidebar.tsx+++ b/ui/src/components/RoutineSubSidebar.tsx@@ -110,7 +110,7 @@ export function RoutineSubSidebar({return (<navaria-label="Routine sections"- className="sticky top-14 hidden max-h-[calc(100dvh-3.5rem)] w-52 shrink-0 flex-col gap-4 self-start overflow-y-auto border-r border-border bg-sidebar/30 px-3 py-4 md:flex"+ className="sticky top-0 hidden max-h-[100dvh] w-52 shrink-0 flex-col gap-4 self-start overflow-y-auto border-r border-border bg-sidebar/30 px-3 py-4 md:flex">{NAV_GROUPS.map((group) => (<div key={group.label} className="flex flex-col gap-0.5">@@ -174,7 +174,7 @@ export function RoutineSectionPicker({isSectionDirty: (section: RoutineSectionKey) => boolean;}) {return (- <div className="sticky top-14 z-10 border-b border-border bg-background px-4 py-2 md:hidden">+ <div className="sticky top-0 z-10 border-b border-border bg-background px-4 py-2 md:hidden"><Selectvalue={activeSection}onValueChange={(value) => {diff --git a/ui/src/components/routine-sections/editable-sections.tsx b/ui/src/components/routine-sections/editable-sections.tsxindex c1cc6371a7..0ab2404061 100644--- a/ui/src/components/routine-sections/editable-sections.tsx+++ b/ui/src/components/routine-sections/editable-sections.tsx@@ -1,4 +1,4 @@-import { useMemo } from "react";+import { useMemo, useState } from "react";import {ArrowRight,Braces,@@ -6,6 +6,8 @@ import {Edit3,KeyRound,Play,+ Plus,+ X,} from "lucide-react";import { Card, CardContent } from "@/components/ui/card";import { Input } from "@/components/ui/input";@@ -20,6 +22,8 @@ import {SelectValue,} from "@/components/ui/select";import { RadioCardGroup } from "@/components/ui/radio-card";+import { cn } from "@/lib/utils";+import { nextCronFires, previewFirePolicies } from "../../lib/cron-fires";import { timeAgo } from "../../lib/timeAgo";import { EmptyState } from "../EmptyState";import { InlineEntitySelector } from "../InlineEntitySelector";@@ -30,7 +34,7 @@ import { RoutineVariablesEditor, RoutineVariablesHint } from "../RoutineVariableimport { RoutineTriggerCard } from "../RoutineTriggerCard";import { EnvVarEditor } from "../EnvVarEditor";import { useRoutineDetail } from "./context";-import type { EnvBinding } from "@paperclipai/shared";+import type { EnvBinding, RoutineDetail as RoutineDetailType } from "@paperclipai/shared";const concurrencyPolicyOptions = [{@@ -336,10 +340,39 @@ function SummaryCard({export function TriggersSection() {const ctx = useRoutineDetail();const { routine, newTrigger, setNewTrigger, createTrigger, updateTrigger, deleteTrigger, rotateTrigger } = ctx;+ const [addOpen, setAddOpen] = useState(false);return (<div className="space-y-4">- {/* Add trigger form */}+ {/* Add-trigger drawer header (§3.2) */}+ <div className="flex items-center justify-between">+ <p className="text-sm font-medium text-muted-foreground">+ {routine.triggers.length === 0+ ? "No triggers yet"+ : `${routine.triggers.length} trigger${routine.triggers.length === 1 ? "" : "s"}`}+ </p>+ <Button+ size="sm"+ variant={addOpen ? "secondary" : "default"}+ onClick={() => setAddOpen((open) => !open)}+ aria-expanded={addOpen}+ >+ {addOpen ? (+ <>+ <X className="mr-1.5 h-3.5 w-3.5" />+ Cancel+ </>+ ) : (+ <>+ <Plus className="mr-1.5 h-3.5 w-3.5" />+ New trigger+ </>+ )}+ </Button>+ </div>++ {/* Add trigger form — expand-on-click drawer */}+ {addOpen ? (<div className="space-y-3 rounded-lg border border-border p-4"><p className="text-sm font-medium">Add trigger</p><div className="grid gap-3 md:grid-cols-2">@@ -412,16 +445,29 @@ export function TriggersSection() {</>)}</div>- <div className="flex items-center justify-end">- <Button size="sm" onClick={() => createTrigger.mutate()} disabled={createTrigger.isPending}>+ <div className="flex items-center justify-end gap-2">+ <Button size="sm" variant="ghost" onClick={() => setAddOpen(false)}>+ Cancel+ </Button>+ <Button+ size="sm"+ onClick={() => createTrigger.mutate(undefined, { onSuccess: () => setAddOpen(false) })}+ disabled={createTrigger.isPending}+ >{createTrigger.isPending ? "Adding..." : "Add trigger"}</Button></div></div>+ ) : null}{/* Existing triggers */}{routine.triggers.length === 0 ? (- <EmptyState icon={Clock3} message="No triggers yet." />+ <EmptyState+ icon={Clock3}+ message="No triggers yet."+ action="Add a schedule"+ onAction={() => setAddOpen(true)}+ />) : (<div className="space-y-3">{routine.triggers.map((trigger) => (@@ -481,6 +527,21 @@ export function SecretsSection() {const ctx = useRoutineDetail();const { editDraft, setEditDraft, availableSecrets, createSecret, secretMessage, copySecretValue } = ctx;+ // Project/company-scoped secrets that already see real usage, surfaced as+ // quick-bind chips (§3.4). Ranked by reference count then recency.+ const recentlyUsedSecrets = useMemo(+ () =>+ [...availableSecrets]+ .filter((secret) => secret.status === "active")+ .sort((a, b) => {+ const refDelta = (b.referenceCount ?? 0) - (a.referenceCount ?? 0);+ if (refDelta !== 0) return refDelta;+ return new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime();+ })+ .slice(0, 8),+ [availableSecrets],+ );+return (<div className="space-y-4"><div className="rounded-md border border-border bg-muted/20 px-4 py-3 text-xs text-muted-foreground">@@ -520,6 +581,7 @@ export function SecretsSection() {<EnvVarEditorvalue={(editDraft.env ?? {}) as Record<string, EnvBinding>}secrets={availableSecrets}+ recentlyUsedSecrets={recentlyUsedSecrets}onCreateSecret={async (name, value) => createSecret.mutateAsync({ name, value })}onChange={(env) => setEditDraft((current) => ({ ...current, env: env ?? null }))}/>@@ -529,7 +591,7 @@ export function SecretsSection() {export function DeliverySection() {const ctx = useRoutineDetail();- const { editDraft, setEditDraft } = ctx;+ const { editDraft, setEditDraft, routine } = ctx;return (<div className="space-y-6">@@ -559,6 +621,102 @@ export function DeliverySection() {options={catchUpPolicyOptions}/></div>+ <NextFiresPreview+ triggers={routine.triggers}+ concurrencyPolicy={editDraft.concurrencyPolicy}+ />+ </div>+ );+}++const dispositionToneClass: Record<string, string> = {+ queued: "text-emerald-600 dark:text-emerald-400",+ coalesced: "text-amber-600 dark:text-amber-400",+ skipped: "text-muted-foreground",+};++/**+ * "Next 5 fires" preview (§3.5) — the strongest "what does this policy mean?"+ * surface. Picks the soonest-firing schedule trigger, computes its next fires+ * client-side, and annotates each with how the chosen concurrency policy would+ * treat it.+ */+function NextFiresPreview({+ triggers,+ concurrencyPolicy,+}: {+ triggers: RoutineDetailType["triggers"];+ concurrencyPolicy: string;+}) {+ const preview = useMemo(() => {+ const schedule = triggers+ .filter((trigger) => trigger.kind === "schedule" && trigger.enabled && trigger.cronExpression)+ .map((trigger) => {+ const fires = nextCronFires(trigger.cronExpression, 5, {+ timeZone: trigger.timezone ?? "UTC",+ });+ return { trigger, fires };+ })+ .filter((entry) => entry.fires.length > 0)+ .sort((a, b) => a.fires[0]!.getTime() - b.fires[0]!.getTime())[0];+ if (!schedule) return null;+ return {+ timeZone: schedule.trigger.timezone ?? "UTC",+ entries: previewFirePolicies(schedule.fires, concurrencyPolicy),+ };+ }, [triggers, concurrencyPolicy]);++ return (+ <div className="space-y-3">+ <p className="text-xs font-medium uppercase tracking-[0.18em] text-muted-foreground">+ Next 5 fires+ </p>+ {preview ? (+ <>+ <div className="space-y-1.5 rounded-lg border border-border p-3 font-mono text-xs">+ {preview.entries.map((entry, index) => (+ <div key={index} className="flex items-center gap-2">+ <span className="text-muted-foreground/40">·</span>+ <span className="tabular-nums">{formatFireTime(entry.at, preview.timeZone)}</span>+ <ArrowRight className="h-3 w-3 shrink-0 text-muted-foreground/50" />+ <span className={cn("font-medium", dispositionToneClass[entry.disposition])}>+ {entry.label}+ </span>+ {entry.note ? (+ <span className="truncate text-muted-foreground/60">({entry.note})</span>+ ) : null}+ </div>+ ))}+ </div>+ <p className="text-[11px] text-muted-foreground/60">+ Preview assumes the previous run is still in flight when the next fires. Times shown in{" "}+ {preview.timeZone}.+ </p>+ </>+ ) : (+ <p className="rounded-lg border border-dashed border-border p-3 text-xs text-muted-foreground">+ No enabled schedule trigger to preview. Add a schedule in Triggers to see how this policy+ treats upcoming fires.+ </p>+ )}</div>);}++function formatFireTime(date: Date, timeZone: string): string {+ try {+ return new Intl.DateTimeFormat(undefined, {+ timeZone,+ year: "numeric",+ month: "2-digit",+ day: "2-digit",+ hour: "2-digit",+ minute: "2-digit",+ hourCycle: "h23",+ })+ .format(date)+ .replace(",", "");+ } catch {+ return date.toISOString();+ }+}diff --git a/ui/src/components/routine-sections/operate-sections.tsx b/ui/src/components/routine-sections/operate-sections.tsxindex 2edd4fb4b9..0bf55441a9 100644--- a/ui/src/components/routine-sections/operate-sections.tsx+++ b/ui/src/components/routine-sections/operate-sections.tsx@@ -1,24 +1,90 @@-import { useMemo } from "react";-import { Activity as ActivityIcon, Play } from "lucide-react";-import { Link } from "@/lib/router";+import { useMemo, useState } from "react";+import { Activity as ActivityIcon, Play, SlidersHorizontal } from "lucide-react";import { Badge } from "@/components/ui/badge";+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/ui/select";import { timeAgo } from "../../lib/timeAgo";+import { runRowSubtitle, dedupedTriggerLabel } from "../../lib/routine-run-display";import { EmptyState } from "../EmptyState";+import { EntityRow } from "../EntityRow";+import { FilterBar, type FilterValue } from "../FilterBar";import { LiveRunWidget } from "../LiveRunWidget";import { RoutineHistoryTab } from "../RoutineHistoryTab";import { RoutineActivityRow } from "../RoutineActivityRow";import { useRoutineDetail } from "./context";+const DATE_WINDOW_OPTIONS: { value: string; label: string; ms: number | null }[] = [+ { value: "any", label: "Any time", ms: null },+ { value: "24h", label: "Last 24h", ms: 24 * 60 * 60 * 1000 },+ { value: "7d", label: "Last 7d", ms: 7 * 24 * 60 * 60 * 1000 },+ { value: "30d", label: "Last 30d", ms: 30 * 24 * 60 * 60 * 1000 },+];+export function RunsSection() {const ctx = useRoutineDetail();const { routine, routineRuns, hasLiveRun, activeIssueId, onOpenRunDialog } = ctx;- const runs = routineRuns ?? [];+ const runs = useMemo(() => routineRuns ?? [], [routineRuns]);++ const [sourceFilter, setSourceFilter] = useState("any");+ const [statusFilter, setStatusFilter] = useState("any");+ const [dateFilter, setDateFilter] = useState("any");++ const sourceOptions = useMemo(+ () => [...new Set(runs.map((run) => run.source))].sort(),+ [runs],+ );+ const statusOptions = useMemo(+ () => [...new Set(runs.map((run) => run.status))].sort(),+ [runs],+ );++ const filtered = useMemo(() => {+ const windowMs = DATE_WINDOW_OPTIONS.find((option) => option.value === dateFilter)?.ms ?? null;+ const cutoff = windowMs == null ? null : Date.now() - windowMs;+ return runs.filter((run) => {+ if (sourceFilter !== "any" && run.source !== sourceFilter) return false;+ if (statusFilter !== "any" && run.status !== statusFilter) return false;+ if (cutoff != null && new Date(run.triggeredAt).getTime() < cutoff) return false;+ return true;+ });+ }, [runs, sourceFilter, statusFilter, dateFilter]);++ const activeFilters = useMemo<FilterValue[]>(() => {+ const list: FilterValue[] = [];+ if (sourceFilter !== "any") list.push({ key: "source", label: "Source", value: sourceFilter });+ if (statusFilter !== "any") {+ list.push({ key: "status", label: "Status", value: statusFilter.replaceAll("_", " ") });+ }+ if (dateFilter !== "any") {+ const label = DATE_WINDOW_OPTIONS.find((option) => option.value === dateFilter)?.label ?? dateFilter;+ list.push({ key: "date", label: "Date", value: label });+ }+ return list;+ }, [sourceFilter, statusFilter, dateFilter]);++ function clearFilters() {+ setSourceFilter("any");+ setStatusFilter("any");+ setDateFilter("any");+ }++ function removeFilter(key: string) {+ if (key === "source") setSourceFilter("any");+ if (key === "status") setStatusFilter("any");+ if (key === "date") setDateFilter("any");+ }return (<div className="space-y-4">{hasLiveRun && activeIssueId ? (<LiveRunWidget issueId={activeIssueId} companyId={routine.companyId} />) : null}+{runs.length === 0 ? (<EmptyStateicon={Play}@@ -27,39 +93,105 @@ export function RunsSection() {onAction={onOpenRunDialog}/>) : (- <div className="divide-y divide-border rounded-lg border border-border">- {runs.map((run) => (- <div key={run.id} className="flex items-center justify-between px-3 py-2 text-sm">- <div className="flex min-w-0 items-center gap-2">- <Badge variant="outline" className="shrink-0">- {run.source}- </Badge>- <Badge- variant={run.status === "failed" ? "destructive" : "secondary"}- className="shrink-0"- >- {run.status.replaceAll("_", " ")}- </Badge>- {run.trigger ? (- <span className="truncate text-muted-foreground">- {run.trigger.label ?? run.trigger.kind}- </span>- ) : null}- {run.linkedIssue ? (- <Link- to={`/issues/${run.linkedIssue.identifier ?? run.linkedIssue.id}`}- className="truncate text-muted-foreground hover:underline"- >- {run.linkedIssue.identifier ?? run.linkedIssue.id.slice(0, 8)}- </Link>- ) : null}- </div>- <span className="ml-2 shrink-0 text-xs text-muted-foreground">- {timeAgo(run.triggeredAt)}- </span>+ <>+ {/* Filter chips row (§3.6) */}+ <div className="space-y-2">+ <div className="flex flex-wrap items-center gap-2">+ <Select value={sourceFilter} onValueChange={setSourceFilter}>+ <SelectTrigger size="sm" className="h-8 w-auto gap-1.5 text-xs" aria-label="Filter by source">+ <span className="text-muted-foreground">Source:</span>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="any">any</SelectItem>+ {sourceOptions.map((source) => (+ <SelectItem key={source} value={source}>+ {source}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <Select value={statusFilter} onValueChange={setStatusFilter}>+ <SelectTrigger size="sm" className="h-8 w-auto gap-1.5 text-xs" aria-label="Filter by status">+ <span className="text-muted-foreground">Status:</span>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="any">any</SelectItem>+ {statusOptions.map((status) => (+ <SelectItem key={status} value={status}>+ {status.replaceAll("_", " ")}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ <Select value={dateFilter} onValueChange={setDateFilter}>+ <SelectTrigger size="sm" className="h-8 w-auto gap-1.5 text-xs" aria-label="Filter by date">+ <span className="text-muted-foreground">Date:</span>+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ {DATE_WINDOW_OPTIONS.map((option) => (+ <SelectItem key={option.value} value={option.value}>+ {option.label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select></div>- ))}- </div>+ <FilterBar filters={activeFilters} onRemove={removeFilter} onClear={clearFilters} />+ </div>++ {filtered.length === 0 ? (+ <EmptyState+ icon={SlidersHorizontal}+ message="No runs match these filters."+ action="Clear filters"+ onAction={clearFilters}+ />+ ) : (+ <div className="rounded-lg border border-border">+ {filtered.map((run) => {+ const label = dedupedTriggerLabel(run.trigger);+ const title = run.linkedIssue?.title ?? label ?? "Run";+ return (+ <EntityRow+ key={run.id}+ leading={+ <>+ <Badge variant="outline" className="shrink-0">+ {run.source}+ </Badge>+ <Badge+ variant={run.status === "failed" ? "destructive" : "secondary"}+ className="shrink-0"+ >+ {run.status.replaceAll("_", " ")}+ </Badge>+ </>+ }+ identifier={+ run.linkedIssue+ ? run.linkedIssue.identifier ?? run.linkedIssue.id.slice(0, 8)+ : undefined+ }+ title={title}+ subtitle={runRowSubtitle(run, routine.variables)}+ reserveSubtitleSpace+ trailing={+ <span className="text-xs text-muted-foreground">{timeAgo(run.triggeredAt)}</span>+ }+ to={+ run.linkedIssue+ ? `/issues/${run.linkedIssue.identifier ?? run.linkedIssue.id}`+ : undefined+ }+ />+ );+ })}+ </div>+ )}+ </>)}</div>);diff --git a/ui/src/index.css b/ui/src/index.cssindex 340fff5c39..93e1660cbd 100644--- a/ui/src/index.css+++ b/ui/src/index.css@@ -222,7 +222,11 @@[data-size="icon-xs"],[data-size="icon-sm"],input[type="checkbox"],- input[type="radio"] {+ input[type="radio"],+ /* Auto-resizing title fields are vertically centered inside their own bar,+ which already provides the touch area; the 44px floor would top-align the+ single line of text and push it too high (notably on mobile Safari). */+ textarea[data-autosize-title] {min-height: 0;}}diff --git a/ui/src/lib/cron-fires.test.ts b/ui/src/lib/cron-fires.test.tsnew file mode 100644index 0000000000..c2ac840305--- /dev/null+++ b/ui/src/lib/cron-fires.test.ts@@ -0,0 +1,98 @@+import { describe, expect, it } from "vitest";+import { nextCronFires, parseCronExpression, previewFirePolicies } from "./cron-fires";++describe("parseCronExpression", () => {+ it("parses a standard 5-field expression", () => {+ const parsed = parseCronExpression("0 14 * * 1-5");+ expect(parsed).not.toBeNull();+ expect(parsed?.minutes).toEqual([0]);+ expect(parsed?.hours).toEqual([14]);+ expect(parsed?.daysOfWeek).toEqual([1, 2, 3, 4, 5]);+ });++ it("returns null for malformed expressions", () => {+ expect(parseCronExpression("not a cron")).toBeNull();+ expect(parseCronExpression("0 14 * *")).toBeNull();+ expect(parseCronExpression("")).toBeNull();+ expect(parseCronExpression(null)).toBeNull();+ });+});++describe("nextCronFires", () => {+ it("computes the next N daily fires in UTC", () => {+ const after = new Date("2026-06-09T10:00:00Z");+ const fires = nextCronFires("0 14 * * *", 3, { after, timeZone: "UTC" });+ expect(fires.map((d) => d.toISOString())).toEqual([+ "2026-06-09T14:00:00.000Z",+ "2026-06-10T14:00:00.000Z",+ "2026-06-11T14:00:00.000Z",+ ]);+ });++ it("skips weekends for a weekday schedule", () => {+ // 2026-06-12 is a Friday; the next weekday fire after Fri is Mon 2026-06-15.+ const after = new Date("2026-06-12T15:00:00Z");+ const fires = nextCronFires("0 14 * * 1-5", 2, { after, timeZone: "UTC" });+ expect(fires.map((d) => d.toISOString())).toEqual([+ "2026-06-15T14:00:00.000Z",+ "2026-06-16T14:00:00.000Z",+ ]);+ });++ it("uses OR semantics when day-of-month and day-of-week are both restricted", () => {+ const after = new Date("2026-06-09T10:00:00Z");+ const fires = nextCronFires("0 9 15 * 5", 3, { after, timeZone: "UTC" });+ expect(fires.map((d) => d.toISOString())).toEqual([+ "2026-06-12T09:00:00.000Z",+ "2026-06-15T09:00:00.000Z",+ "2026-06-19T09:00:00.000Z",+ ]);+ });++ it("interprets cron fields in the trigger timezone", () => {+ // 14:00 in New York (EDT, UTC-4 in June) is 18:00 UTC.+ const after = new Date("2026-06-09T10:00:00Z");+ const fires = nextCronFires("0 14 * * *", 1, { after, timeZone: "America/New_York" });+ expect(fires[0]?.toISOString()).toBe("2026-06-09T18:00:00.000Z");+ });++ it("returns an empty list for an unparseable expression", () => {+ expect(nextCronFires("garbage", 5)).toEqual([]);+ expect(nextCronFires("0 14 * * *", 0)).toEqual([]);+ });+});++describe("previewFirePolicies", () => {+ const fires = [+ new Date("2026-06-09T14:00:00Z"),+ new Date("2026-06-10T14:00:00Z"),+ new Date("2026-06-11T14:00:00Z"),+ ];++ it("always queues the first fire regardless of policy", () => {+ for (const policy of ["coalesce_if_active", "always_enqueue", "skip_if_active"]) {+ expect(previewFirePolicies(fires, policy)[0]?.disposition).toBe("queued");+ }+ });++ it("coalesces subsequent fires under coalesce_if_active", () => {+ const preview = previewFirePolicies(fires, "coalesce_if_active");+ expect(preview.map((e) => e.disposition)).toEqual(["queued", "coalesced", "coalesced"]);+ expect(preview[1]?.label).toBe("would be coalesced");+ });++ it("skips subsequent fires under skip_if_active", () => {+ const preview = previewFirePolicies(fires, "skip_if_active");+ expect(preview.map((e) => e.disposition)).toEqual(["queued", "skipped", "skipped"]);+ });++ it("queues every fire under always_enqueue", () => {+ const preview = previewFirePolicies(fires, "always_enqueue");+ expect(preview.every((e) => e.disposition === "queued")).toBe(true);+ });++ it("defaults unknown policies to coalesce", () => {+ const preview = previewFirePolicies(fires, "mystery");+ expect(preview[1]?.disposition).toBe("coalesced");+ });+});diff --git a/ui/src/lib/cron-fires.ts b/ui/src/lib/cron-fires.tsnew file mode 100644index 0000000000..dc0cb7400b--- /dev/null+++ b/ui/src/lib/cron-fires.ts@@ -0,0 +1,272 @@+/**+ * Client-side "next N schedule fires" helper for the routine Delivery preview (§3.5).+ *+ * Mirrors the server's timezone-aware cron tick (server/src/services/routines.ts+ * `nextCronTickInTimeZone`) closely enough for an illustrative preview: it parses+ * the same 5-field cron grammar and walks minute-by-minute, matching the cron+ * fields against wall-clock parts in the trigger's timezone via `Intl.DateTimeFormat`.+ *+ * This is preview-only — the authoritative `nextRunAt` is still computed server-side.+ */++const WEEKDAY_INDEX: Record<string, number> = {+ Sun: 0,+ Mon: 1,+ Tue: 2,+ Wed: 3,+ Thu: 4,+ Fri: 5,+ Sat: 6,+};++interface ParsedCron {+ minutes: number[];+ hours: number[];+ daysOfMonth: number[];+ months: number[];+ daysOfWeek: number[];+ daysOfMonthWildcard: boolean;+ daysOfWeekWildcard: boolean;+}++interface FieldSpec {+ min: number;+ max: number;+}++const FIELD_SPECS: FieldSpec[] = [+ { min: 0, max: 59 }, // minute+ { min: 0, max: 23 }, // hour+ { min: 1, max: 31 }, // day of month+ { min: 1, max: 12 }, // month+ { min: 0, max: 6 }, // day of week (Sun = 0)+];++function parseField(token: string, spec: FieldSpec): number[] {+ const values = new Set<number>();+ for (const rawPart of token.split(",")) {+ const part = rawPart.trim();+ if (part === "") throw new Error("Empty cron field element");++ const slashIdx = part.indexOf("/");+ if (slashIdx !== -1) {+ const base = part.slice(0, slashIdx);+ const step = Number.parseInt(part.slice(slashIdx + 1), 10);+ if (!Number.isInteger(step) || step <= 0) throw new Error("Invalid cron step");+ let start = spec.min;+ let end = spec.max;+ if (base === "*") {+ // every `step` from min+ } else if (base.includes("-")) {+ const [a, b] = base.split("-").map((s) => Number.parseInt(s, 10));+ if (!Number.isInteger(a) || !Number.isInteger(b)) throw new Error("Invalid cron range");+ start = a;+ end = b;+ } else {+ const s = Number.parseInt(base, 10);+ if (!Number.isInteger(s)) throw new Error("Invalid cron start");+ start = s;+ }+ assertBounds(start, spec);+ assertBounds(end, spec);+ for (let i = start; i <= end; i += step) values.add(i);+ continue;+ }++ if (part.includes("-")) {+ const [a, b] = part.split("-").map((s) => Number.parseInt(s, 10));+ if (!Number.isInteger(a) || !Number.isInteger(b)) throw new Error("Invalid cron range");+ assertBounds(a, spec);+ assertBounds(b, spec);+ if (a > b) throw new Error("Invalid cron range (start > end)");+ for (let i = a; i <= b; i++) values.add(i);+ continue;+ }++ if (part === "*" || part === "?") {+ for (let i = spec.min; i <= spec.max; i++) values.add(i);+ continue;+ }++ const val = Number.parseInt(part, 10);+ if (!Number.isInteger(val)) throw new Error("Invalid cron value");+ assertBounds(val, spec);+ values.add(val);+ }+ if (values.size === 0) throw new Error("Empty cron field");+ return [...values].sort((a, b) => a - b);+}++function assertBounds(value: number, spec: FieldSpec): void {+ if (value < spec.min || value > spec.max) {+ throw new Error(`Cron value ${value} out of range`);+ }+}++function coversEntireField(values: number[], spec: FieldSpec): boolean {+ return values.length === spec.max - spec.min + 1 && values[0] === spec.min && values.at(-1) === spec.max;+}++/** Parse a 5-field cron expression. Returns null when it can't be parsed. */+export function parseCronExpression(expression: string | null | undefined): ParsedCron | null {+ if (!expression) return null;+ const tokens = expression.trim().split(/\s+/);+ if (tokens.length !== 5) return null;+ try {+ const daysOfMonth = parseField(tokens[2]!, FIELD_SPECS[2]!);+ const daysOfWeek = parseField(tokens[4]!, FIELD_SPECS[4]!);+ return {+ minutes: parseField(tokens[0]!, FIELD_SPECS[0]!),+ hours: parseField(tokens[1]!, FIELD_SPECS[1]!),+ daysOfMonth,+ months: parseField(tokens[3]!, FIELD_SPECS[3]!),+ daysOfWeek,+ daysOfMonthWildcard: coversEntireField(daysOfMonth, FIELD_SPECS[2]!),+ daysOfWeekWildcard: coversEntireField(daysOfWeek, FIELD_SPECS[4]!),+ };+ } catch {+ return null;+ }+}++interface ZonedParts {+ month: number;+ day: number;+ hour: number;+ minute: number;+ weekday: number;+}++function getZonedMinuteParts(date: Date, timeZone: string): ZonedParts {+ const formatter = new Intl.DateTimeFormat("en-US", {+ timeZone,+ year: "numeric",+ month: "2-digit",+ day: "2-digit",+ hour: "2-digit",+ minute: "2-digit",+ weekday: "short",+ hourCycle: "h23",+ });+ const map: Record<string, string> = {};+ for (const part of formatter.formatToParts(date)) {+ if (part.type !== "literal") map[part.type] = part.value;+ }+ const weekday = WEEKDAY_INDEX[map.weekday ?? ""];+ if (weekday === undefined) throw new Error(`Unable to resolve weekday for ${timeZone}`);+ return {+ month: Number(map.month),+ day: Number(map.day),+ hour: Number(map.hour),+ minute: Number(map.minute),+ weekday,+ };+}++function matches(cron: ParsedCron, parts: ZonedParts): boolean {+ const dayOfMonthMatches = cron.daysOfMonth.includes(parts.day);+ const dayOfWeekMatches = cron.daysOfWeek.includes(parts.weekday);+ const dayMatches =+ !cron.daysOfMonthWildcard && !cron.daysOfWeekWildcard+ ? dayOfMonthMatches || dayOfWeekMatches+ : dayOfMonthMatches && dayOfWeekMatches;++ return (+ cron.minutes.includes(parts.minute) &&+ cron.hours.includes(parts.hour) &&+ cron.months.includes(parts.month) &&+ dayMatches+ );+}++/**+ * Compute up to `count` upcoming fire instants for a cron expression, strictly+ * after `after`, interpreting the cron fields in `timeZone`.+ */+export function nextCronFires(+ expression: string | null | undefined,+ count: number,+ options: { after?: Date; timeZone?: string } = {},+): Date[] {+ const cron = parseCronExpression(expression);+ if (!cron || count <= 0) return [];+ const timeZone = options.timeZone ?? "UTC";+ const after = options.after ?? new Date();++ const cursor = new Date(after.getTime());+ cursor.setUTCSeconds(0, 0);+ cursor.setUTCMinutes(cursor.getUTCMinutes() + 1);++ const fires: Date[] = [];+ // Preview-only bound: cap sparse or impossible schedules before they can stall the UI.+ const maxIterations = 2 * 366 * 24 * 60;+ for (let i = 0; i < maxIterations && fires.length < count; i++) {+ let parts: ZonedParts;+ try {+ parts = getZonedMinuteParts(cursor, timeZone);+ } catch {+ return fires;+ }+ if (matches(cron, parts)) fires.push(new Date(cursor.getTime()));+ cursor.setUTCMinutes(cursor.getUTCMinutes() + 1);+ }+ return fires;+}++export type FireDisposition = "queued" | "coalesced" | "skipped";++export interface FirePreviewEntry {+ at: Date;+ disposition: FireDisposition;+ /** Short human label for the disposition (e.g. "queued", "would be coalesced"). */+ label: string;+ note: string | null;+}++const DISPOSITION_LABEL: Record<FireDisposition, string> = {+ queued: "queued",+ coalesced: "would be coalesced",+ skipped: "would be skipped",+};++/**+ * Annotate a list of upcoming fires with how the chosen concurrency policy would+ * treat each, assuming the previous run is still in flight when the next fires —+ * the worst case that makes the policy's behaviour legible (§3.5).+ *+ * Pure + deterministic so it can be unit-tested without a clock.+ */+export function previewFirePolicies(+ fires: Date[],+ concurrencyPolicy: string,+): FirePreviewEntry[] {+ return fires.map((at, index) => {+ if (index === 0) {+ return {+ at,+ disposition: "queued",+ label: DISPOSITION_LABEL.queued,+ note: "runs immediately",+ };+ }+ let disposition: FireDisposition;+ switch (concurrencyPolicy) {+ case "always_enqueue":+ disposition = "queued";+ break;+ case "skip_if_active":+ disposition = "skipped";+ break;+ case "coalesce_if_active":+ default:+ disposition = "coalesced";+ break;+ }+ return {+ at,+ disposition,+ label: DISPOSITION_LABEL[disposition],+ note: disposition === "queued" ? null : "if the previous run is still active",+ };+ });+}diff --git a/ui/src/lib/routine-run-display.test.ts b/ui/src/lib/routine-run-display.test.tsnew file mode 100644index 0000000000..758b69b147--- /dev/null+++ b/ui/src/lib/routine-run-display.test.ts@@ -0,0 +1,68 @@+import { describe, expect, it } from "vitest";+import type { RoutineVariable } from "@paperclipai/shared";+import { dedupedTriggerLabel, runRowSubtitle } from "./routine-run-display";++const variables: RoutineVariable[] = [+ { name: "customer", label: null, type: "text", defaultValue: null, required: true, options: [] },+ { name: "retries", label: null, type: "number", defaultValue: null, required: false, options: [] },+];++describe("runRowSubtitle", () => {+ it("shows inline variable values for successful runs", () => {+ const subtitle = runRowSubtitle(+ {+ status: "succeeded",+ failureReason: null,+ triggerPayload: { customer: "Acme", retries: 3, PAPERCLIP_RUN_ID: "ignored" },+ },+ variables,+ );+ expect(subtitle).toBe('customer="Acme", retries=3');+ });++ it("only includes declared routine variables, not builtin payload keys", () => {+ const subtitle = runRowSubtitle(+ { status: "succeeded", failureReason: null, triggerPayload: { PAPERCLIP_RUN_ID: "x" } },+ variables,+ );+ expect(subtitle).toBe("");+ });++ it("shows the failure reason for failed runs", () => {+ const subtitle = runRowSubtitle(+ { status: "failed", failureReason: "Cron timed out", triggerPayload: { customer: "Acme" } },+ variables,+ );+ expect(subtitle).toBe("Cron timed out");+ });++ it("falls back to a generic label when a failed run has no reason", () => {+ const subtitle = runRowSubtitle(+ { status: "failed", failureReason: null, triggerPayload: null },+ variables,+ );+ expect(subtitle).toBe("Run failed");+ });++ it("returns empty when there is no payload", () => {+ expect(+ runRowSubtitle({ status: "succeeded", failureReason: null, triggerPayload: null }, variables),+ ).toBe("");+ });+});++describe("dedupedTriggerLabel", () => {+ it("drops the label when it merely restates the kind", () => {+ expect(dedupedTriggerLabel({ kind: "schedule", label: "schedule" })).toBeNull();+ });++ it("keeps a meaningful custom label", () => {+ expect(dedupedTriggerLabel({ kind: "schedule", label: "Nightly sync" })).toBe("Nightly sync");+ });++ it("returns null for missing labels or triggers", () => {+ expect(dedupedTriggerLabel({ kind: "webhook", label: null })).toBeNull();+ expect(dedupedTriggerLabel({ kind: "webhook", label: " " })).toBeNull();+ expect(dedupedTriggerLabel(null)).toBeNull();+ });+});diff --git a/ui/src/lib/routine-run-display.ts b/ui/src/lib/routine-run-display.tsnew file mode 100644index 0000000000..188d1ceffb--- /dev/null+++ b/ui/src/lib/routine-run-display.ts@@ -0,0 +1,54 @@+import type { RoutineRunSummary, RoutineVariable } from "@paperclipai/shared";++/**+ * Format a single resolved variable value for the runs-row subtitle (§3.6).+ * Strings are quoted (`customer="Acme"`); numbers/booleans rendered bare.+ */+function formatVariableValue(value: unknown): string {+ if (typeof value === "string") return `"${value}"`;+ if (typeof value === "number" || typeof value === "boolean") return String(value);+ if (value == null) return "—";+ try {+ return JSON.stringify(value);+ } catch {+ return String(value);+ }+}++/**+ * The de-duped trigger label for a run. The kind chip already states the kind,+ * so when a trigger has no custom label (`label` falls back to `kind`) we drop+ * the redundant text rather than re-stating it.+ */+export function dedupedTriggerLabel(+ trigger: Pick<RoutineRunSummary["trigger"] & object, "kind" | "label"> | null | undefined,+): string | null {+ if (!trigger) return null;+ const label = trigger.label?.trim();+ if (!label) return null;+ if (label === trigger.kind) return null;+ return label;+}++/**+ * Subtitle line for a run row (§3.6):+ * - failed runs show the failure reason ("why" without clicking through);+ * - other runs show the inline resolved variable values (e.g. `customer="Acme"`).+ * Returns an empty string when there is nothing meaningful to show.+ */+export function runRowSubtitle(+ run: Pick<RoutineRunSummary, "status" | "failureReason" | "triggerPayload">,+ variables: readonly RoutineVariable[] | null | undefined,+): string {+ if (run.status === "failed") {+ return run.failureReason?.trim() || "Run failed";+ }+ const payload = run.triggerPayload;+ if (!payload || typeof payload !== "object") return "";+ const parts: string[] = [];+ for (const variable of variables ?? []) {+ if (!(variable.name in payload)) continue;+ parts.push(`${variable.name}=${formatVariableValue((payload as Record<string, unknown>)[variable.name])}`);+ }+ return parts.join(", ");+}diff --git a/ui/src/pages/RoutineDetail.tsx b/ui/src/pages/RoutineDetail.tsxindex 9b4a69c11d..ca7d54333a 100644--- a/ui/src/pages/RoutineDetail.tsx+++ b/ui/src/pages/RoutineDetail.tsx@@ -782,12 +782,13 @@ export function RoutineDetail() {</a><div className="-m-4 flex min-h-full flex-col md:-m-6">- {/* Slim page header */}- <header className="sticky top-0 z-20 flex h-14 shrink-0 items-center gap-3 border-b border-border bg-background px-6">+ {/* Slim page header — scrolls with the page (not sticky) */}+ <header className="flex h-14 shrink-0 items-center gap-3 border-b border-border bg-background px-6"><div className="flex min-w-0 flex-1 items-center gap-3"><textarearef={titleInputRef}- className="min-w-0 flex-1 resize-none overflow-hidden bg-transparent text-base font-semibold outline-none placeholder:text-muted-foreground/50"+ data-autosize-title+ className="min-w-0 flex-1 resize-none overflow-hidden bg-transparent text-base font-semibold leading-7 outline-none placeholder:text-muted-foreground/50"placeholder="Routine title"rows={1}value={editDraft.title}@@ -848,7 +849,7 @@ export function RoutineDetail() {<mainid="routine-section"role="main"- className="min-w-0 flex-1 px-4 py-6 md:px-8"+ className="min-w-0 flex-1 px-4 pb-6 pt-10 md:px-8"><sectionaria-labelledby="routine-section-title"diff --git a/ui/src/pages/Routines.test.tsx b/ui/src/pages/Routines.test.tsxindex 993f0c6704..f3f795a06c 100644--- a/ui/src/pages/Routines.test.tsx+++ b/ui/src/pages/Routines.test.tsx@@ -1,6 +1,7 @@// @vitest-environment jsdom-import { act, type AnchorHTMLAttributes, type ReactNode } from "react";+import type { AnchorHTMLAttributes, ReactNode } from "react";+import { flushSync } from "react-dom";import { createRoot } from "react-dom/client";import { QueryClient, QueryClientProvider } from "@tanstack/react-query";import type { Issue, RoutineListItem } from "@paperclipai/shared";@@ -9,6 +10,14 @@ import { Routines, buildRoutineGroups, sortRoutines } from "./Routines";let currentSearch = "";+async function act(callback: () => void | Promise<void>) {+ let result: void | Promise<void> = undefined;+ flushSync(() => {+ result = callback();+ });+ await result;+}+const navigateMock = vi.fn();const routinesListMock = vi.fn<(companyId: string) => Promise<RoutineListItem[]>>();const issuesListMock = vi.fn<(companyId: string, filters?: Record<string, unknown>) => Promise<Issue[]>>();diff --git a/ui/src/pages/Routines.tsx b/ui/src/pages/Routines.tsxindex 0139bf45b9..35cf032143 100644--- a/ui/src/pages/Routines.tsx+++ b/ui/src/pages/Routines.tsx@@ -885,51 +885,59 @@ export function Routines() {/></div>) : (- <div className="rounded-lg border border-border">- {routineGroups.map((group) => (- <Collapsible- key={group.key}- open={!routineViewState.collapsedGroups.includes(group.key)}- onOpenChange={(open) => {- updateRoutineView({- collapsedGroups: open- ? routineViewState.collapsedGroups.filter((item) => item !== group.key)- : [...routineViewState.collapsedGroups, group.key],- });- }}- >- {group.label ? (- <div className="flex items-center gap-2 border-b border-border px-3 py-2">- <CollapsibleTrigger className="flex items-center gap-1.5">- <ChevronRight className="h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform [[data-state=open]>&]:rotate-90" />- <span className="text-sm font-semibold uppercase tracking-wide">- {group.label}+ <div className="flex flex-col gap-3">+ {routineGroups.map((group) => {+ const isOpen = !routineViewState.collapsedGroups.includes(group.key);+ return (+ <Collapsible+ key={group.key}+ open={isOpen}+ onOpenChange={(open) => {+ updateRoutineView({+ collapsedGroups: open+ ? routineViewState.collapsedGroups.filter((item) => item !== group.key)+ : [...routineViewState.collapsedGroups, group.key],+ });+ }}+ >+ {group.label ? (+ <div+ className={`flex items-center gap-2 rounded-lg border border-border px-3 py-2${+ isOpen ? " mb-1" : ""+ }`}+ >+ <CollapsibleTrigger className="flex items-center gap-1.5">+ <ChevronRight className="h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform [[data-state=open]>&]:rotate-90" />+ <span className="text-sm font-semibold uppercase tracking-wide">+ {group.label}+ </span>+ </CollapsibleTrigger>+ <span className="text-xs text-muted-foreground">+ {group.items.length}</span>- </CollapsibleTrigger>- <span className="text-xs text-muted-foreground">- {group.items.length}- </span>- </div>- ) : null}- <CollapsibleContent>- {group.items.map((routine) => (- <RoutineListRow- key={routine.id}- routine={routine}- projectById={projectById}- agentById={agentById}- runningRoutineId={runningRoutineId}- statusMutationRoutineId={statusMutationRoutineId}- href={`/routines/${routine.id}`}- runNowButton- onRunNow={handleRunNow}- onToggleEnabled={handleToggleEnabled}- onToggleArchived={handleToggleArchived}- />- ))}- </CollapsibleContent>- </Collapsible>- ))}+ </div>+ ) : null}+ <CollapsibleContent>+ {group.items.map((routine) => (+ <RoutineListRow+ key={routine.id}+ routine={routine}+ projectById={projectById}+ agentById={agentById}+ runningRoutineId={runningRoutineId}+ statusMutationRoutineId={statusMutationRoutineId}+ href={`/routines/${routine.id}`}+ runNowButton+ divider={false}+ onRunNow={handleRunNow}+ onToggleEnabled={handleToggleEnabled}+ onToggleArchived={handleToggleArchived}+ />+ ))}+ </CollapsibleContent>+ </Collapsible>+ );+ })}</div>)}</div>diff --git a/ui/storybook/stories/routine-detail-c.stories.tsx b/ui/storybook/stories/routine-detail-c.stories.tsxindex 82d61ae19d..4b797e0d71 100644--- a/ui/storybook/stories/routine-detail-c.stories.tsx+++ b/ui/storybook/stories/routine-detail-c.stories.tsx@@ -83,7 +83,7 @@ const routine: RoutineDetailType = {concurrencyPolicy: "coalesce_if_active",catchUpPolicy: "skip_missed",variables,- env: { DATABASE_URL: { kind: "secret", secretId: "secret-prod-db", version: "latest" } } as never,+ env: { DATABASE_URL: { type: "secret_ref", secretId: "secret-prod-db", version: "latest" } } as never,latestRevisionId: "rev-17",latestRevisionNumber: 17,createdByAgentId: null,@@ -104,9 +104,41 @@ const routine: RoutineDetailType = {};const routineRuns = [- { id: "run-1", source: "manual", status: "succeeded", triggeredAt: new Date("2026-06-09T11:48:00Z"), trigger: { label: "manual", kind: "manual" }, linkedIssue: { id: "issue-1", identifier: "PAP-99221" } },- { id: "run-2", source: "schedule", status: "failed", triggeredAt: new Date("2026-06-08T14:00:00Z"), trigger: { label: "schedule", kind: "schedule" }, linkedIssue: { id: "issue-2", identifier: "PAP-99220" } },- { id: "run-3", source: "schedule", status: "succeeded", triggeredAt: new Date("2026-06-07T14:00:00Z"), trigger: { label: "schedule", kind: "schedule" }, linkedIssue: { id: "issue-3", identifier: "PAP-99219" } },+ { id: "run-1", source: "manual", status: "succeeded", triggeredAt: new Date("2026-06-09T11:48:00Z"), failureReason: null, triggerPayload: { customer_name: "Acme", deadline: "Fri" }, trigger: { label: "manual", kind: "manual" }, linkedIssue: { id: "issue-1", identifier: "PAP-99221", title: "Weekly digest for Acme" } },+ { id: "run-2", source: "schedule", status: "failed", triggeredAt: new Date("2026-06-08T14:00:00Z"), failureReason: "Cron timed out after 600s", triggerPayload: { customer_name: "Acme" }, trigger: { label: "schedule", kind: "schedule" }, linkedIssue: { id: "issue-2", identifier: "PAP-99220", title: "Weekly digest for Acme" } },+ { id: "run-3", source: "schedule", status: "succeeded", triggeredAt: new Date("2026-06-07T14:00:00Z"), failureReason: null, triggerPayload: { customer_name: "Globex" }, trigger: { label: "schedule", kind: "schedule" }, linkedIssue: { id: "issue-3", identifier: "PAP-99219", title: "Weekly digest for Globex" } },+] as never;++function stubSecret(id: string, name: string, latestVersion: number, referenceCount: number) {+ return {+ id,+ companyId: COMPANY_ID,+ key: name.toLowerCase(),+ name,+ provider: "paperclip",+ status: "active",+ managedMode: "managed",+ externalRef: null,+ providerConfigId: null,+ providerMetadata: null,+ latestVersion,+ description: null,+ lastResolvedAt: now,+ lastRotatedAt: null,+ deletedAt: null,+ createdByAgentId: null,+ createdByUserId: null,+ referenceCount,+ createdAt: now,+ updatedAt: now,+ };+}++const availableSecrets = [+ stubSecret("secret-prod-db", "prod-db", 3, 5),+ stubSecret("secret-gh-token", "gh-token", 2, 4),+ stubSecret("secret-openai", "openai-key", 1, 2),+ stubSecret("secret-stripe", "stripe-key", 1, 1),] as never;const activity = [@@ -172,7 +204,7 @@ function makeContext(dirty: boolean, navigate: (s: RoutineSectionKey) => void):secretMessage: null,setSecretMessage: () => {},copySecretValue: () => {},- availableSecrets: [],+ availableSecrets,createSecret: stubMutation(),agents: storybookAgents,projects: storybookProjects,@@ -238,8 +270,8 @@ function RoutineCShell({ initialSection = "overview", dirty = false }: { initialreturn (<RoutineDetailContext.Provider value={ctx}>- <div className="flex h-[900px] flex-col bg-background text-foreground">- <header className="sticky top-0 z-20 flex h-14 shrink-0 items-center gap-3 border-b border-border bg-background px-6">+ <div className="flex h-[900px] flex-col overflow-y-auto bg-background text-foreground">+ <header className="flex h-14 shrink-0 items-center gap-3 border-b border-border bg-background px-6"><div className="flex min-w-0 flex-1 items-center gap-3"><span className="truncate text-base font-semibold">{routine.title}</span><Badge variant="outline" className="hidden shrink-0 gap-1.5 text-xs text-muted-foreground sm:inline-flex">@@ -265,7 +297,7 @@ function RoutineCShell({ initialSection = "overview", dirty = false }: { initialhasLiveRun={false}onNavigate={setSection}/>- <main className="min-w-0 flex-1 overflow-y-auto px-4 py-6 md:px-8">+ <main className="min-w-0 flex-1 px-4 pb-6 pt-10 md:px-8"><section className={isEditable ? "mx-auto w-full max-w-3xl" : "w-full"}><h2 className="mb-4 text-lg font-semibold">{SECTION_TITLES[section]}</h2><SectionBody section={section} />diff --git a/ui/storybook/stories/routines-list-groups.stories.tsx b/ui/storybook/stories/routines-list-groups.stories.tsxnew file mode 100644index 0000000000..cf4da48267--- /dev/null+++ b/ui/storybook/stories/routines-list-groups.stories.tsx@@ -0,0 +1,102 @@+import type { Meta, StoryObj } from "@storybook/react-vite";+import { useState } from "react";+import { ChevronRight } from "lucide-react";+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";+import {+ RoutineListRow,+ type RoutineListAgentSummary,+ type RoutineListProjectSummary,+ type RoutineListRowItem,+} from "@/components/RoutineList";++const projectById = new Map<string, RoutineListProjectSummary>([+ ["p1", { name: "Board UI", color: "#6366f1" }],+ ["p2", { name: "Growth", color: "#10b981" }],+]);+const agentById = new Map<string, RoutineListAgentSummary>([+ ["a1", { name: "CodexCoder", icon: null }],+ ["a2", { name: "Digest Bot", icon: null }],+]);++type Group = { key: string; label: string | null; items: RoutineListRowItem[] };++const GROUPS: Group[] = [+ {+ key: "p1",+ label: "Board UI",+ items: [+ { id: "r1", title: "Weekly digest", status: "active", projectId: "p1", assigneeAgentId: "a2", lastRun: { triggeredAt: "2026-06-09T08:00:00Z", status: "succeeded" } },+ { id: "r2", title: "Triage stale issues", status: "active", projectId: "p1", assigneeAgentId: "a1", lastRun: { triggeredAt: "2026-06-08T08:00:00Z", status: "succeeded" } },+ { id: "r3", title: "Nightly changelog draft", status: "paused", projectId: "p1", assigneeAgentId: "a1", lastRun: null },+ ],+ },+ {+ key: "p2",+ label: "Growth",+ items: [+ { id: "r4", title: "Lead enrichment sweep", status: "active", projectId: "p2", assigneeAgentId: "a1", lastRun: { triggeredAt: "2026-06-09T06:00:00Z", status: "running" } },+ { id: "r5", title: "Outbound follow-ups", status: "active", projectId: "p2", assigneeAgentId: "a2", lastRun: { triggeredAt: "2026-06-07T06:00:00Z", status: "failed" } },+ ],+ },+];++function GroupedList() {+ const [collapsed, setCollapsed] = useState<string[]>([]);+ return (+ <div className="mx-auto max-w-4xl p-6">+ <div className="flex flex-col gap-3">+ {GROUPS.map((group) => {+ const isOpen = !collapsed.includes(group.key);+ return (+ <Collapsible+ key={group.key}+ open={isOpen}+ onOpenChange={(open) =>+ setCollapsed((prev) => (open ? prev.filter((k) => k !== group.key) : [...prev, group.key]))+ }+ >+ {group.label ? (+ <div className={`flex items-center gap-2 rounded-lg border border-border px-3 py-2${isOpen ? " mb-1" : ""}`}>+ <CollapsibleTrigger className="flex items-center gap-1.5">+ <ChevronRight className="h-3.5 w-3.5 shrink-0 text-muted-foreground transition-transform [[data-state=open]>&]:rotate-90" />+ <span className="text-sm font-semibold uppercase tracking-wide">{group.label}</span>+ </CollapsibleTrigger>+ <span className="text-xs text-muted-foreground">{group.items.length}</span>+ </div>+ ) : null}+ <CollapsibleContent>+ {group.items.map((routine) => (+ <RoutineListRow+ key={routine.id}+ routine={routine}+ projectById={projectById}+ agentById={agentById}+ runningRoutineId={null}+ statusMutationRoutineId={null}+ href={`#${routine.id}`}+ runNowButton+ divider={false}+ onRunNow={() => {}}+ onToggleEnabled={() => {}}+ onToggleArchived={() => {}}+ />+ ))}+ </CollapsibleContent>+ </Collapsible>+ );+ })}+ </div>+ </div>+ );+}++const meta: Meta<typeof GroupedList> = {+ title: "Product/Routines · List (grouped cards)",+ component: GroupedList,+ parameters: { layout: "fullscreen" },+};+export default meta;++type Story = StoryObj<typeof GroupedList>;++export const GroupedCards: Story = {};