diff --git a/docs/swarm/ui.md b/docs/swarm/ui.md index 934a81531..56d1a901d 100644 --- a/docs/swarm/ui.md +++ b/docs/swarm/ui.md @@ -71,9 +71,7 @@ badge for a paused agent, and the tokens in its context and billed. The row reads "no report yet" until the first report arrives, and for an agent that's offline. The agent sends a report when its state changes and once a minute. If the browser gives up on the stream, a **reconnect** badge opens it again. The -terminal's own tab keeps these badges, with the model and the effort, beside the -connection badge; the turn-state badge says how long the agent has been in that -state. +terminal's own tab keeps these badges, with the model, beside the connection badge. On a terminal's own page (`/agents//terminal`, or a subagent's) the header has an **N running subagents** badge. It opens a list of the agent's @@ -99,10 +97,6 @@ you flip it. It also hides the **components** tab, a page for developers, which still answers at `/components`. The browser keeps the choice for the swarm UI, apart from the per-agent pages'. -The menu also has an **expand tool output** toggle. It opens tool-output rows -expanded; rows already on screen keep their state, and rows that arrive after -you flip it follow it. - A terminal's own tab takes the agent's icon as its browser-tab icon, so tabs of different agents tell apart. A subagent's tab shows its agent's icon. An agent with no icon keeps the hyperhive mark. @@ -360,11 +354,7 @@ box. **send** hands the text to the agent's harness, and the agent takes it as an inbox message from your authelia username. **sent** means the harness was listening and holds the message. If the harness isn't running, or isn't connected to the swarm queue, the box shows an error and the agent gets nothing. -While the agent is in a turn, a **cancel turn** badge appears among the state -badges over the terminal, in its own tab. It asks the agent's harness to stop -the turn, then shows whether one was running ("turn cancelled" or "nothing was -running"); a failure shows "cancel failed" with the reason on hover, and a click -tries again. Subagents have no message box and no cancel badge. +Subagents have no message box. The message doesn't go through the agent's hive, so the hive dashboard's message history doesn't list it. The agent's answer shows in its terminal; an diff --git a/frontend/packages/agent/src/Root.tsx b/frontend/packages/agent/src/Root.tsx index 87fb0881b..831e97ec9 100644 --- a/frontend/packages/agent/src/Root.tsx +++ b/frontend/packages/agent/src/Root.tsx @@ -12,7 +12,7 @@ import { useApplyMotionOverride } from "@hive/shared/motion-apply.js"; import { Header } from "./components/Header.js"; import { MetaNav } from "./components/MetaNav.js"; import { AgentUserMenu } from "./components/AgentUserMenu.js"; -import { ExpandDetailsSetting } from "@hive/shared/expand-details-setting.js"; +import { ExpandDetailsSetting } from "./components/ExpandDetailsSetting.js"; import { HideDebugSetting } from "@hive/shared/hide-debug-setting.js"; import { StatusChips } from "./components/StatusChips.js"; import { LiveStream, type LiveStreamHandle } from "./components/LiveStream.js"; diff --git a/frontend/packages/shared/src/settings/ExpandDetailsSetting.tsx b/frontend/packages/agent/src/components/ExpandDetailsSetting.tsx similarity index 52% rename from frontend/packages/shared/src/settings/ExpandDetailsSetting.tsx rename to frontend/packages/agent/src/components/ExpandDetailsSetting.tsx index 859e1a10c..0aed69279 100644 --- a/frontend/packages/shared/src/settings/ExpandDetailsSetting.tsx +++ b/frontend/packages/agent/src/components/ExpandDetailsSetting.tsx @@ -1,10 +1,18 @@ -// Settings-menu row: "expand tool output". Rendered as a `` -// child (`./SettingsMenu.js`) by each page that has a terminal, the per-agent -// page and the swarm UI, rather than as a prop on the menu: the caller owns its -// row, and the menu stays free of options only some pages use. Both read the -// same preference (`../prefs.js`), which `../terminal/Row.tsx` follows live. +// Agent-terminal-only settings-menu row: "expand tool output panels". +// Rendered as a `` child (`@hive/shared/settings-menu.js`) +// rather than a prop on that shared component — `SettingsMenu` is also +// used by swarm-ui, which has no terminal to apply this to, and a prior +// attempt to gate it behind a boolean prop (`showExpandDetails`) on the +// shared component drew mara's review: "you cannot just add it like +// this - if we have more and more options there in different places we +// will keep accumulating cruft in the shared component." This file owns +// its own state/storage entirely; `SettingsMenu` just renders it as a +// child, no different from any other consumer's markup. import { useState } from "preact/hooks"; -import { getExpandDetailsPref, setExpandDetailsPref } from "../prefs.js"; +import { + getExpandDetailsPref, + setExpandDetailsPref, +} from "@hive/shared/prefs.js"; export function ExpandDetailsSetting() { // Plain localStorage read, not a hook-managed override like diff --git a/frontend/packages/shared/package.json b/frontend/packages/shared/package.json index 6a213ff13..03a31dacc 100644 --- a/frontend/packages/shared/package.json +++ b/frontend/packages/shared/package.json @@ -53,7 +53,6 @@ "./motion-apply.js": "./src/settings/motion-apply.ts", "./settings-menu.js": "./src/settings/SettingsMenu.tsx", "./hide-debug-setting.js": "./src/settings/HideDebugSetting.tsx", - "./expand-details-setting.js": "./src/settings/ExpandDetailsSetting.tsx", "./settings-menu.css": "./src/settings/SettingsMenu.css", "./user-menu.js": "./src/user-menu/UserMenu.tsx", "./user-menu.css": "./src/user-menu/UserMenu.css" diff --git a/frontend/packages/swarm-ui/src/agent/terminal/AgentTermPreview.tsx b/frontend/packages/swarm-ui/src/agent/terminal/AgentTermPreview.tsx index 2b725410e..96cf645dc 100644 --- a/frontend/packages/swarm-ui/src/agent/terminal/AgentTermPreview.tsx +++ b/frontend/packages/swarm-ui/src/agent/terminal/AgentTermPreview.tsx @@ -46,9 +46,7 @@ import { useSwarmAgentStateStream, type TokenUsage, } from "./useSwarmAgentStateStream.js"; -import { RelativeTime } from "../../ui/relative-time/RelativeTime.js"; import { AgentInputForm } from "./AgentInputForm.js"; -import { CancelTurnBadge } from "./CancelTurnBadge.js"; import "./AgentTermPreview.css"; const NEAR_BOTTOM_PX = 48; @@ -147,13 +145,7 @@ export function StateBadges({ <> - {header.turn_state} ( - ) - - } - title="how long the agent has been in this state" + value={header.turn_state} /> {/* Only the non-boring case gets a badge — a healthy running agent (`agent_state: "up"`) doesn't need one for the @@ -176,13 +168,6 @@ export function StateBadges({ } /> )} - {withModel && ( - - )} {ctx !== null && ( )} {header && } - {header && subagent === undefined && ( - - )} {!fullHeight && ( — "cancel turn" among the state badges over the terminal. -// Shown only while the agent is in a turn (`canCancel`). POSTs -// `/api/agents/{name}/cancel`; the answer says whether a turn was running, and -// the badge shows that (or the failure) in place of its label, so a cancel is -// never silently a no-op. The answer clears when the next turn starts -// (`statusOnTurnChange`), so every turn can be cancelled; a failure can also be -// retried by clicking it. -import { useEffect, useRef, useState } from "preact/hooks"; -import { Badge } from "@hive/shared/badge.js"; -import { readApiError } from "@hive/shared/api-error.js"; -import { - canCancel, - cancelNote, - cancelPath, - statusOnTurnChange, -} from "./cancel.js"; - -type CancelState = - | { status: "idle" } - | { status: "cancelling" } - | { status: "done"; acted: boolean } - | { status: "error"; detail: string }; - -export function CancelTurnBadge({ - agentName, - turnState, -}: { - agentName: string; - turnState: string; -}) { - const [state, setState] = useState({ status: "idle" }); - const prevTurn = useRef(undefined); - - useEffect(() => { - const next = statusOnTurnChange(state.status, prevTurn.current, turnState); - prevTurn.current = turnState; - if (next !== state.status) setState({ status: next } as CancelState); - }, [turnState]); - - async function cancel() { - setState({ status: "cancelling" }); - try { - const r = await fetch(cancelPath(agentName), { method: "POST" }); - if (!r.ok) { - const p = await readApiError(r); - setState({ - status: "error", - detail: p.detail ?? p.title ?? `status ${p.status ?? r.status}`, - }); - return; - } - const { acted } = (await r.json()) as { acted: boolean }; - setState({ status: "done", acted }); - } catch (err) { - setState({ status: "error", detail: String(err) }); - } - } - - if (state.status === "done") { - return ; - } - if (state.status === "error") { - return ( - - ); - } - if (!canCancel(turnState)) return null; - return ( - - ); -} diff --git a/frontend/packages/swarm-ui/src/agent/terminal/cancel.ts b/frontend/packages/swarm-ui/src/agent/terminal/cancel.ts deleted file mode 100644 index 6c25f2ddb..000000000 --- a/frontend/packages/swarm-ui/src/agent/terminal/cancel.ts +++ /dev/null @@ -1,41 +0,0 @@ -// What the terminal page decides about cancelling a turn, without a DOM. The -// controller answers `POST /api/agents/{name}/cancel` with whether a turn was -// running and was stopped (`acted`), so a cancel is never silently a no-op. - -/** Whether to offer the cancel button: while the agent is in a turn. */ -export function canCancel(turnState: string | undefined): boolean { - return turnState === "thinking"; -} - -/** The path a cancel is sent to. */ -export function cancelPath(agentName: string): string { - return `/api/agents/${encodeURIComponent(agentName)}/cancel`; -} - -/** What to tell the operator once the agent has answered. */ -export function cancelNote(acted: boolean): string { - return acted ? "turn cancelled" : "nothing was running"; -} - -/** What the cancel badge is showing. */ -export type CancelStatus = "idle" | "cancelling" | "done" | "error"; - -/** - * The badge's status once the agent's turn state moves from `prev` to `now`. - * The answer ("turn cancelled") stays up after the turn it stopped ends, and - * clears when the next turn starts, so that turn can be cancelled too. A - * failure clears as soon as its turn ends: with no turn running, there is - * nothing left to retry. - */ -export function statusOnTurnChange( - status: CancelStatus, - prev: string | undefined, - now: string | undefined, -): CancelStatus { - if (status === "cancelling") return status; - const wasIn = canCancel(prev); - const isIn = canCancel(now); - if (isIn && !wasIn) return "idle"; - if (!isIn && wasIn && status === "error") return "idle"; - return status; -} diff --git a/frontend/packages/swarm-ui/src/shell/Shell.tsx b/frontend/packages/swarm-ui/src/shell/Shell.tsx index 4d59b5d87..9966834f2 100644 --- a/frontend/packages/swarm-ui/src/shell/Shell.tsx +++ b/frontend/packages/swarm-ui/src/shell/Shell.tsx @@ -34,7 +34,6 @@ import { UserMenu } from "./UserMenu.js"; import { useHideDebug } from "./useHideDebug.js"; import { SettingsMenu } from "@hive/shared/settings-menu.js"; import { HideDebugSetting } from "@hive/shared/hide-debug-setting.js"; -import { ExpandDetailsSetting } from "@hive/shared/expand-details-setting.js"; import { useApplyThemeOverride } from "@hive/shared/theme-apply.js"; import { useApplyMotionOverride } from "@hive/shared/motion-apply.js"; import { isFullBleedRoute, visibleNavItems } from "./routes.js"; @@ -423,7 +422,6 @@ export function Shell({ children }: { children: ComponentChildren }) {
- diff --git a/frontend/packages/swarm-ui/test/cancel.test.mjs b/frontend/packages/swarm-ui/test/cancel.test.mjs deleted file mode 100644 index 41caebc43..000000000 --- a/frontend/packages/swarm-ui/test/cancel.test.mjs +++ /dev/null @@ -1,49 +0,0 @@ -// What the terminal page decides about cancelling a turn. Run by `npm test`. -import assert from "node:assert/strict"; -import { test } from "node:test"; -import { - canCancel, - cancelNote, - cancelPath, - statusOnTurnChange, -} from "../src/agent/terminal/cancel.ts"; - -test("cancel is offered while the agent is in a turn, and only then", () => { - assert.equal(canCancel("thinking"), true); - assert.equal(canCancel("idle"), false); - assert.equal(canCancel("compacting"), false); - assert.equal(canCancel(undefined), false); -}); - -test("the cancel path names the agent, escaped", () => { - assert.equal(cancelPath("iris"), "/api/agents/iris/cancel"); - assert.equal(cancelPath("a/b"), "/api/agents/a%2Fb/cancel"); -}); - -test("the note says whether a turn was stopped", () => { - assert.equal(cancelNote(true), "turn cancelled"); - assert.equal(cancelNote(false), "nothing was running"); -}); - -test("the answer stays after its turn ends and clears when the next starts", () => { - assert.equal(statusOnTurnChange("done", "thinking", "idle"), "done"); - assert.equal(statusOnTurnChange("done", "idle", "idle"), "done"); - assert.equal(statusOnTurnChange("done", "idle", "thinking"), "idle"); -}); - -test("a failure clears when its turn ends, or a new one starts", () => { - assert.equal(statusOnTurnChange("error", "thinking", "thinking"), "error"); - assert.equal(statusOnTurnChange("error", "thinking", "idle"), "idle"); - assert.equal(statusOnTurnChange("error", "idle", "thinking"), "idle"); -}); - -test("a cancel in flight is left alone", () => { - assert.equal( - statusOnTurnChange("cancelling", "thinking", "idle"), - "cancelling", - ); - assert.equal( - statusOnTurnChange("cancelling", "idle", "thinking"), - "cancelling", - ); -});