Drop in a screenshot and convert it to clean code (HTML/Tailwind/React/Vue)
Python
Preserve agent activity order while grouping consecutive completed steps
Flightdeck Agent9df864afbf7d
diff --git a/frontend/src/components/agent/AgentActivity.tsx b/frontend/src/components/agent/AgentActivity.tsxindex 3970389a..5d2f7b64 100644--- a/frontend/src/components/agent/AgentActivity.tsx+++ b/frontend/src/components/agent/AgentActivity.tsx@@ -25,6 +25,7 @@ import { Light as SyntaxHighlighterBase } from "react-syntax-highlighter";import html from "react-syntax-highlighter/dist/esm/languages/hljs/xml";import { vs2015 } from "react-syntax-highlighter/dist/esm/styles/hljs";import WorkingPulse from "../core/WorkingPulse";+import { groupCompletedAgentEvents } from "./activity-order";SyntaxHighlighterBase.registerLanguage("html", html);const SyntaxHighlighter = SyntaxHighlighterBase as any;@@ -77,17 +78,6 @@ function formatElapsedSince(timestampMs: number | undefined, nowMs: number): strreturn formatDurationMs(Math.max(0, nowMs - timestampMs));}-function formatVariantWallClockDuration(- requestStartedAt: number | undefined,- completedAt: number | undefined,- nowMs: number-): string {- if (!isFiniteNumber(requestStartedAt)) return "";- const end = isFiniteNumber(completedAt) ? completedAt : nowMs;- return formatDurationMs(Math.max(0, end - requestStartedAt));-}--function getArrayField(value: unknown, field: string): unknown[] | null {if (!value || typeof value !== "object") return null;const fieldValue = (value as Record<string, unknown>)[field];@@ -893,7 +883,7 @@ function AgentEventCard({function AgentActivity() {const { head, commits, latestCommitHash } = useProjectStore();- const [stepsExpandedByVariant, setStepsExpandedByVariant] = useState<+ const [expandedStepGroups, setExpandedStepGroups] = useState<Record<string, boolean>>({});const [nowMs, setNowMs] = useState(() => Date.now());@@ -934,55 +924,72 @@ function AgentActivity() {selectedVariantStatus === "error" ||selectedVariantStatus === "cancelled";const runningDuration = formatElapsedSince(requestStartMs, nowMs);- const variantDuration = formatVariantWallClockDuration(- requestStartMs,- selectedVariant?.completedAt,- nowMs- );- const stepsExpanded = variantUiKey- ? Boolean(stepsExpandedByVariant[variantUiKey])- : false;- const stepEvents = events.filter((e) => e.type === "tool" || e.type === "thinking");- const assistantEvents = events.filter((e) => e.type === "assistant");+ const completedEventGroups = groupCompletedAgentEvents(events);return (<div className="space-y-1 mb-3">{isDone ? (<>- {/* Collapsed steps summary */}- <button- onClick={() =>- setStepsExpandedByVariant((prev) => ({- ...prev,- [variantUiKey]: !prev[variantUiKey],- }))+ {completedEventGroups.map((group) => {+ if (group.type === "assistant") {+ return (+ <AgentEventCard+ key={group.event.id}+ event={group.event}+ autoExpand={group.event.id === lastAssistantId}+ />+ );}- className="w-full flex items-center gap-2 rounded-xl border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-900/60 px-3 py-2 text-left"- >- {stepsExpanded ? (- <BsChevronDown className="text-gray-400 text-xs" />- ) : (- <BsChevronRight className="text-gray-400 text-xs" />- )}- <span className="text-xs text-gray-500 dark:text-gray-400">- Worked through {stepEvents.length} step{stepEvents.length !== 1 ? "s" : ""}{variantDuration ? ` in ${variantDuration}` : ""}- </span>- </button>- {stepsExpanded && (- <div className="space-y-1">- {stepEvents.map((event) => (- <AgentEventCard key={event.id} event={event} variantCode={event.toolName === "create_file" ? variantCode : undefined} />- ))}- </div>- )}- {/* Assistant responses always visible */}- {assistantEvents.map((event) => (- <AgentEventCard- key={event.id}- event={event}- autoExpand={event.id === lastAssistantId}- />- ))}++ const firstStep = group.events[0];+ const lastStep = group.events[group.events.length - 1];+ const groupUiKey = `${variantUiKey}:${firstStep.id}`;+ const isExpanded = Boolean(expandedStepGroups[groupUiKey]);+ const groupDuration = formatDuration(+ firstStep.startedAt,+ lastStep.endedAt+ );++ return (+ <div key={groupUiKey}>+ <button+ onClick={() =>+ setExpandedStepGroups((previous) => ({+ ...previous,+ [groupUiKey]: !previous[groupUiKey],+ }))+ }+ className="w-full flex items-center gap-2 rounded-xl border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-900/60 px-3 py-2 text-left"+ >+ {isExpanded ? (+ <BsChevronDown className="text-gray-400 text-xs" />+ ) : (+ <BsChevronRight className="text-gray-400 text-xs" />+ )}+ <span className="text-xs text-gray-500 dark:text-gray-400">+ Worked through {group.events.length} step+ {group.events.length !== 1 ? "s" : ""}+ {groupDuration ? ` in ${groupDuration}` : ""}+ </span>+ </button>+ {isExpanded && (+ <div className="space-y-1">+ {group.events.map((event) => (+ <AgentEventCard+ key={event.id}+ event={event}+ variantCode={+ event.toolName === "create_file"+ ? variantCode+ : undefined+ }+ />+ ))}+ </div>+ )}+ </div>+ );+ })}</>) : (<>diff --git a/frontend/src/components/agent/activity-order.test.ts b/frontend/src/components/agent/activity-order.test.tsnew file mode 100644index 00000000..1d1053b9--- /dev/null+++ b/frontend/src/components/agent/activity-order.test.ts@@ -0,0 +1,62 @@+import { AgentEvent } from "../commits/types";+import { groupCompletedAgentEvents } from "./activity-order";++function event(+ id: string,+ type: AgentEvent["type"],+ startedAt: number+): AgentEvent {+ return {+ id,+ type,+ status: "complete",+ startedAt,+ endedAt: startedAt + 1,+ content: type === "assistant" ? id : undefined,+ };+}++describe("groupCompletedAgentEvents", () => {+ test("keeps assistant responses on their original sides of tool calls", () => {+ const events = [+ event("response-before-tool", "assistant", 1),+ event("thinking", "thinking", 2),+ event("tool", "tool", 3),+ event("response-after-tool", "assistant", 4),+ ];++ const groups = groupCompletedAgentEvents(events);++ expect(groups.map((group) => group.type)).toEqual([+ "assistant",+ "steps",+ "assistant",+ ]);+ expect(groups[0]).toMatchObject({+ type: "assistant",+ event: { id: "response-before-tool" },+ });+ expect(groups[1]).toMatchObject({+ type: "steps",+ events: [{ id: "thinking" }, { id: "tool" }],+ });+ expect(groups[2]).toMatchObject({+ type: "assistant",+ event: { id: "response-after-tool" },+ });+ });++ test("starts a new step group after every assistant response", () => {+ const events = [+ event("tool-one", "tool", 1),+ event("response-between-tools", "assistant", 2),+ event("tool-two", "tool", 3),+ ];++ expect(groupCompletedAgentEvents(events).map((group) => group.type)).toEqual([+ "steps",+ "assistant",+ "steps",+ ]);+ });+});diff --git a/frontend/src/components/agent/activity-order.ts b/frontend/src/components/agent/activity-order.tsnew file mode 100644index 00000000..7854a02c--- /dev/null+++ b/frontend/src/components/agent/activity-order.ts@@ -0,0 +1,28 @@+import { AgentEvent } from "../commits/types";++export type CompletedAgentEventGroup =+ | { type: "assistant"; event: AgentEvent }+ | { type: "steps"; events: AgentEvent[] };++/**+ * Keep completed activity in stream order while collapsing consecutive+ * thinking/tool events into compact step groups.+ */+export function groupCompletedAgentEvents(+ events: AgentEvent[]+): CompletedAgentEventGroup[] {+ return events.reduce<CompletedAgentEventGroup[]>((groups, event) => {+ if (event.type === "assistant") {+ groups.push({ type: "assistant", event });+ return groups;+ }++ const previousGroup = groups[groups.length - 1];+ if (previousGroup?.type === "steps") {+ previousGroup.events.push(event);+ } else {+ groups.push({ type: "steps", events: [event] });+ }+ return groups;+ }, []);+}