Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

feat(ui): simplify sidebar with tools and profile navigation

rubenluetke10-beep05b87c6af311
diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.section-health.test.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.section-health.test.tsx
index c6c4b82df5..796ed16e7b 100644
--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.section-health.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.section-health.test.tsx
@@ -8,7 +8,7 @@
* fresh install isn't permanently flagged.
*/
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { cleanup, render as rtlRender, screen } from "@testing-library/react";
+import { cleanup, fireEvent, render as rtlRender, screen } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import type { SectionHealth } from "@/hooks/useProviders";
@@ -71,6 +71,8 @@ describe("Sidebar — API-Keys alert dot", () => {
tts: { status: "ok", reason: "ok", detail: "", subject_id: "gemini-flash-tts" },
};
render(<Sidebar />);
+ expect(screen.getByTestId("sidebar-profile-attention")).toBeTruthy();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
const dot = screen.getByTestId("nav-alert-apikeys");
expect(dot).toBeTruthy();
expect(dot.className).toMatch(/bg-destructive/);
diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx
index d2e06c3600..44fa25ea80 100644
--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.test.tsx
@@ -8,6 +8,7 @@ import {
SIDEBAR_RAIL_AT_WIDTH,
SIDEBAR_RAIL_WIDTH,
} from "@/components/layout/Sidebar";
+import { NAV_GROUPS, NAV_FOOTER_ITEMS } from "@/components/layout/navGroups";
import { useEventStore } from "@/store/events";
import { useHomeStore } from "@/store/home";
import { useIdeChatStore } from "@/store/ideChat";
@@ -271,6 +272,7 @@ describe("Sidebar brain footer", () => {
useEventStore.setState({ brainProvider: "claude-api", brainModel: "claude-opus-4-8" });
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByText("Claude (API)")).toBeTruthy();
const modelLine = screen.getByTestId("sidebar-brain-model");
@@ -281,6 +283,7 @@ describe("Sidebar brain footer", () => {
useEventStore.setState({ brainProvider: "gemini", brainModel: "" });
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByText("Gemini")).toBeTruthy();
expect(screen.queryByTestId("sidebar-brain-model")).toBeNull();
@@ -289,6 +292,7 @@ describe("Sidebar brain footer", () => {
test("follows a live model change", () => {
useEventStore.setState({ brainProvider: "claude-api", brainModel: "claude-opus-4-8" });
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByTestId("sidebar-brain-model").textContent).toBe("claude-opus-4-8");
act(() => {
@@ -333,6 +337,7 @@ describe("Sidebar footer in realtime voice mode", () => {
};
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByTestId("sidebar-footer-tier").textContent).toBe("Realtime");
expect(screen.getByText("Gemini Live")).toBeTruthy();
@@ -359,6 +364,7 @@ describe("Sidebar footer in realtime voice mode", () => {
};
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByText("OpenAI Realtime")).toBeTruthy();
expect(screen.getByTestId("sidebar-brain-model").textContent).toBe("gpt-realtime-2.1");
@@ -376,6 +382,7 @@ describe("Sidebar footer in realtime voice mode", () => {
};
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByTestId("sidebar-footer-tier").textContent).toBe("Brain");
expect(screen.getByText("OpenRouter")).toBeTruthy();
@@ -394,6 +401,7 @@ describe("Sidebar footer in realtime voice mode", () => {
};
renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
expect(screen.getByTestId("sidebar-footer-tier").textContent).toBe("Realtime");
expect(screen.getByText("Vertex AI Live")).toBeTruthy();
@@ -567,9 +575,7 @@ describe("Sidebar icon rail", () => {
renderSidebar(SIDEBAR_DEFAULT_WIDTH);
expect(screen.getByTestId("sidebar").dataset.railed).toBe("false");
- // "Tools" starts folded so the column fits 1080 px; its label is the fold.
- expect(screen.getByTestId("nav-group-tools").dataset.open).toBe("false");
- fireEvent.click(screen.getByTestId("nav-group-toggle-tools"));
+ fireEvent.click(screen.getByTestId("sidebar-tools-toggle"));
// The label is ON the row, and names the workspace rather than carrying
// the retired generic "Chat" label shown in the product screenshot.
expect(screen.getByTestId("nav-row-agentic-ide").textContent).toContain(
@@ -586,38 +592,25 @@ describe("Sidebar icon rail", () => {
// shows half a word per row and reads as a rendering fault, so it is
// skipped rather than rendered at the dragged width.
expect(aside.style.width).toBe(`${SIDEBAR_RAIL_WIDTH}px`);
- expect(screen.getByTestId("nav-row-agentic-ide").textContent?.trim()).toBe(
- "",
- );
+ expect(screen.getByTestId("nav-row-agents").getAttribute("aria-label")).toBeTruthy();
});
test("keeps every destination named once its label is off the screen", () => {
renderSidebar(SIDEBAR_RAIL_WIDTH);
- // The label survives as the accessible name, and the rail draws its own
- // label beside the icon on hover — it is off the row, not gone. (No native
- // title: a browser tooltip on top of the rail's label would be a second,
- // late label.) WHAT they say is the locale's business.
- const row = screen.getByTestId("nav-row-agentic-ide");
+ const row = screen.getByTestId("nav-row-agents");
expect(row.getAttribute("aria-label")).toBeTruthy();
- expect(row.getAttribute("title")).toBeNull();
- act(() => {
- row.focus();
- row.dispatchEvent(new FocusEvent("focusin", { bubbles: true }));
- });
- expect(screen.getByTestId("dock-label").textContent).toContain(
- row.getAttribute("aria-label"),
- );
+ expect(row.getAttribute("title")).toBe(row.getAttribute("aria-label"));
});
test("still switches section on a click", () => {
renderSidebar(SIDEBAR_RAIL_WIDTH);
act(() => {
- screen.getByTestId("nav-row-agentic-ide").click();
+ screen.getByTestId("nav-row-agents").click();
});
- expect(useEventStore.getState().activeSection).toBe("agentic-ide");
+ expect(useEventStore.getState().activeSection).toBe("agents");
});
test("keeps the rail canvas transparent and the active control glassy", () => {
@@ -735,204 +728,62 @@ describe("Sidebar collapse toggle", () => {
});
});
-describe("the Agentic IDE's chat face", () => {
- /*
- * Chat mode in the IDE turns this column into the workspace's session
- * list and nothing else. The sections are one button away, and a row at
- * the top of them brings the chats back; every entry into chat mode
- * opens on the chats again (maintainer, 2026-08-27).
- */
+describe("compact sidebar navigation", () => {
beforeEach(() => {
- useIdeChatStore.setState({
- view: "chat",
- workspace: { id: "w1", name: "Personal Jarvis", path: "/work/jarvis" },
- workspaces: [{ id: "w1", name: "Personal Jarvis", folder: "/work/jarvis", active: true }],
- });
- });
-
- afterEach(() => {
- useIdeChatStore.setState({
- view: "grid",
- workspace: null,
- workspaces: [],
- });
- });
-
- test("shows only the workspace's chats by default", () => {
- useEventStore.setState({ activeSection: "agentic-ide" });
-
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- expect(screen.getByTestId("workspace-chats")).toBeTruthy();
- expect(screen.queryByTestId("nav-row-settings")).toBeNull();
- expect(screen.getByTestId("sidebar-show-sections")).toBeTruthy();
- });
-
- test("reaches the sections behind one button and comes back", () => {
- useEventStore.setState({ activeSection: "agentic-ide" });
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- act(() => {
- screen.getByTestId("sidebar-show-sections").click();
- });
- expect(screen.getByTestId("nav-row-settings")).toBeTruthy();
- expect(screen.queryByTestId("workspace-chats")).toBeNull();
-
- act(() => {
- screen.getByTestId("sidebar-show-chats").click();
- });
- expect(screen.getByTestId("workspace-chats")).toBeTruthy();
- expect(screen.queryByTestId("nav-row-settings")).toBeNull();
- });
-
- test("the IDE's own row is a request for its chats", () => {
- // From the sections, pressing the row the IDE itself answers to must not
- // leave the sections standing: it is the way back as much as the button.
- useEventStore.setState({ activeSection: "agentic-ide" });
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- act(() => {
- screen.getByTestId("sidebar-show-sections").click();
- });
- act(() => {
- screen.getByTestId("nav-row-agentic-ide").click();
- });
-
- expect(screen.getByTestId("workspace-chats")).toBeTruthy();
- expect(screen.queryByTestId("nav-row-settings")).toBeNull();
- });
-
- test("opens on the chats again after the IDE was left and returned to", () => {
- useEventStore.setState({ activeSection: "agentic-ide" });
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- act(() => {
- screen.getByTestId("sidebar-show-sections").click();
- });
- act(() => {
- screen.getByTestId("nav-row-settings").click();
- });
- // Another section: plain navigation, no way "back" to offer.
- expect(screen.queryByTestId("workspace-chats")).toBeNull();
- expect(screen.queryByTestId("sidebar-show-chats")).toBeNull();
-
- act(() => {
- useEventStore.setState({ activeSection: "agentic-ide" });
- });
- expect(screen.getByTestId("workspace-chats")).toBeTruthy();
- expect(screen.queryByTestId("nav-row-settings")).toBeNull();
- });
-
- /*
- * The launcher for one more workspace deactivates the front tab while it
- * asks for a folder — and that must not take the list of running
- * workspaces away with it, which is what a takeover gated on the ACTIVE
- * workspace did.
- */
- test("keeps the chats while another workspace is being opened", () => {
- useEventStore.setState({ activeSection: "agentic-ide" });
- useIdeChatStore.setState({ workspace: null });
-
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- expect(screen.getByTestId("workspace-chats")).toBeTruthy();
- });
-
- test("drops the chat face once nothing is open at all", () => {
- useEventStore.setState({ activeSection: "agentic-ide" });
- useIdeChatStore.setState({ workspace: null, workspaces: [] });
-
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- expect(screen.queryByTestId("workspace-chats")).toBeNull();
- expect(screen.queryByTestId("sidebar-show-chats")).toBeNull();
- expect(screen.getByTestId("nav-row-settings")).toBeTruthy();
- });
-
- test("leaves every other section its plain navigation", () => {
- // The IDE is in chat mode, but the user is reading another section: its
- // workspace list has no business standing in that column.
- useEventStore.setState({ activeSection: "settings" });
-
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- expect(screen.queryByTestId("workspace-chats")).toBeNull();
- expect(screen.queryByTestId("sidebar-show-chats")).toBeNull();
- expect(screen.getByTestId("nav-row-settings")).toBeTruthy();
- });
-});
-
-describe("the Chat row's history", () => {
- /*
- * The recent conversations hang under the Chat row and fold out on the
- * row's chevron. The row itself keeps opening the chat: reaching the
- * section must not unfold the list, and the fold is remembered.
- */
- beforeEach(() => {
- vi.stubGlobal(
- "fetch",
- vi.fn(async (url: string) =>
- String(url).startsWith("/api/chats")
- ? new Response(JSON.stringify([]), { status: 200 })
- : new Response(JSON.stringify({ sessions: [] }), { status: 200 }),
- ),
- );
- window.localStorage.clear();
- useEventStore.setState({ connected: true, activeSection: "board", conversations: [] });
+ useEventStore.setState({ activeSection: "chats", connected: true });
+ useIdeChatStore.setState({ workspaces: [], view: "chat" });
});
+ afterEach(() => cleanup());
- afterEach(() => {
- cleanup();
- vi.unstubAllGlobals();
- window.localStorage.clear();
+ test("keeps core destinations above visible recent chats", () => {
+ renderSidebar();
+ for (const id of ["agents", "visualization", "tasks", "plugins", "marketplace"]) {
+ expect(screen.getByTestId(`nav-row-${id}`)).toBeTruthy();
+ }
+ expect(screen.getByTestId("recent-chats")).toBeTruthy();
+ expect(screen.queryByTestId("nav-row-wallpaper")).toBeNull();
+ expect(screen.queryByTestId("nav-row-memory")).toBeNull();
});
- test("folds out on the chevron, not on the row", () => {
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
-
- expect(screen.queryByTestId("recent-chats")).toBeNull();
-
- act(() => {
- screen.getByTestId("nav-row-chats").click();
- });
- // The row went to the chat and left the list alone.
- expect(useEventStore.getState().activeSection).toBe("chats");
- expect(screen.queryByTestId("recent-chats")).toBeNull();
-
- act(() => {
- screen.getByTestId("nav-expand-chats").click();
- });
- expect(screen.getByTestId("nav-expand-chats").getAttribute("aria-expanded")).toBe("true");
+ test("expands tools through More without duplicating rows", () => {
+ renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-tools-toggle"));
+ expect(screen.getByTestId("nav-row-memory")).toBeTruthy();
+ fireEvent.click(screen.getByTestId("sidebar-more-toggle"));
+ expect(screen.getAllByTestId("nav-row-memory")).toHaveLength(1);
+ fireEvent.click(screen.getByTestId("nav-row-memory"));
+ expect(useEventStore.getState().activeSection).toBe("memory");
+ fireEvent.click(screen.getByTestId("sidebar-more-toggle"));
+ expect(screen.queryByTestId("nav-row-memory")).toBeNull();
expect(screen.getByTestId("recent-chats")).toBeTruthy();
- // The list must not live in the chevron's positioning parent: `top-1/2`
- // would then sit in the middle of the chats and the rows would cover
- // the only control that hides them again.
- const chevron = screen.getByTestId("nav-expand-chats");
- const list = screen.getByTestId("recent-chats");
- expect(chevron.parentElement?.contains(list)).toBe(false);
-
- act(() => {
- screen.getByTestId("nav-expand-chats").click();
- });
- expect(screen.queryByTestId("recent-chats")).toBeNull();
});
- test("remembers the fold across a reload", () => {
- const first = renderSidebar(SIDEBAR_DEFAULT_WIDTH);
- act(() => {
- screen.getByTestId("nav-expand-chats").click();
- });
- first.unmount();
+ test("opens settings from the profile and closes after navigation", () => {
+ renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
+ fireEvent.click(screen.getByTestId("nav-row-wallpaper"));
+ expect(useEventStore.getState().activeSection).toBe("wallpaper");
+ expect(screen.queryByTestId("sidebar-profile-panel")).toBeNull();
+ });
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
- expect(screen.getByTestId("recent-chats")).toBeTruthy();
+ test("dismisses the profile with Escape and restores focus", () => {
+ renderSidebar();
+ const trigger = screen.getByTestId("sidebar-profile-toggle");
+ fireEvent.click(trigger);
+ fireEvent.keyDown(document, { key: "Escape" });
+ expect(screen.queryByTestId("sidebar-profile-panel")).toBeNull();
+ expect(document.activeElement).toBe(trigger);
+ fireEvent.click(trigger);
+ fireEvent.pointerDown(document.body);
+ expect(screen.queryByTestId("sidebar-profile-panel")).toBeNull();
});
- test("no longer stands above the navigation as its own block", () => {
- renderSidebar(SIDEBAR_DEFAULT_WIDTH);
- // The old free-standing group is gone: nothing lists chats until the
- // Chat row is opened.
- expect(screen.queryByTestId("recent-chats")).toBeNull();
- expect(screen.getByTestId("nav-row-chats")).toBeTruthy();
+ test("every registered destination remains reachable", () => {
+ renderSidebar();
+ fireEvent.click(screen.getByTestId("sidebar-more-toggle"));
+ fireEvent.click(screen.getByTestId("sidebar-profile-toggle"));
+ for (const item of [...NAV_GROUPS.flat(), ...NAV_FOOTER_ITEMS]) {
+ expect(screen.getByTestId(`nav-row-${item.id}`)).toBeTruthy();
+ }
});
});
diff --git a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
index ff75caa1f9..d27b6c696a 100644
--- a/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
+++ b/jarvis/ui/web/frontend/src/components/layout/Sidebar.tsx
@@ -1,22 +1,22 @@
import {
Loader2,
ChevronDown,
- ChevronLeft,
ChevronRight,
- LayoutList,
+ Folder,
+ MoreHorizontal,
+ Store,
+ UserCircle2,
PanelLeftClose,
PanelLeftOpen,
Plus,
} from "lucide-react";
import {
NAV_FOOTER_ITEMS,
- NAV_GROUP_META,
NAV_GROUPS,
presentNavItem,
resolveNavLabel,
type NavItem,
} from "@/components/layout/navGroups";
-import { DockRail } from "@/components/layout/DockRail";
import { useEventStore } from "@/store/events";
import { useVoiceReadiness } from "@/hooks/useVoiceReadiness";
import { useVoiceMode } from "@/hooks/useVoiceMode";
@@ -25,7 +25,7 @@ import { usePluginAttention } from "@/hooks/usePluginAttention";
import { useVoiceEngineDisplay } from "@/hooks/useVoiceEngineDisplay";
import { clsx } from "clsx";
import { cn } from "@/lib/utils";
-import { useCallback, useEffect, useMemo, useState, type ReactNode } from "react";
+import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
import { useT } from "@/i18n";
import { BrowserRealtimeControl } from "@/components/voice/BrowserRealtimeControl";
import { SurfaceSwitch } from "@/components/home/SurfaceSwitch";
@@ -36,31 +36,9 @@ import { useAgentChatStore } from "@/store/agentChat";
import { useIdeChatStore } from "@/store/ideChat";
import { WorkspaceChats } from "@/components/agentic/WorkspaceChats";
import { useAppInstance } from "@/hooks/useAppInstance";
+import { usePublishIdentity } from "@/components/marketplace/PublishIdentity";
import { GigiMark } from "@/components/GigiMark";
-/** Where the Chat row remembers whether its history is folded out. */
-const CHATS_OPEN_KEY = "jarvis.sidebar.recent-chats-open";
-
-/** Where each nav group remembers whether it is folded. One key per group. */
-const GROUP_OPEN_KEY = "jarvis.sidebar.group-open.v1";
-
-function readGroupOpen(): Record<string, boolean> {
- try {
- const raw = window.localStorage.getItem(GROUP_OPEN_KEY);
- return raw ? (JSON.parse(raw) as Record<string, boolean>) : {};
- } catch {
- return {};
- }
-}
-
-function writeGroupOpen(state: Record<string, boolean>): void {
- try {
- window.localStorage.setItem(GROUP_OPEN_KEY, JSON.stringify(state));
- } catch {
- // Storage denied: the fold still works for this visit.
- }
-}
-
/*
* Why `clsx` and not `cn` on the rows below.
*
@@ -79,23 +57,6 @@ function writeGroupOpen(state: Record<string, boolean>): void {
* file is outside this change; once it lands these can go back to `cn`.
*/
-function readChatsOpen(): boolean {
- try {
- return window.localStorage.getItem(CHATS_OPEN_KEY) === "1";
- } catch {
- return false;
- }
-}
-
-function writeChatsOpen(open: boolean): void {
- try {
- window.localStorage.setItem(CHATS_OPEN_KEY, open ? "1" : "0");
- } catch {
- // Storage denied (private window, quota): the fold still works for
- // this visit, it just starts closed next time.
- }
-}
-
/**
* The section ids the Agentic IDE answers to.
*
@@ -267,54 +228,33 @@ export function Sidebar({
const ideWorkspaceOpen = useIdeChatStore((s) => s.workspaces.length > 0);
const onIdeSection = IDE_SECTIONS.includes(active);
const chatFace = onIdeSection && ideWorkspaceOpen && ideView === "chat";
- /*
- * Is the Chat row's history folded out?
- *
- * Opened by the chevron on the row, never by the row itself: pressing
- * "Chat" goes to the chat, and the list stays the way it was left. It is a
- * preference rather than a per-visit state — a sidebar that forgets which
- * rows were open every time the window reloads is one the user keeps
- * re-opening — so it survives a reload the way the sidebar's width does.
- */
- const [chatsOpen, setChatsOpen] = useState(readChatsOpen);
- const toggleChats = useCallback(() => {
- setChatsOpen((current) => {
- const next = !current;
- writeChatsOpen(next);
- return next;
- });
- }, []);
- /*
- * Which face the chat mode's column wears: the chats, or the sections.
- *
- * The chats, by default and on every entry into chat mode — the column is
- * the workspace's session list then and nothing else, because that is
- * what chat mode is for (maintainer, 2026-08-27: "only the chats, with a
- * button for the rest, and a way back"). The sections stand behind one
- * button at the foot of the list, and a "back" row at the top of the
- * sections brings the chats back. Pressing any section row leaves the
- * sections face too: a section outside the IDE takes the chat face away
- * with it, and the IDE's own row is a request for the IDE — its chats.
- * Not remembered on purpose: chat mode always opens on the chats.
- */
- const [sectionsShown, setSectionsShown] = useState(false);
+ const [toolsOpen, setToolsOpen] = useState(false);
+ const [moreOpen, setMoreOpen] = useState(false);
+ const [profileOpen, setProfileOpen] = useState(false);
+ const profileRef = useRef<HTMLDivElement>(null);
+ const profileButtonRef = useRef<HTMLButtonElement>(null);
+ const identity = usePublishIdentity();
useEffect(() => {
- if (chatFace) setSectionsShown(false);
- }, [chatFace]);
- /*
- * Which nav groups are folded. A group's default comes from NAV_GROUP_META
- * and the user's choice outranks it, remembered per group. A group that
- * holds the ACTIVE section is always shown open, so "where am I" is never
- * hidden behind a fold.
- */
- const [groupOpen, setGroupOpen] = useState<Record<string, boolean>>(readGroupOpen);
- const toggleGroup = useCallback((id: string, fallback: boolean) => {
- setGroupOpen((current) => {
- const next = { ...current, [id]: !(current[id] ?? fallback) };
- writeGroupOpen(next);
- return next;
- });
- }, []);
+ setProfileOpen(false);
+ }, [active]);
+ useEffect(() => {
+ if (!profileOpen) return;
+ const dismiss = (event: PointerEvent) => {
+ if (!profileRef.current?.contains(event.target as Node)) setProfileOpen(false);
+ };
+ const escape = (event: KeyboardEvent) => {
+ if (event.key === "Escape") {
+ setProfileOpen(false);
+ profileButtonRef.current?.focus();
+ }
+ };
+ document.addEventListener("pointerdown", dismiss);
+ document.addEventListener("keydown", escape);
+ return () => {
+ document.removeEventListener("pointerdown", dismiss);
+ document.removeEventListener("keydown", escape);
+ };
+ }, [profileOpen]);
const resetTranscript = useHomeStore((s) => s.resetTranscript);
// On the voice stage: clear the lane, drop the open voice thread and let the
// backend forget the one it was seeded with. We stay on Voice and the mic
@@ -428,6 +368,27 @@ export function Sidebar({
// the column narrow gets icons without having to also find the button.
const railed = collapsed || width < SIDEBAR_RAIL_AT_WIDTH;
+ const allItems = NAV_GROUPS.flat();
+ const findItem = (id: string) => allItems.find((item) => item.id === id)!;
+ const toolIds = ["memory", "board", "docs", "sessions", "run_inspector", "clis", "agentic-ide"];
+ const toolItems = toolIds.map(findItem);
+ const profileItems = [...NAV_GROUPS[3], ...NAV_GROUPS[4], ...NAV_FOOTER_ITEMS];
+ const primaryIds = ["chats", "agents", "visualization", "tasks", "plugins", "marketplace"];
+ const assignedIds = new Set([...primaryIds, ...toolIds, ...profileItems.map((item) => item.id)]);
+ const moreItems = [...toolItems, ...allItems.filter((item) => !assignedIds.has(item.id))];
+ const rowClass = "flex min-h-9 w-full items-center gap-2.5 rounded-md px-3 text-base font-medium text-muted-foreground transition-colors hover:bg-secondary hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring";
+ const renderRow = (raw: NavItem, compact = railed) => {
+ const item = presentNavItem(raw, surface);
+ return <NavRow key={item.id} item={item} label={resolveNavLabel(t, item)} compact={compact}
+ active={item.matchIds ? item.matchIds.includes(active) : item.id === active}
+ badge={item.id === "agents" ? agentsCount : undefined}
+ betaLabel={item.beta ? t("nav.agentic_ide_beta") : undefined}
+ alert={item.id === "apikeys" && apikeysHasError} alertTitle={t("sidebar.apikeys_alert")}
+ warn={item.id === "plugins" ? pluginsNeedReconnect : item.id === "local-models" && localModelsNeedAttention}
+ warnTitle={item.id === "local-models" ? localModelsHealth?.detail || localModelsHealth?.reason || undefined : pluginWarnTitle}
+ onClick={() => { setActive(item.id); setProfileOpen(false); }} />;
+ };
+
return (
// No right border: the draggable seam beside it draws that line now, and
// two 1px lines three pixels apart read as a rendering fault.
@@ -578,203 +539,66 @@ export function Sidebar({
)}
</div>
- {railed ? (
- // The rail is the app-wide icon dock: it carries the same signals (the
- // API-Keys error pip, the plugin reconnect pip, the Skills → Plugins
- // shortcut) from its own sources, so nothing here has to be threaded in.
- <DockRail className="min-h-0 flex-1" />
- ) : (
- // ONE scrolling body, whatever is in it. In the IDE's chat mode it is
- // the workspace's session list, with the sections one button away and
- // one button back (see `sectionsShown`); everywhere else it is the
- // navigation. One face at a time: the two stacked in one column read
- // as one long list with no seam (maintainer report 2026-08-27), and
- // the sessions are what chat mode is for.
- <div className="flex min-h-0 flex-1 flex-col overflow-y-auto scrollbar-jarvis">
- {chatFace && !sectionsShown ? (
- <>
- <WorkspaceChats />
- <button
- type="button"
- onClick={() => setSectionsShown(true)}
- data-testid="sidebar-show-sections"
- className={clsx(
- "group mx-2 mb-2 mt-3 flex h-9 shrink-0 items-center gap-2 rounded-md px-3 text-base font-medium transition-colors",
- "text-muted-foreground hover:bg-secondary hover:text-foreground",
- "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
- )}
- >
- <LayoutList
- aria-hidden
- className="h-4 w-4 shrink-0 text-muted-foreground transition-colors group-hover:text-foreground"
- />
- <span className="flex-1 text-left">{t("sidebar.sections")}</span>
- <ChevronRight
- aria-hidden
- className="h-4 w-4 shrink-0 text-muted-foreground transition-transform group-hover:translate-x-0.5 group-hover:text-foreground"
- />
- </button>
- </>
- ) : (
- // 8px in from the column edge, because the SELECTION is drawn on the
- // whole row now: the fill needs an inset to read as a rounded object
- // sitting in the rail rather than as a stripe welded to its side.
- <nav className="px-2 py-2">
- {chatFace && (
- <button
- type="button"
- onClick={() => setSectionsShown(false)}
- data-testid="sidebar-show-chats"
- className={clsx(
- "group mb-2 flex h-9 w-full items-center gap-2 rounded-md px-3 text-base font-medium transition-colors",
- "text-muted-foreground hover:bg-secondary hover:text-foreground",
- "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
- )}
- >
- <ChevronLeft
- aria-hidden
- className="h-4 w-4 shrink-0 text-muted-foreground transition-transform group-hover:-translate-x-0.5 group-hover:text-foreground"
- />
- <span className="flex-1 text-left">{t("sidebar.back_to_chats")}</span>
- </button>
- )}
- {NAV_GROUPS.map((group, groupIndex) => {
- const meta = NAV_GROUP_META[groupIndex];
- const collapsible = Boolean(meta?.labelKey);
- const holdsActive = group.some((raw) =>
- raw.matchIds ? raw.matchIds.includes(active) : raw.id === active,
- );
- const open =
- !collapsible ||
- holdsActive ||
- (groupOpen[meta.id] ?? meta.defaultOpen);
- const groupLabel = meta?.labelKey
- ? resolveNavLabel(t, {
- id: "chats",
- labelKey: meta.labelKey,
- icon: Plus,
- fallbackLabel: meta.fallbackLabel,
- })
- : null;
- return (
- <ul
- key={meta?.id ?? groupIndex}
- data-testid={meta ? `nav-group-${meta.id}` : undefined}
- data-open={open ? "true" : "false"}
- className={cn("space-y-0.5", groupIndex > 0 && "mt-5")}
- >
- {groupLabel && (
- <li>
- {/* The group label doubles as its fold. Uppercase, faint
- ink, the xs step — a heading, never a row. */}
- <button
- type="button"
- onClick={() => toggleGroup(meta.id, meta.defaultOpen)}
- aria-expanded={open}
- data-testid={`nav-group-toggle-${meta.id}`}
- className={clsx(
- "group mb-1 flex h-6 w-full items-center gap-1 rounded-sm px-3 text-xs font-medium uppercase tracking-wide",
- "text-foreground-faint transition-colors hover:text-muted-foreground",
- "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
- )}
- >
- <span className="flex-1 truncate text-left">{groupLabel}</span>
- <ChevronDown
- aria-hidden
- className={cn(
- "h-3 w-3 shrink-0 opacity-0 transition-[opacity,transform] group-hover:opacity-100 group-focus-visible:opacity-100",
- !open && "-rotate-90 opacity-100",
- )}
- />
- </button>
- </li>
- )}
- {open && group.map((raw) => {
- const item = presentNavItem(raw, surface);
- return (
- <NavRow
- key={item.id}
- item={item}
- label={resolveNavLabel(t, item)}
- active={item.matchIds ? item.matchIds.includes(active) : item.id === active}
- // The Chat row carries its own history: a chevron at
- // its end folds the recent conversations out under it.
- // One list, not two: a voice session IS a run, and
- // showing it as "recent run" and "recent chat" read as
- // a duplicate (maintainer, 2026-08-23). These are the
- // front page's own conversations, never the IDE's
- // coding sessions (see RecentChats) — the two never
- // name the same thing twice.
- expand={
- item.id === "chats"
- ? {
- open: chatsOpen,
- onToggle: toggleChats,
- label: chatsOpen
- ? t("sidebar.chats_collapse")
- : t("sidebar.chats_expand"),
- }
- : undefined
- }
- badge={item.id === "agents" ? agentsCount : undefined}
- betaLabel={item.beta ? t("nav.agentic_ide_beta") : undefined}
- alert={item.id === "apikeys" ? apikeysHasError : false}
- alertTitle={t("sidebar.apikeys_alert")}
- warn={
- item.id === "plugins"
- ? pluginsNeedReconnect
- : item.id === "local-models"
- ? localModelsNeedAttention
- : false
- }
- warnTitle={
- item.id === "local-models"
- ? localModelsHealth?.detail || localModelsHealth?.reason || undefined
- : pluginWarnTitle
- }
- onClick={() => {
- setSectionsShown(false);
- setActive(
- item.id,
- );
- }}
- >
- {item.id === "chats" && chatsOpen ? <RecentChats /> : null}
- </NavRow>
- );
- })}
- </ul>
- );
- })}
- </nav>
- )}
- </div>
- )}
+ <div className="flex min-h-0 flex-1 flex-col overflow-y-auto scrollbar-jarvis">
+ <nav aria-label={t("sidebar.sections")} className="space-y-1 px-2 py-2">
+ <ul className="space-y-1">
+ {renderRow(findItem("chats"))}
+ {renderRow(findItem("agents"))}
+ {renderRow(findItem("visualization"))}
+ </ul>
+ <button type="button" onClick={() => { setToolsOpen(!toolsOpen); setMoreOpen(false); }}
+ aria-expanded={toolsOpen} aria-controls="sidebar-tools" title={t("sidebar.jarvis_tools")}
+ data-testid="sidebar-tools-toggle" className={cn(rowClass, toolItems.some((item) => (item.matchIds ?? [item.id]).includes(active)) && "jarvis-nav-active bg-secondary text-foreground")}>
+ <Folder aria-hidden className="h-4 w-4 shrink-0" />
+ {!railed && <><span className="flex-1 text-left">{t("sidebar.jarvis_tools")}</span><ChevronDown className={cn("h-3.5 w-3.5", toolsOpen && "rotate-180")} /></>}
+ </button>
+ {toolsOpen && <ul id="sidebar-tools" className={cn("space-y-1", !railed && "ml-3 border-l border-border pl-1")}>
+ {toolItems.map((item) => renderRow(item))}
+ </ul>}
+ <ul className="space-y-1">
+ {renderRow({ ...findItem("tasks"), labelKey: "sidebar.scheduled" })}
+ {renderRow({ ...findItem("plugins"), labelKey: "nav.plugins" })}
+ </ul>
+ <button type="button" onClick={() => { setMoreOpen(!moreOpen); setToolsOpen(false); }} aria-expanded={moreOpen}
+ aria-controls="sidebar-more" title={t("sidebar.more")} data-testid="sidebar-more-toggle" className={rowClass}>
+ <MoreHorizontal aria-hidden className="h-4 w-4 shrink-0" />
+ {!railed && <span>{t(moreOpen ? "sidebar.show_less" : "sidebar.more")}</span>}
+ </button>
+ {moreOpen && <ul id="sidebar-more" className="space-y-1">{moreItems.map((item) => renderRow(item))}</ul>}
+ </nav>
+ {!railed && <section className="mt-4 px-2 pb-3" aria-label={t("sidebar.recent_chats")}>
+ <h2 className="px-3 pb-2 text-sm font-medium text-muted-foreground">{t("sidebar.recent_chats")}</h2>
+ {chatFace ? <WorkspaceChats /> : <RecentChats />}
+ </section>}
+ </div>
- <div className={cn("flex flex-col gap-1 border-t border-border", railed ? "p-2" : "p-3")}>
- {!railed &&
- NAV_FOOTER_ITEMS.map((item) => {
- const Icon = item.icon;
- const isActive = item.id === active;
- return (
- <button
- key={item.id}
- type="button"
- data-testid={`nav-row-${item.id}`}
- onClick={() => setActive(item.id)}
- className={clsx(
- "group flex h-9 w-full items-center gap-2 rounded-md px-3 text-base font-medium transition-colors",
- "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
- isActive
- ? "jarvis-nav-active bg-secondary text-foreground"
- : "text-muted-foreground hover:bg-secondary hover:text-foreground",
- )}
- >
- <Icon aria-hidden className="h-4 w-4 shrink-0" />
- <span className="truncate">{resolveNavLabel(t, item)}</span>
- </button>
- );
- })}
+ <div ref={profileRef} className="relative shrink-0 border-t border-border p-2"
+ onBlur={(event) => {
+ if (!event.currentTarget.contains(event.relatedTarget as Node)) setProfileOpen(false);
+ }}>
+ <div className={cn("flex items-center gap-1", railed && "flex-col")}>
+ <button ref={profileButtonRef} type="button" onClick={() => setProfileOpen(!profileOpen)}
+ aria-expanded={profileOpen} aria-controls="sidebar-profile-panel" title={t("nav.profile")}
+ data-testid="sidebar-profile-toggle" className={cn(rowClass, "min-w-0 flex-1")}>
+ <span className="relative shrink-0">
+ <UserCircle2 aria-hidden className="h-7 w-7" />
+ {(apikeysHasError || localModelsNeedAttention) && <span data-testid="sidebar-profile-attention"
+ role="status" aria-label={t("sidebar.apikeys_alert")}
+ className={cn("absolute bottom-0 right-0 h-2 w-2 rounded-full", apikeysHasError ? "bg-destructive" : "bg-warning")} />}
+ </span>
+ {!railed && <span className="min-w-0 flex-1 truncate text-left">{identity.data?.signed_in ? identity.data.login || t("nav.profile") : t("nav.profile")}</span>}
+ </button>
+ <button type="button" onClick={() => setActive("marketplace")} title={t("nav.marketplace")}
+ aria-label={t("nav.marketplace")} data-testid="nav-row-marketplace"
+ className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-secondary hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring">
+ <Store aria-hidden className="h-5 w-5" />
+ </button>
+ </div>
+ {profileOpen && <div id="sidebar-profile-panel" data-testid="sidebar-profile-panel"
+ className="absolute bottom-full left-2 z-50 mb-2 w-72 max-w-[calc(100vw-1rem)] rounded-xl border border-border bg-card p-2 shadow-xl">
+ <div className="max-h-[65vh] overflow-y-auto scrollbar-jarvis">
+ <ul className="space-y-0.5">{profileItems.map((item) => renderRow(item, false))}</ul>
+ </div>
<button
type="button"
onClick={() => setActive("apikeys")}
@@ -782,7 +606,7 @@ export function Sidebar({
className={cn(
"group flex w-full items-center rounded-lg border border-border bg-card text-left transition-colors hover:border-border-strong",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-sidebar",
- railed ? "justify-center px-2 py-2" : "gap-3 p-3",
+ "mt-2 gap-3 p-3",
)}
// On the rail the card shrinks to its status dot, so everything it
// would have said moves into the hover text — otherwise the dot is a
@@ -808,7 +632,7 @@ export function Sidebar({
: "bg-muted-foreground",
)}
/>
- {!railed && (
+ {(
<div className="flex-1 min-w-0">
<div
className="text-xs uppercase tracking-wide text-foreground-faint"
@@ -833,16 +657,18 @@ export function Sidebar({
)}
</div>
)}
- {!railed && (
+ {(
<ChevronRight className="h-4 w-4 text-muted-foreground transition-transform group-hover:translate-x-0.5 group-hover:text-foreground" />
)}
</button>
+ </div>}
</div>
</aside>
);
}
function NavRow({
+ compact = false,
item,
label,
active,
@@ -856,6 +682,7 @@ function NavRow({
onClick,
children,
}: {
+ compact?: boolean;
item: NavItem;
label: string;
active: boolean;
@@ -910,7 +737,8 @@ function NavRow({
type="button"
data-testid={`nav-row-${item.id}`}
onClick={onClick}
- title={hint}
+ title={compact ? `${label}${hint ? ` — ${hint}` : ""}` : hint}
+ aria-label={compact ? label : undefined}
className={clsx(
"group relative flex h-9 w-full items-center gap-2.5 rounded-md px-3 text-base font-medium transition-colors",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
@@ -931,7 +759,7 @@ function NavRow({
active ? "text-foreground" : "text-muted-foreground group-hover:text-foreground",
)}
/>
- <span className="flex min-w-0 flex-1 items-center gap-2 text-left">
+ <span className={cn("flex min-w-0 flex-1 items-center gap-2 text-left", compact && "hidden")}>
{/* The row is a fixed 40px now, so a long label has to be cut rather
than allowed to wrap out of it. */}
<span className="truncate">{label}</span>
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/de.json b/jarvis/ui/web/frontend/src/i18n/locales/de.json
index e014d39e4c..e440b2a511 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/de.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/de.json
@@ -479,6 +479,10 @@
"indicator_label": "Sprachstatus"
},
"sidebar": {
+ "jarvis_tools": "Jarvis Tools",
+ "scheduled": "Geplant",
+ "more": "Mehr",
+
"instance_dev_hint": "Dev-Instanz — eine zweite, frei neustartbare Kopie der App mit eigenen Daten, Ports und eigenem Icon. Die normale App läuft daneben weiter.",
"surface_voice": "Voice",
"surface_chat": "Chat",
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/en.json b/jarvis/ui/web/frontend/src/i18n/locales/en.json
index 8bd85248a8..42c132181f 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/en.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/en.json
@@ -479,6 +479,10 @@
"indicator_label": "Voice state"
},
"sidebar": {
+ "jarvis_tools": "Jarvis Tools",
+ "scheduled": "Scheduled",
+ "more": "More",
+
"instance_dev_hint": "Dev instance — a second, freely restartable copy of the app with its own data, ports and icon. The regular app keeps running beside it.",
"surface_voice": "Voice",
"surface_chat": "Chat",
diff --git a/jarvis/ui/web/frontend/src/i18n/locales/es.json b/jarvis/ui/web/frontend/src/i18n/locales/es.json
index 77e06dbdef..e80a79b265 100644
--- a/jarvis/ui/web/frontend/src/i18n/locales/es.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/es.json
@@ -479,6 +479,10 @@
"indicator_label": "Estado de voz"
},
"sidebar": {
+ "jarvis_tools": "Herramientas Jarvis",
+ "scheduled": "Programado",
+ "more": "Más",
+
"instance_dev_hint": "Instancia de desarrollo: una segunda copia de la app que puedes reiniciar libremente, con sus propios datos, puertos e icono. La app normal sigue funcionando al lado.",
"surface_voice": "Voz",
"surface_chat": "Chat",