diff --git a/docs/web-ui.md b/docs/web-ui.md index 397122fc..d2775493 100644 --- a/docs/web-ui.md +++ b/docs/web-ui.md @@ -504,15 +504,6 @@ stops at the row's icon midline). ### Selection bar -Per-card action buttons (`R3ST4RT` / `ST0P` / `ST4RT` / `R3BU1LD` / -`DESTR0Y` / `PURG3`) used to live on each container row; the -operator picked the bulk-bar model instead. Clicking an agent's -icon toggles its selection (an in-memory `Set`); `Esc` or -the bar's `✕ clear` button drops everything. The selection -persists across tab switches in-memory — the bar just hides on -non-SW4RM tabs since other tabs don't show the agent cards needed -to cross-reference. - When one or more agents are selected (via icon click), a sticky frosted-mauve bar slides up from the bottom of the viewport (`#selection-bar`, `position: fixed; bottom: 0`). It shows: @@ -522,15 +513,15 @@ frosted-mauve bar slides up from the bottom of the viewport support the action; disabled with a tooltip naming the blockers when the selection is mixed: - `↺ R3ST4RT` — running agents only - - `■ ST0P` — running agents only + - `■ ST0P` — running agents only (manager included; no special-case) - `▶ ST4RT` — stopped agents only - `↻ R3BU1LD` — always available - `DESTR0Y` / `PURG3` — sub-agents only (disabled if manager selected) - `⇡ M0V3 → ROOT` (#486) — promote selected agents to top-level (parent = null); disabled when all selected are already at root. - Backend `topology::set_parent` refuses moves it can't satisfy - (e.g. moving the manager) and the refusal surfaces in the - failure roll-up. + Manager included with no special-case (matches the `ST0P` policy); + the backend's `topology::set_parent` refuses to move the manager + and the refusal surfaces in the failure roll-up. - `⇢ M0V3 → [select]` (#486) — inline picker available for any selection size. The dropdown lists every container that isn't IN the selection itself nor a descendant of any selected agent diff --git a/frontend/packages/dashboard/src/tabs.js b/frontend/packages/dashboard/src/tabs.js index db8ef08e..b0b3ef54 100644 --- a/frontend/packages/dashboard/src/tabs.js +++ b/frontend/packages/dashboard/src/tabs.js @@ -287,11 +287,11 @@ window.marked = marked; if (s) renderContainers(s); } - // ─── selection ────────────────────────────────────────────────────── - // In-memory set of selected agent logical names backing the sticky - // #selection-bar. See docs/web-ui.md::Selection bar for the - // interaction model (icon-click toggle, Esc/clear button drop, - // tab-gated visibility). + // ─── selection (#443) ─────────────────────────────────────────────── + // Set of selected agent logical names. Toggled by clicking the + // container-row icon. When non-empty, the sticky #selection-bar + // becomes visible with the bulk actions. Per-card action buttons + // are gone — actions live in the bar. const selectionState = new Set(); function toggleSelection(name) { if (selectionState.has(name)) selectionState.delete(name); @@ -534,7 +534,7 @@ window.marked = marked; // hyperhive mark (`/favicon.svg`, served by the dashboard // itself, always reachable). (issues #195, #202) const iconImg = el('img', { class: 'container-icon-img', alt: '' }); - // Icon is the selection toggle. Click → add/remove from + // #443: icon is the selection toggle. Click → add/remove from // `selectionState` → re-render. role=button + tabindex makes it // keyboard-accessible; aria-pressed reflects the toggle state. const icon = el('div', { @@ -698,11 +698,15 @@ window.marked = marked; )); } - // Per-card action buttons (R3ST4RT / ST0P / ST4RT / R3BU1LD / - // DESTR0Y / PURG3) moved to the selection bar — see - // docs/web-ui.md::Selection bar. The contextual `needs update ↻` + // Per-card action buttons used to live here (R3ST4RT / ST0P / + // ST4RT / R3BU1LD / DESTR0Y / PURG3). Per mara on #443: "dont + // show all the restart buttons etc., just show state and links. + // instead, clicking an agent icon selects that agent." Actions + // moved into the sticky #selection-bar (see renderSelectionBar) + // which appears when the operator has at least one agent + // selected via the icon click. The contextual `needs update ↻` // chip in the head row stays — it's a state-hint, not an - // action button. + // action button per se. // ── drill-ins ──────────────────────────────────────────────── const drill = el('div', { class: 'drill-ins' }); @@ -726,13 +730,12 @@ window.marked = marked; renderSelectionBar(containers); } - // ─── selection bar ────────────────────────────────────────────────── - // Sticky-bottom strip; visible when ≥1 agent selected on the SW4RM - // tab. See docs/web-ui.md::Selection bar for the interaction model - // and the per-action availability rules (disabled-with-tooltip for - // actions that don't apply to the full selection). Actions POST per - // agent in a loop (endpoints are individually idempotent / - // event-covered, so no new bulk backend wire is needed). + // ─── selection bar (#443) ─────────────────────────────────────────── + // Sticky-bottom strip; visible when ≥1 agent selected. mara picked + // option B: show every action button, disable the ones that don't + // apply to the full selection, hover tooltip explains why. Actions + // POST per agent in a loop (no new backend wire — endpoints already + // exist and are individually idempotent / event-covered). function renderSelectionBar(containers) { const bar = $('selection-bar'); if (!bar) return; @@ -742,9 +745,11 @@ window.marked = marked; if (!countSpan || !namesSpan || !actions) return; const selected = containers.filter((c) => selectionState.has(c.name)); - // Tab-gate: bar only renders on SW4RM (the only tab with agent - // cards to cross-reference). Selection state lives in-memory and - // the bar reappears on return to SW4RM if still non-empty. + // #596: the bar's actions only make sense on the SW4RM tab — that's + // where the agent cards are visible to cross-reference against the + // selection. On other tabs the operator just sees a floating bar + // with no context, so hide it. Selection state persists in-memory + // and the bar reappears on return to SW4RM if still non-empty. const onSwarmTab = (document.body.dataset.activeTab || 'swarm') === 'swarm'; if (!selected.length || !onSwarmTab) { bar.hidden = true; @@ -780,6 +785,12 @@ window.marked = marked; confirm: (names) => `restart ${names.length} agent${names.length === 1 ? '' : 's'} (${names.join(', ')})?`, disabledTitle: why('↺ R3ST4RT', stoppedNames.map((n) => `\`${n}\` is stopped`)), }); + // #443 also lifts the manager-stop guard: when the whole selection + // is running, ST0P applies — manager included. host-side hive-c0re + // keeps serving the dashboard either way + per-agent approvals + + // meta-input updates still work without the manager up, so we + // don't special-case the confirm prompt when the manager is in + // the selection (mara: "dont special case manager for stopping"). addBulkButton(actions, 'btn-stop', '■ ST0P', allRunning, selected, { action: '/kill/', confirm: (names) => `stop ${names.length} agent${names.length === 1 ? '' : 's'} (${names.join(', ')})?`, @@ -826,12 +837,14 @@ window.marked = marked; addMoveActions(actions, selected, containers); } - // Render the M0V3 affordances inside the selection bar — separate - // helper because the picker variant needs a select + button pair, - // not the single-button shape addBulkButton ships. Backend - // `topology::set_parent` refuses moves it can't satisfy (manager - // included) and the refusal surfaces in the bulk-action error - // roll-up. + // #486 — render the M0V3 affordances inside the selection bar. Split + // into its own helper because the picker variant needs a select + button + // pair, not the single-button shape addBulkButton ships. + // + // No client-side manager special-case (mara on #695): backend + // `topology::set_parent` refuses to move the manager and surfaces the + // refusal as a per-agent failure in the bulk-action error roll-up. Same + // pattern as #443 ST0P (which also doesn't special-case manager). function addMoveActions(parent, selected, containers) { // M0V3 → ROOT: parent=null for every selected agent. Only meaningful // when at least one selected agent currently has a non-null parent; @@ -3253,9 +3266,9 @@ window.marked = marked; if (tab) tab.classList.toggle('active', t === target); if (pane) pane.classList.toggle('tab-pane-active', t === target); } - // Track active tab on the body so renderSelectionBar can gate - // visibility (bar only belongs on SW4RM where agent cards live). - // Re-render the bar so the toggle takes effect immediately + // #596: track active tab on the body so renderSelectionBar can + // gate visibility (bar only belongs on SW4RM where agent cards + // live). Re-render the bar so the toggle takes effect immediately // on hashchange without waiting for the next SSE update. document.body.dataset.activeTab = target; renderSelectionBar(Array.from(containersState.values()));