Python
feat(gui): folded helper rows and team worker rows in the Steps panel (OB-7)
Devika Verma0ef2c5ce1394
diff --git a/surfaces/gui/src/App.tsx b/surfaces/gui/src/App.tsxindex 39729a63..21942893 100644--- a/surfaces/gui/src/App.tsx+++ b/surfaces/gui/src/App.tsx@@ -2644,7 +2644,7 @@ export function App() {/></div><RightRail- teamView={stepsOpen && sessionId ? <StepsPanel sessionId={sessionId} refreshKey={stepsKey} openAt={stepsAt} onClose={() => setStepsOpen(false)} /> : teamViewOpen ? <TeamView openKey={boardRailKey} board={boardOwner === sessionId ? board : null} summary={teamSummary?.lead_session === sessionId ? teamSummary : null} initialItem={boardDetailId} initialWorkerId={teamWorkerId} initialWorkerFilter={teamWorkerFilter} onOpenFullSession={(id) => { const w = sessions.find(s => s.session_id === id); if (w) void selectSession(w.session_id, w.workspace, w.agent); }} sessionId={sessionId} sessions={sessions} machine={machine} machineName={curSession?.machine_name} onClose={() => { setTeamViewOpen(false); setBoardDetailId(null); setTeamWorkerId(null); setTeamWorkerFilter(null); }} onRefresh={() => { void refreshBoard(); setBrowserRefreshKey(k => k + 1); }} /> : undefined}+ teamView={stepsOpen && sessionId ? <StepsPanel sessionId={sessionId} refreshKey={stepsKey} openAt={stepsAt} onClose={() => setStepsOpen(false)} onOpenSession={(id) => { const w = sessions.find(s => s.session_id === id); if (w) void selectSession(w.session_id, w.workspace, w.agent); }} /> : teamViewOpen ? <TeamView openKey={boardRailKey} board={boardOwner === sessionId ? board : null} summary={teamSummary?.lead_session === sessionId ? teamSummary : null} initialItem={boardDetailId} initialWorkerId={teamWorkerId} initialWorkerFilter={teamWorkerFilter} onOpenFullSession={(id) => { const w = sessions.find(s => s.session_id === id); if (w) void selectSession(w.session_id, w.workspace, w.agent); }} sessionId={sessionId} sessions={sessions} machine={machine} machineName={curSession?.machine_name} onClose={() => { setTeamViewOpen(false); setBoardDetailId(null); setTeamWorkerId(null); setTeamWorkerFilter(null); }} onRefresh={() => { void refreshBoard(); setBrowserRefreshKey(k => k + 1); }} /> : undefined}active={surface === "session" && agent !== "chat" && !railHidden}sessionId={sessionId}refreshKey={browserRefreshKey}diff --git a/surfaces/gui/src/api.ts b/surfaces/gui/src/api.tsindex 45e3ac24..c58fa5af 100644--- a/surfaces/gui/src/api.ts+++ b/surfaces/gui/src/api.ts@@ -4497,6 +4497,24 @@ export interface RecordedTurn {reviewer?: { active?: boolean; shadow?: boolean; kind?: string | null; model?: string | null } | null;// OB-3: how many issues the turn's checks found (warnings count on the tab).issues?: { warn: number; info: number };+ // OB-7: team workers' turns this (lead) turn woke, worked out on read. Display only.+ workers?: RecordedWorkerRow[];+}++// One worker turn under a lead's turn (OB-7). `tokens` are the worker's own, never the lead's.+export interface RecordedWorkerRow {+ session_id: string;+ turn_id: string;+ seq: number | null;+ name: string | null;+ started_at: number;+ duration_ms: number | null;+ status: string;+ tokens: number;+ at_least: boolean;+ team_id: string | null;+ item_ids: string[];+ via: string | null;}// One turn's Issues (OB-3): what the checks in signals.yaml found, what was fine, what did notdiff --git a/surfaces/gui/src/components/StepsPanel.test.tsx b/surfaces/gui/src/components/StepsPanel.test.tsxindex e06ba488..8863645a 100644--- a/surfaces/gui/src/components/StepsPanel.test.tsx+++ b/surfaces/gui/src/components/StepsPanel.test.tsx@@ -3,6 +3,8 @@ import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/reimport { afterEach, describe, expect, it, vi } from "vitest";import { getRecordedTurns, getRecordedUsage, getStepDetail, getTurnIssues, getTurnSteps, markIssuesSeen } from "../api";import { StepsPanel, formatDuration } from "./StepsPanel";+import i18n from "i18next";+import zh from "../locales/zh.json";vi.mock("../api", () => ({getRecordedTurns: vi.fn(),@@ -314,3 +316,93 @@ describe("Issues tab (OB-3)", () => {});});++describe("Helpers and team workers (OB-7)", () => {+ const usage = (n: number) => ({ purpose: "helper", usage: { reported: true, input_fresh: n - 100, cache_read: 0, cache_write: 0, output: 100 } });+ const helperSteps = [+ step({ step_id: "m0", kind: "model", name: "model", duration_ms: 500, attrs: { purpose: "main" } }),+ step({ step_id: "e1", name: "explore", call_id: "c1", started_at: 1500, duration_ms: 6000,+ attrs: { helper: { index: 1, status: "ok", model_calls: 4, tool_calls: 2, tokens: 12300 } } }),+ step({ step_id: "e1m", kind: "model", name: "model", parent_step_id: "e1", started_at: 1600, attrs: usage(6000) }),+ step({ step_id: "e1t", name: "grep", parent_step_id: "e1", started_at: 1700 }),+ step({ step_id: "e2", name: "explore", call_id: "c2", started_at: 1500, duration_ms: 5000,+ attrs: { helper: { index: 2, status: "step_limit", model_calls: 10, tool_calls: 9, tokens: 40000 } } }),+ step({ step_id: "e2m", kind: "model", name: "model", parent_step_id: "e2", started_at: 1600, attrs: usage(4000) }),+ step({ step_id: "m9", kind: "model", name: "model", started_at: 8000, duration_ms: 2000, attrs: { purpose: "main" } }),+ ];++ it("folds each helper's steps behind its summary line, and opens them on click", async () => {+ vi.mocked(getRecordedTurns).mockResolvedValue([turn] as any);+ vi.mocked(getTurnSteps).mockResolvedValue(helperSteps as any);+ render(<StepsPanel sessionId="s1" onClose={() => {}} />);+ const helpers = await screen.findAllByTestId("steps-helper");+ expect(helpers.map((h) => h.querySelector(".steps-name")?.textContent)).toEqual([+ "Helper 1 · 6 steps · 12.3k tokens · ok",+ "Helper 2 · 19 steps · 40k tokens · hit its step limit",+ ]);+ // Folded by default: the explore rows and the lead's own steps, no helper steps.+ expect(screen.getAllByTestId("steps-row")).toHaveLength(4);+ fireEvent.click(helpers[0]);+ expect(helpers[0].getAttribute("aria-expanded")).toBe("true");+ const labels = screen.getAllByTestId("steps-row").map((r) => r.textContent || "");+ expect(labels).toHaveLength(6);+ expect(labels[2]).toContain("Model · helper");+ expect(labels[3]).toContain("grep");+ fireEvent.click(helpers[0]);+ expect(screen.getAllByTestId("steps-row")).toHaveLength(4);+ });++ it("sums a running helper's own steps until its summary is recorded", async () => {+ const running = helperSteps.slice(0, 4).map((x) => x.step_id === "e1" ? { ...x, status: "running", duration_ms: null, attrs: {} } : x);+ vi.mocked(getRecordedTurns).mockResolvedValue([turn] as any);+ vi.mocked(getTurnSteps).mockResolvedValue(running as any);+ render(<StepsPanel sessionId="s1" onClose={() => {}} />);+ const [helper] = await screen.findAllByTestId("steps-helper");+ expect(helper.querySelector(".steps-name")?.textContent).toBe("Helper 1 · 2 steps · 6k tokens · running");+ });++ const workers = [{ session_id: "sess_qa", turn_id: "W1", seq: 3, name: "qa", started_at: 6000, duration_ms: 41_000,+ status: "completed", tokens: 12_000, at_least: false, team_id: "team-1", item_ids: ["3"], via: "board" }];++ it("shows a worker's turn as one row that opens the worker session", async () => {+ const onOpen = vi.fn();+ vi.mocked(getRecordedTurns).mockResolvedValue([{ ...turn, workers }] as any);+ vi.mocked(getTurnSteps).mockResolvedValue(helperSteps as any);+ render(<StepsPanel sessionId="s1" onClose={() => {}} onOpenSession={onOpen} />);+ const row = await screen.findByTestId("steps-worker");+ expect(row.textContent).toContain("Worker qa · turn 3");+ expect(row.textContent).toContain("12k tokens");+ expect(row.textContent).toContain("41s");+ // In time order: after the helpers, before the final answer (which started at 8000).+ const timeline = screen.getByTestId("steps-timeline");+ const order = Array.from(timeline.querySelectorAll("[data-testid]")).map((e) => e.getAttribute("data-testid")).filter((x) => x !== "steps-worker-open");+ expect(order.slice(-2)).toEqual(["steps-worker", "steps-row"]);+ fireEvent.click(screen.getByTestId("steps-worker-open"));+ expect(onOpen).toHaveBeenCalledWith("sess_qa");+ });++ it("has no open link where the app cannot open sessions", async () => {+ vi.mocked(getRecordedTurns).mockResolvedValue([{ ...turn, workers }] as any);+ vi.mocked(getTurnSteps).mockResolvedValue([] as any);+ render(<StepsPanel sessionId="s1" onClose={() => {}} />);+ await screen.findByTestId("steps-worker");+ expect(screen.queryByTestId("steps-worker-open")).toBeNull();+ });++ it("reads in Chinese", async () => {+ i18n.addResourceBundle("zh", "translation", zh, true, true);+ await i18n.changeLanguage("zh");+ try {+ vi.mocked(getRecordedTurns).mockResolvedValue([{ ...turn, workers }] as any);+ vi.mocked(getTurnSteps).mockResolvedValue(helperSteps as any);+ render(<StepsPanel sessionId="s1" onClose={() => {}} onOpenSession={() => {}} />);+ const helpers = await screen.findAllByTestId("steps-helper");+ expect(helpers[0].querySelector(".steps-name")?.textContent).toBe("助手 1 · 6 个步骤 · 12.3k 个 token · 完成");+ expect(helpers[1].textContent).toContain("达到步骤上限");+ expect(screen.getByTestId("steps-worker").textContent).toContain("同事 qa · 第 3 轮");+ expect(screen.getByTestId("steps-worker-open").textContent).toBe("打开同事的会话 ↗");+ } finally {+ await i18n.changeLanguage("en");+ }+ });+});diff --git a/surfaces/gui/src/components/StepsPanel.tsx b/surfaces/gui/src/components/StepsPanel.tsxindex cc1181f4..76b8401f 100644--- a/surfaces/gui/src/components/StepsPanel.tsx+++ b/surfaces/gui/src/components/StepsPanel.tsx@@ -16,6 +16,7 @@ import {markIssuesSeen,type RecordedStep,type RecordedTurn,+ type RecordedWorkerRow,type TurnIssue,type TurnIssues,} from "../api";@@ -185,6 +186,55 @@ function nest(steps: RecordedStep[]): { step: RecordedStep; depth: number }[] {return out;}+/** What the timeline draws (OB-7): a step; under an explore step, the summary row its+ * helper's steps fold behind; or a team worker's turn this turn woke. */+export type TimelineRow =+ | { type: "step"; step: RecordedStep; depth: number }+ | { type: "helper"; step: RecordedStep; depth: number; open: boolean; children: RecordedStep[] }+ | { type: "worker"; worker: RecordedWorkerRow };++/** The helper's summary line, "Helper 1 · 6 steps · 12.3k tokens · ok": from the explore step's+ * `attrs.helper` (1.2), or, while it runs or in an older recording, from its nested steps. */+export function helperSummary(step: RecordedStep, children: RecordedStep[], t: T): string {+ const h = step.attrs?.helper;+ const count = h ? (h.model_calls || 0) + (h.tool_calls || 0) : children.filter((c) => c.kind === "model" || c.kind === "tool").length;+ const tokens = h ? h.tokens || 0 : children.reduce((n, c) => {+ const u = c.kind === "model" ? c.attrs?.usage : null;+ return u?.reported ? n + (u.input_fresh || 0) + (u.cache_read || 0) + (u.cache_write || 0) + (u.output || 0) : n;+ }, 0);+ const status = h?.status || step.status;+ return t("steps.helper.summary", {+ index: h?.index ?? 1, count, tokens: formatTokens(tokens),+ status: t(`steps.helper.status.${status}`, { defaultValue: status }),+ });+}++/** The timeline's rows: each explore step's helper steps folded behind a summary row unless+ * opened (TD2-19), and the turn's worker rows placed among the top-level steps by start. */+export function timelineRows(steps: RecordedStep[], workers: RecordedWorkerRow[], open: Set<string>): TimelineRow[] {+ const nested = nest(steps);+ const out: TimelineRow[] = [];+ for (let i = 0; i < nested.length; i++) {+ const { step, depth } = nested[i];+ out.push({ type: "step", step, depth });+ if (step.kind !== "tool" || step.name !== "explore") continue;+ let j = i + 1;+ while (j < nested.length && nested[j].depth > depth) j++;+ const children = nested.slice(i + 1, j);+ if (!children.length && !step.attrs?.helper) continue;+ const isOpen = open.has(step.step_id);+ out.push({ type: "helper", step, depth: depth + 1, open: isOpen, children: children.map((c) => c.step) });+ if (isOpen) for (const c of children) out.push({ type: "step", step: c.step, depth: c.depth + 1 });+ i = j - 1;+ }+ for (const w of [...workers].sort((a, b) => a.started_at - b.started_at)) {+ // Before the first top-level step that started after the worker turn did.+ const at = out.findIndex((r) => r.type === "step" && r.depth === 0 && r.step.started_at > w.started_at);+ out.splice(at < 0 ? out.length : at, 0, { type: "worker", worker: w });+ }+ return out;+}+const KIND_CLASS: Record<string, string> = {context: "ctx", model: "model", tool: "tool", wait: "wait", auto_approver: "review", summary: "sum", notice: "ctx",};@@ -194,9 +244,12 @@ export function StepsPanel({refreshKey = 0,openAt = null,onClose,+ onOpenSession,}: {sessionId: string;refreshKey?: number;+ // A worker row's "Open worker session" (OB-7).+ onOpenSession?: (sessionId: string) => void;// Opened from a turn's answer: its time (unix seconds) picks the turn that produced it.openAt?: { ts?: number; n: number } | null;onClose: () => void;@@ -209,6 +262,7 @@ export function StepsPanel({const [issues, setIssues] = useState<TurnIssues | null>(null);const [selected, setSelected] = useState<string | null>(null);const [error, setError] = useState(false);+ const [openHelpers, setOpenHelpers] = useState<Set<string>>(new Set());// Another session: start again at its newest turn.useEffect(() => {@@ -242,8 +296,11 @@ export function StepsPanel({}, [openAt?.n, turns]); // eslint-disable-line react-hooks/exhaustive-depsconst turn = turns && turnIdx != null && turnIdx >= 0 ? turns[turnIdx] : null;- // A step's details belong to its turn: picking another turn closes them.- useEffect(() => setSelected(null), [turn?.turn_id]);+ // A step's details belong to its turn: picking another turn closes them, and folds its helpers.+ useEffect(() => {+ setSelected(null);+ setOpenHelpers(new Set());+ }, [turn?.turn_id]);useEffect(() => {if (!turn) return;let live = true;@@ -269,7 +326,13 @@ export function StepsPanel({}, [tab, sessionId, turn?.turn_id]);const flagged = useMemo(() => new Set((issues?.issues || []).filter((i) => i.severity === "warn").map((i) => i.step_id)), [issues]);- const rows = useMemo(() => nest(steps), [steps]);+ const rows = useMemo(() => timelineRows(steps, turn?.workers || [], openHelpers), [steps, turn?.workers, openHelpers]);+ const toggleHelper = (id: string) => setOpenHelpers((s) => {+ const next = new Set(s);+ if (next.has(id)) next.delete(id);+ else next.add(id);+ return next;+ });const checks = steps.filter((s) => s.kind === "auto_approver" && !s.shadow);const inspecting = tab === "timeline" && !!selected && !!turn;const total = turn ? Math.max(1, turn.buckets.total || turn.duration_ms || 1) : 1;@@ -289,17 +352,21 @@ export function StepsPanel({<span className="steps-ticks">{ticks(total).map((x, i) => <span key={i}>{x}</span>)}</span><span className="steps-axis-time">{t("steps.axis.time")}</span></div>- {rows.map(({ step, depth }) => (+ {rows.map((row) => row.type === "helper" ? (+ <HelperRow key={`helper-${row.step.step_id}`} row={row} turn={turn} total={total} onToggle={() => toggleHelper(row.step.step_id)} />+ ) : row.type === "worker" ? (+ <WorkerRow key={`worker-${row.worker.turn_id}`} worker={row.worker} turn={turn} total={total} onOpen={onOpenSession} />+ ) : (<StepRow- key={step.step_id}- step={step}- depth={depth}+ key={row.step.step_id}+ step={row.step}+ depth={row.depth}turn={turn}total={total}- label={stepLabel(step, t)}- selected={selected === step.step_id}- issue={flagged.has(step.step_id)}- onSelect={() => setSelected(selected === step.step_id ? null : step.step_id)}+ label={stepLabel(row.step, t)}+ selected={selected === row.step.step_id}+ issue={flagged.has(row.step.step_id)}+ onSelect={() => setSelected(selected === row.step.step_id ? null : row.step.step_id)}/>))}</div>@@ -435,6 +502,62 @@ function StepRow({ step, depth, turn, total, label, selected, issue, onSelect }:);}+function barAt(started: number, duration: number | null, turn: RecordedTurn, total: number) {+ const left = Math.min(100, Math.max(0, ((started - turn.started_at) / total) * 100));+ const width = duration ? Math.min(100 - left, (duration / total) * 100) : 0;+ return { left: `${left}%`, width: width ? `${width}%` : undefined };+}++/** The summary row a helper's steps fold behind (OB-7, TD2-19). */+function HelperRow({ row, turn, total, onToggle }: {+ row: Extract<TimelineRow, { type: "helper" }>; turn: RecordedTurn; total: number; onToggle: () => void;+}) {+ const { t } = useTranslation();+ return (+ <button+ className="steps-row k-tool steps-helper"+ onClick={onToggle}+ aria-expanded={row.open}+ title={row.open ? t("steps.helper.hide") : t("steps.helper.show")}+ data-testid="steps-helper"+ >+ <span className="steps-label" style={{ paddingLeft: row.depth * 16 }}>+ <span className="steps-fold" aria-hidden>{row.open ? "▾" : "▸"}</span>+ <span className="steps-name">{helperSummary(row.step, row.children, t)}</span>+ </span>+ <span className="steps-track"><span className="steps-bar" style={barAt(row.step.started_at, row.step.duration_ms, turn, total)} /></span>+ <span className="steps-time">{formatDuration(row.step.duration_ms)}</span>+ </button>+ );+}++/** A team worker's turn this turn woke (OB-7): one row, worked out on read; its tokens are the+ * worker's, shown here for reading only. */+function WorkerRow({ worker, turn, total, onOpen }: {+ worker: RecordedWorkerRow; turn: RecordedTurn; total: number; onOpen?: (sessionId: string) => void;+}) {+ const { t } = useTranslation();+ const label = worker.name+ ? t("steps.worker.row", { name: worker.name, seq: worker.seq ?? "?" })+ : t("steps.worker.row_unnamed", { seq: worker.seq ?? "?" });+ return (+ <div className="steps-row k-model steps-worker" title={t("steps.worker.title")} data-testid="steps-worker">+ <span className="steps-label">+ <span className="steps-kind" />+ <span className="steps-name">{label}</span>+ <span className="steps-badge">{(worker.at_least ? "≥ " : "") + t("steps.worker.tokens", { tokens: formatTokens(worker.tokens) })}</span>+ {onOpen && (+ <button className="steps-worker-open" onClick={() => onOpen(worker.session_id)} data-testid="steps-worker-open">+ {t("steps.worker.open")}+ </button>+ )}+ </span>+ <span className="steps-track"><span className="steps-bar" style={barAt(worker.started_at, worker.duration_ms, turn, total)} /></span>+ <span className="steps-time">{formatDuration(worker.duration_ms)}</span>+ </div>+ );+}+// -- Issues (OB-3) --------------------------------------------------------------------------------/** One title per check, and per kind for the context check (mock review M2-R4). */diff --git a/surfaces/gui/src/locales/en.json b/surfaces/gui/src/locales/en.jsonindex 751d1c56..419aa5cb 100644--- a/surfaces/gui/src/locales/en.json+++ b/surfaces/gui/src/locales/en.json@@ -3292,6 +3292,26 @@"unknown": "unknown"},"after_turn": "after the turn",+ "helper": {+ "summary_one": "Helper {{index}} · {{count}} step · {{tokens}} tokens · {{status}}",+ "summary_other": "Helper {{index}} · {{count}} steps · {{tokens}} tokens · {{status}}",+ "status": {+ "ok": "ok",+ "step_limit": "hit its step limit",+ "error": "failed",+ "interrupted": "stopped",+ "running": "running"+ },+ "show": "Show the helper's steps",+ "hide": "Hide the helper's steps"+ },+ "worker": {+ "row": "Worker {{name}} · turn {{seq}}",+ "row_unnamed": "Worker · turn {{seq}}",+ "tokens": "{{tokens}} tokens",+ "open": "Open worker session ↗",+ "title": "A turn of a team worker this turn woke. Its tokens are in the worker's own total, not this session's."+ },"detail": {"status": "Status","started": "Started at",diff --git a/surfaces/gui/src/locales/zh.json b/surfaces/gui/src/locales/zh.jsonindex 2fabf3f4..461d6012 100644--- a/surfaces/gui/src/locales/zh.json+++ b/surfaces/gui/src/locales/zh.json@@ -3243,6 +3243,25 @@"unknown": "未知"},"after_turn": "轮次结束后",+ "helper": {+ "summary_other": "助手 {{index}} · {{count}} 个步骤 · {{tokens}} 个 token · {{status}}",+ "status": {+ "ok": "完成",+ "step_limit": "达到步骤上限",+ "error": "失败",+ "interrupted": "已停止",+ "running": "运行中"+ },+ "show": "显示助手的步骤",+ "hide": "隐藏助手的步骤"+ },+ "worker": {+ "row": "同事 {{name}} · 第 {{seq}} 轮",+ "row_unnamed": "同事 · 第 {{seq}} 轮",+ "tokens": "{{tokens}} 个 token",+ "open": "打开同事的会话 ↗",+ "title": "本轮唤醒的团队同事的一轮。它的 token 计入该同事自己的总量,不计入本会话。"+ },"detail": {"status": "状态","started": "开始于",diff --git a/surfaces/gui/src/styles.css b/surfaces/gui/src/styles.cssindex 7eb407b5..ddbef992 100644--- a/surfaces/gui/src/styles.css+++ b/surfaces/gui/src/styles.css@@ -2493,6 +2493,12 @@ html[data-theme="dark"] { --bar-model:#4c8dff; --bar-tool:#3fb8ad; --bar-wait:#3.steps-badge { font-size:10px; line-height:1.5; border-radius:4px; padding:0 4px; flex:0 1 auto; min-width:0; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; background:var(--paper); color:var(--muted); }.steps-badge.err { background:var(--danger-soft); color:var(--danger); }.steps-badge.warn { background:var(--warn-soft); color:var(--warn-ink); }+/* Helper summary rows and team worker rows (OB-7): work done elsewhere, drawn lighter. */+.steps-fold { width:10px; flex:none; color:var(--muted); }+.steps-helper .steps-bar, .steps-worker .steps-bar { opacity:.35; }+.steps-worker { cursor:default; }+.steps-worker-open { border:0; background:none; padding:0; color:var(--accent); font:inherit; cursor:pointer; white-space:nowrap; }+.steps-worker-open:hover { text-decoration:underline; }/* One step's details (OB-2, OB-11): the inspector beside the list. */.steps-insp { position:relative; padding:12px 14px 20px; overflow:auto; min-height:0; font-size:var(--fs-ui); }