Skip to content

🙌 OpenHands: AI-Driven Development

feat(conversation-panel): add conversation tags and filtering (#16600)

george larsona4aca995912b
diff --git a/__tests__/components/features/conversation-panel/advanced-conversation-options-modal.test.tsx b/__tests__/components/features/conversation-panel/advanced-conversation-options-modal.test.tsx
new file mode 100644
index 0000000000..28b69a7ab0
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/advanced-conversation-options-modal.test.tsx
@@ -0,0 +1,181 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { fireEvent, screen, within } from "@testing-library/react";
+import { renderWithProviders } from "test-utils";
+import { AdvancedConversationOptionsModal } from "#/components/features/conversation-panel/advanced-conversation-options-modal";
+import { useConversationPanelPreferencesStore } from "#/stores/conversation-panel-preferences-store";
+
+function mockVerticalScrollMetrics(
+ element: HTMLElement,
+ metrics: { scrollHeight: number; clientHeight: number; scrollTop: number },
+) {
+ Object.defineProperty(element, "scrollHeight", {
+ configurable: true,
+ value: metrics.scrollHeight,
+ });
+ Object.defineProperty(element, "clientHeight", {
+ configurable: true,
+ value: metrics.clientHeight,
+ });
+ Object.defineProperty(element, "scrollTop", {
+ configurable: true,
+ writable: true,
+ value: metrics.scrollTop,
+ });
+}
+
+describe("AdvancedConversationOptionsModal", () => {
+ beforeEach(() => {
+ vi.stubGlobal(
+ "ResizeObserver",
+ class {
+ observe = vi.fn();
+
+ unobserve = vi.fn();
+
+ disconnect = vi.fn();
+ },
+ );
+ });
+
+ afterEach(() => {
+ useConversationPanelPreferencesStore.setState({
+ showOlderConversations: true,
+ olderConversationCutoff: "7d",
+ });
+ vi.unstubAllGlobals();
+ });
+
+ it("uses the standard modal width", () => {
+ renderWithProviders(
+ <AdvancedConversationOptionsModal
+ open
+ onClose={vi.fn()}
+ backendKind="local"
+ automationNameFacets={[]}
+ />,
+ );
+
+ expect(
+ screen.getByTestId("advanced-conversation-options-modal"),
+ ).toHaveClass("w-[520px]");
+ });
+
+ it("keeps thread scope in its own section, apart from inclusion toggles", () => {
+ renderWithProviders(
+ <AdvancedConversationOptionsModal
+ open
+ onClose={vi.fn()}
+ backendKind="local"
+ automationNameFacets={[]}
+ />,
+ );
+
+ expect(screen.getByText("CONVERSATION_PANEL$THREADS")).toBeInTheDocument();
+ expect(screen.getByTestId("scope-all")).toHaveAttribute(
+ "role",
+ "menuitemradio",
+ );
+ expect(screen.getByTestId("scope-relevant")).toHaveAttribute(
+ "role",
+ "menuitemradio",
+ );
+ expect(screen.getByTestId("toggle-show-archived")).toHaveAttribute(
+ "role",
+ "menuitemcheckbox",
+ );
+ expect(screen.getByTestId("toggle-older-conversations")).toHaveAttribute(
+ "role",
+ "menuitemcheckbox",
+ );
+ expect(screen.getByTestId("toggle-older-conversations")).toHaveAttribute(
+ "aria-checked",
+ "false",
+ );
+ });
+
+ it("hides conversations older than the selected interval", () => {
+ renderWithProviders(
+ <AdvancedConversationOptionsModal
+ open
+ onClose={vi.fn()}
+ backendKind="local"
+ automationNameFacets={[]}
+ />,
+ );
+
+ fireEvent.click(screen.getByTestId("toggle-older-conversations"));
+ expect(
+ useConversationPanelPreferencesStore.getState().showOlderConversations,
+ ).toBe(false);
+
+ fireEvent.click(
+ within(screen.getByTestId("older-conversation-cutoff")).getByTestId(
+ "dropdown-trigger",
+ ),
+ );
+ fireEvent.click(screen.getByTestId("older-conversation-cutoff-1d"));
+ expect(
+ useConversationPanelPreferencesStore.getState().olderConversationCutoff,
+ ).toBe("1d");
+ });
+
+ it("closes from the top-right X", () => {
+ const onClose = vi.fn();
+ renderWithProviders(
+ <AdvancedConversationOptionsModal
+ open
+ onClose={onClose}
+ backendKind="local"
+ automationNameFacets={[]}
+ />,
+ );
+
+ fireEvent.click(screen.getByTestId("advanced-options-modal-close"));
+ expect(onClose).toHaveBeenCalledTimes(1);
+ });
+
+ it("shows a full-width line on the overflow edge as the list scrolls", () => {
+ renderWithProviders(
+ <AdvancedConversationOptionsModal
+ open
+ onClose={vi.fn()}
+ backendKind="local"
+ automationNameFacets={[]}
+ />,
+ );
+
+ const scroller = screen.getByTestId("advanced-options-scroll");
+ const topEdge = screen.getByTestId("advanced-options-scroll-edge-top");
+ const bottomEdge = screen.getByTestId("advanced-options-scroll-edge-bottom");
+
+ mockVerticalScrollMetrics(scroller, {
+ scrollHeight: 900,
+ clientHeight: 320,
+ scrollTop: 0,
+ });
+ fireEvent.scroll(scroller);
+
+ expect(topEdge).toHaveAttribute("data-visible", "false");
+ expect(bottomEdge).toHaveAttribute("data-visible", "true");
+
+ mockVerticalScrollMetrics(scroller, {
+ scrollHeight: 900,
+ clientHeight: 320,
+ scrollTop: 280,
+ });
+ fireEvent.scroll(scroller);
+
+ expect(topEdge).toHaveAttribute("data-visible", "true");
+ expect(bottomEdge).toHaveAttribute("data-visible", "true");
+
+ mockVerticalScrollMetrics(scroller, {
+ scrollHeight: 900,
+ clientHeight: 320,
+ scrollTop: 580,
+ });
+ fireEvent.scroll(scroller);
+
+ expect(topEdge).toHaveAttribute("data-visible", "true");
+ expect(bottomEdge).toHaveAttribute("data-visible", "false");
+ });
+});
diff --git a/__tests__/components/features/conversation-panel/conversation-active-tag-filters.test.tsx b/__tests__/components/features/conversation-panel/conversation-active-tag-filters.test.tsx
new file mode 100644
index 0000000000..60e030b466
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/conversation-active-tag-filters.test.tsx
@@ -0,0 +1,120 @@
+import { describe, it, expect, vi } from "vitest";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { renderWithProviders } from "test-utils";
+import { ConversationActiveTagFilters } from "#/components/features/conversation-panel/conversation-active-tag-filters";
+import { UNNAMED_AUTOMATION_FACET } from "#/components/features/conversation-panel/conversation-panel-list-helpers";
+
+const renderStrip = (
+ props: Partial<
+ React.ComponentProps<typeof ConversationActiveTagFilters>
+ > = {},
+) =>
+ renderWithProviders(
+ <ConversationActiveTagFilters
+ selectedFacets={[]}
+ onToggleFacet={vi.fn()}
+ selectedAutomationNames={[]}
+ onToggleAutomationName={vi.fn()}
+ onClearAll={vi.fn()}
+ {...props}
+ />,
+ );
+
+describe("ConversationActiveTagFilters", () => {
+ it("renders nothing when no filter is active", () => {
+ renderStrip();
+
+ expect(
+ screen.queryByTestId("conversation-active-tag-filters"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("names every active facet so a narrowed list is never unexplained", () => {
+ renderStrip({ selectedFacets: ["project=vault", "work"] });
+
+ expect(
+ screen.getByTestId("conversation-active-tag-filters"),
+ ).toBeInTheDocument();
+ // Keyed and bare tags both read the way the facet rows label them.
+ expect(
+ screen.getByTestId("active-tag-filter-project=vault"),
+ ).toHaveTextContent("project=vault");
+ expect(screen.getByTestId("active-tag-filter-work")).toHaveTextContent(
+ "work",
+ );
+ });
+
+ it("drops a single filter from the strip itself", async () => {
+ const user = userEvent.setup();
+ const onToggleFacet = vi.fn();
+ renderStrip({ selectedFacets: ["project=vault", "work"], onToggleFacet });
+
+ await user.click(screen.getByTestId("active-tag-filter-project=vault"));
+
+ expect(onToggleFacet).toHaveBeenCalledWith("project=vault");
+ });
+
+ it("clears every filter at once", async () => {
+ const user = userEvent.setup();
+ const onClearAll = vi.fn();
+ renderStrip({ selectedFacets: ["project=vault"], onClearAll });
+
+ await user.click(screen.getByTestId("clear-tag-filters"));
+
+ expect(onClearAll).toHaveBeenCalledTimes(1);
+ });
+
+ it("names an active automation-name filter too, so it is never the invisible narrowing", () => {
+ // The automation-name selection is persisted and its rows live inside the
+ // advanced-options modal; without a chip here a reload silently hides
+ // conversations with nothing on screen to say why.
+ renderStrip({ selectedAutomationNames: ["Nightly Audit"] });
+
+ expect(
+ screen.getByTestId("conversation-active-tag-filters"),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByTestId("active-automation-filter-Nightly Audit"),
+ ).toHaveTextContent("Nightly Audit");
+ });
+
+ it("labels the unnamed-automation bucket rather than leaking its sentinel", () => {
+ renderStrip({ selectedAutomationNames: [UNNAMED_AUTOMATION_FACET] });
+
+ expect(
+ screen.getByTestId(
+ `active-automation-filter-${UNNAMED_AUTOMATION_FACET}`,
+ ),
+ ).not.toHaveTextContent(UNNAMED_AUTOMATION_FACET);
+ });
+
+ it("drops a single automation-name filter from the strip", async () => {
+ const user = userEvent.setup();
+ const onToggleAutomationName = vi.fn();
+ renderStrip({
+ selectedAutomationNames: ["Nightly Audit"],
+ onToggleAutomationName,
+ });
+
+ await user.click(
+ screen.getByTestId("active-automation-filter-Nightly Audit"),
+ );
+
+ expect(onToggleAutomationName).toHaveBeenCalledWith("Nightly Audit");
+ });
+
+ it("shows both families side by side", () => {
+ renderStrip({
+ selectedFacets: ["project=vault"],
+ selectedAutomationNames: ["Nightly Audit"],
+ });
+
+ expect(
+ screen.getByTestId("active-tag-filter-project=vault"),
+ ).toBeInTheDocument();
+ expect(
+ screen.getByTestId("active-automation-filter-Nightly Audit"),
+ ).toBeInTheDocument();
+ });
+});
diff --git a/__tests__/components/features/conversation-panel/conversation-card-preview.test.tsx b/__tests__/components/features/conversation-panel/conversation-card-preview.test.tsx
index b575b426d5..f6ece524cb 100644
--- a/__tests__/components/features/conversation-panel/conversation-card-preview.test.tsx
+++ b/__tests__/components/features/conversation-panel/conversation-card-preview.test.tsx
@@ -126,7 +126,7 @@ describe("ConversationCardPreview", () => {
).not.toBeInTheDocument();
});
- it("omits blank tag values from the hovercard", () => {
+ it("shows bare tags (empty value) with an em dash in the hovercard", () => {
renderWithProviders(
<ConversationCardPreview
title={PREVIEW_TITLE}
@@ -136,10 +136,12 @@ describe("ConversationCardPreview", () => {
);
const rows = screen.getAllByTestId("conversation-card-preview-tag-row");
- expect(rows).toHaveLength(2);
+ expect(rows).toHaveLength(3);
expect(rows[0]).toHaveAttribute("data-tag-key", "appmode");
expect(rows[0]).toHaveTextContent("work");
- expect(rows[1]).toHaveAttribute("data-tag-key", "workwsid");
- expect(rows[1]).toHaveTextContent("abc");
+ expect(rows[1]).toHaveAttribute("data-tag-key", "worktools");
+ expect(rows[1]).toHaveTextContent("—");
+ expect(rows[2]).toHaveAttribute("data-tag-key", "workwsid");
+ expect(rows[2]).toHaveTextContent("abc");
});
});
diff --git a/__tests__/components/features/conversation-panel/conversation-card.test.tsx b/__tests__/components/features/conversation-panel/conversation-card.test.tsx
index 55cf7f5473..00a084aeb7 100644
--- a/__tests__/components/features/conversation-panel/conversation-card.test.tsx
+++ b/__tests__/components/features/conversation-panel/conversation-card.test.tsx
@@ -780,6 +780,9 @@ describe("ConversationCard", () => {
expect(
within(chips[1]).getByTestId("conversation-card-tag-chip-icon"),
).toHaveAttribute("data-tag-key", "owner");
+ expect(
+ screen.queryByTestId("conversation-tags-indicator"),
+ ).not.toBeInTheDocument();
});
it("filters reserved tag keys out of the chip row", () => {
@@ -810,11 +813,12 @@ describe("ConversationCard", () => {
expect(chips[0].getAttribute("title")).not.toContain("origin");
});
- it("keeps the automation name/trigger chips but hides the automation id chips", () => {
- // The automation id/run-id tags are raw UUIDs consumed by the panel's
- // automation filter — chip noise — while the human-meaningful name and
- // trigger stay visible. Like every tag chip they render value-only,
- // with the humanized ``key: value`` pair in the tooltip.
+ it("hides every automation provenance chip", () => {
+ // The whole automation family is reserved: the SDK stamps it at
+ // creation and the panel's automation filter is its first-class UI
+ // source. Rendering it as tag chips would double-book the user-facing
+ // tag surface — and let user-authored tags spoof automation
+ // classification.
renderWithProviders(
<ConversationCard
title="Conversation 1"
@@ -830,15 +834,9 @@ describe("ConversationCard", () => {
/>,
);
- const chips = screen.getAllByTestId("conversation-card-tag-chip");
- expect(chips).toHaveLength(2);
- expect(chips[0]).toHaveTextContent("Nightly Audit");
- expect(chips[0]).toHaveAttribute(
- "title",
- "Automationname: Nightly Audit",
- );
- expect(chips[1]).toHaveTextContent("cron");
- expect(chips[1]).toHaveAttribute("title", "Automationtrigger: cron");
+ expect(
+ screen.queryByTestId("conversation-card-tag-chip"),
+ ).not.toBeInTheDocument();
});
it("hides the chips when showTags is omitted", () => {
@@ -856,6 +854,44 @@ describe("ConversationCard", () => {
).not.toBeInTheDocument();
});
+ it("renders no tag UI at all when the Tags preference is off", () => {
+ // The preference owns presence: off means nothing about tags on the
+ // card, not even the indicator. This is what keeps the preference and
+ // the card from ever disagreeing — there is no card-level control left
+ // that could put tags back on screen while the toggle reads off.
+ renderWithProviders(
+ <ConversationCard
+ title="Conversation 1"
+ selectedRepository={null}
+ lastUpdatedAt="2021-10-01T12:00:00Z"
+ tags={{ origin: "slack", owner: "alice" }}
+ />,
+ );
+
+ expect(
+ screen.queryByTestId("conversation-tags-indicator"),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByTestId("conversation-card-tag-chip"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("renders no indicator when every tag is reserved", () => {
+ renderWithProviders(
+ <ConversationCard
+ title="Conversation 1"
+ selectedRepository={null}
+ lastUpdatedAt="2021-10-01T12:00:00Z"
+ showTags
+ tags={{ acpserver: "claude-code" }}
+ />,
+ );
+
+ expect(
+ screen.queryByTestId("conversation-tags-indicator"),
+ ).not.toBeInTheDocument();
+ });
+
it("keeps chips on a single nowrap row", () => {
renderWithProviders(
<ConversationCard
diff --git a/__tests__/components/features/conversation-panel/conversation-layouts-menu.test.tsx b/__tests__/components/features/conversation-panel/conversation-layouts-menu.test.tsx
new file mode 100644
index 0000000000..1c666860e2
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/conversation-layouts-menu.test.tsx
@@ -0,0 +1,206 @@
+import { beforeEach, describe, expect, it } from "vitest";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { renderWithProviders } from "test-utils";
+import { ConversationLayoutsMenu } from "#/components/features/conversation-panel/conversation-layouts-menu";
+import { useConversationPanelPreferencesStore } from "#/stores/conversation-panel-preferences-store";
+import { UNNAMED_AUTOMATION_FACET } from "#/components/features/conversation-panel/conversation-panel-list-helpers";
+
+beforeEach(() => {
+ useConversationPanelPreferencesStore.setState({
+ organizeMode: "chronological",
+ conversationSort: "updated",
+ threadScope: "all",
+ showOlderConversations: true,
+ showArchivedConversations: false,
+ showRepoBranchMetadata: false,
+ showLlmProfiles: false,
+ showTagsMetadata: false,
+ showHoverMetadata: true,
+ automationFilterMode: "all",
+ selectedAutomationNames: [],
+ selectedTagFacets: [],
+ });
+});
+
+const renderMenu = (
+ tagFacets: readonly string[] = [],
+ automationNameFacets: readonly string[] = [],
+) =>
+ renderWithProviders(
+ <ConversationLayoutsMenu
+ menuOpen
+ setMenuOpen={() => {}}
+ menuRef={{ current: null }}
+ backendKind="local"
+ tagFacets={tagFacets}
+ automationNameFacets={automationNameFacets}
+ totalConversationsCount={1}
+ onRequestDeleteAll={() => {}}
+ />,
+ );
+
+describe("ConversationLayoutsMenu", () => {
+ it("applies a layout preset bundle and marks it selected", async () => {
+ const user = userEvent.setup();
+ renderMenu();
+
+ await user.click(screen.getByTestId("layout-preset-focused"));
+
+ const state = useConversationPanelPreferencesStore.getState();
+ expect(state.organizeMode).toBe("chronological");
+ expect(state.conversationSort).toBe("updated");
+ expect(state.threadScope).toBe("relevant");
+ expect(state.showOlderConversations).toBe(false);
+ // Applying a preset resets every layout-controlled field.
+ expect(state.showTagsMetadata).toBe(true);
+ expect(state.showHoverMetadata).toBe(true);
+ });
+
+ it("replaces the previous mode and marks each clicked preset selected", async () => {
+ const user = userEvent.setup();
+ renderMenu();
+
+ await user.click(screen.getByTestId("layout-preset-minimal"));
+ expect(screen.getByTestId("layout-preset-minimal")).toHaveAttribute(
+ "aria-checked",
+ "true",
+ );
+
+ await user.click(screen.getByTestId("layout-preset-focused"));
+ expect(screen.getByTestId("layout-preset-focused")).toHaveAttribute(
+ "aria-checked",
+ "true",
+ );
+ expect(screen.getByTestId("layout-preset-minimal")).toHaveAttribute(
+ "aria-checked",
+ "false",
+ );
+ expect(
+ useConversationPanelPreferencesStore.getState().showTagsMetadata,
+ ).toBe(true);
+
+ await user.click(screen.getByTestId("layout-preset-recent-activity"));
+ expect(
+ screen.getByTestId("layout-preset-recent-activity"),
+ ).toHaveAttribute("aria-checked", "true");
+
+ await user.click(screen.getByTestId("layout-preset-by-workspace"));
+ expect(screen.getByTestId("layout-preset-by-workspace")).toHaveAttribute(
+ "aria-checked",
+ "true",
+ );
+ });
+
+ it("labels the Advanced options row Custom when no preset matches", async () => {
+ // Matches no preset: the chronological presets all hide older
+ // conversations, and by-workspace requires grouped mode.
+ useConversationPanelPreferencesStore.getState().applyLayoutSettings({
+ organizeMode: "chronological",
+ conversationSort: "updated",
+ threadScope: "relevant",
+ showOlderConversations: true,
+ });
+
+ renderMenu();
+
+ expect(screen.getByTestId("advanced-options-row")).toHaveTextContent(
+ "CONVERSATION_PANEL$ADVANCED_OPTIONS_CUSTOM",
+ );
+ });
+
+ it("always exposes the Tag Filters section", () => {
+ renderMenu(["project=vault"]);
+ expect(screen.getByTestId("tag-filters-section")).toBeInTheDocument();
+ });
+
+ it("shows No visible tags when enabled with no facets, and toggles facets when present", async () => {
+ const user = userEvent.setup();
+ const { unmount } = renderMenu();
+ await user.click(screen.getByTestId("tag-filters-section"));
+ expect(screen.getByTestId("tag-filters-empty")).toBeInTheDocument();
+ unmount();
+
+ renderMenu(["project=vault"]);
+ await user.click(screen.getByTestId("tag-filters-section"));
+ await user.click(screen.getByTestId("tag-facet-row-project=vault"));
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedTagFacets,
+ ).toEqual(["project=vault"]);
+ });
+
+ it("opens the Advanced options modal, applies toggles live, and closes via Close", async () => {
+ const user = userEvent.setup();
+ renderMenu();
+
+ expect(
+ screen.queryByTestId("advanced-conversation-options-modal"),
+ ).not.toBeInTheDocument();
+
+ await user.click(screen.getByTestId("advanced-options-row"));
+ expect(
+ await screen.findByTestId("advanced-conversation-options-modal"),
+ ).toBeInTheDocument();
+
+ // Toggle rows apply immediately and keep the modal open.
+ await user.click(screen.getByTestId("toggle-tags-metadata"));
+ expect(
+ useConversationPanelPreferencesStore.getState().showTagsMetadata,
+ ).toBe(true);
+ expect(
+ screen.getByTestId("advanced-conversation-options-modal"),
+ ).toBeInTheDocument();
+
+ await user.click(screen.getByTestId("advanced-options-close"));
+ expect(
+ screen.queryByTestId("advanced-conversation-options-modal"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("exposes the automation-name facet rows once the scope is only-automations", async () => {
+ // These rows are the only control for `selectedAutomationNames`, which is
+ // persisted and narrows the list on its own — without them a stale
+ // selection hides conversations with no way back.
+ const user = userEvent.setup();
+ renderMenu([], ["Nightly Audit", "PR Review Bot"]);
+
+ await user.click(screen.getByTestId("advanced-options-row"));
+ await screen.findByTestId("advanced-conversation-options-modal");
+
+ // Hidden while the list is not scoped to automations...
+ expect(
+ screen.queryByTestId("automation-name-row-Nightly Audit"),
+ ).not.toBeInTheDocument();
+
+ await user.click(screen.getByTestId("automation-filter-only"));
+
+ // ...and selectable once it is.
+ await user.click(
+ await screen.findByTestId("automation-name-row-Nightly Audit"),
+ );
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedAutomationNames,
+ ).toEqual(["Nightly Audit"]);
+
+ // Toggling it back off leaves the scope alone.
+ await user.click(screen.getByTestId("automation-name-row-Nightly Audit"));
+ const next = useConversationPanelPreferencesStore.getState();
+ expect(next.selectedAutomationNames).toEqual([]);
+ expect(next.automationFilterMode).toBe("only-automations");
+ });
+
+ it("labels the unnamed-automation bucket instead of leaking its sentinel", async () => {
+ const user = userEvent.setup();
+ useConversationPanelPreferencesStore.setState({
+ automationFilterMode: "only-automations",
+ });
+ renderMenu([], [UNNAMED_AUTOMATION_FACET]);
+
+ await user.click(screen.getByTestId("advanced-options-row"));
+
+ const row = await screen.findByTestId(
+ `automation-name-row-${UNNAMED_AUTOMATION_FACET}`,
+ );
+ expect(row).not.toHaveTextContent(UNNAMED_AUTOMATION_FACET);
+ });
+});
diff --git a/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx b/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx
deleted file mode 100644
index e42311b776..0000000000
--- a/__tests__/components/features/conversation-panel/conversation-panel-filter-menu.test.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { createRef } from "react";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { describe, it, expect, vi } from "vitest";
-
-import {
- ConversationPanelFilterMenu,
- type ConversationPanelFilterMenuProps,
-} from "#/components/features/conversation-panel/conversation-panel-filter-menu";
-import { UNNAMED_AUTOMATION_FACET } from "#/components/features/conversation-panel/conversation-panel-list-helpers";
-
-// ConversationPanelFilterMenu composes the extracted MenuHeading / MenuRow /
-// MenuSeparator components. Rendering it open exercises all three through
-// their real consumer, so these tests double as the regression guard for the
-// extraction.
-function renderFilterMenu(
- overrides: Partial<ConversationPanelFilterMenuProps> = {},
-) {
- const props: ConversationPanelFilterMenuProps = {
- filterMenuOpen: true,
- setFilterMenuOpen: vi.fn(),
- menuRef: createRef<HTMLDivElement>(),
- backendKind: "local",
- organizeMode: "grouped",
- setOrganizeMode: vi.fn(),
- conversationSort: "created",
- setConversationSort: vi.fn(),
- threadScope: "all",
- setThreadScope: vi.fn(),
- automationFilterMode: "all",
- setAutomationFilterMode: vi.fn(),
- selectedAutomationNames: [],
- onToggleAutomationName: vi.fn(),
- automationNameFacets: [],
- showOlderConversations: false,
- toggleShowOlderConversations: vi.fn(),
- showArchivedConversations: false,
- toggleShowArchivedConversations: vi.fn(),
- showRepoBranchMetadata: false,
- toggleShowRepoBranchMetadata: vi.fn(),
- showLlmProfiles: false,
- toggleShowLlmProfiles: vi.fn(),
- showTagsMetadata: false,
- toggleShowTagsMetadata: vi.fn(),
- showHoverMetadata: false,
- toggleShowHoverMetadata: vi.fn(),
- totalConversationsCount: 5,
- onRequestDeleteAll: vi.fn(),
- ...overrides,
- };
- render(<ConversationPanelFilterMenu {...props} />);
- return props;
-}
-
-describe("ConversationPanelFilterMenu", () => {
- it("renders the section headings and rows while open", () => {
- // Arrange + Act
- renderFilterMenu({ filterMenuOpen: true });
-
- // Assert: a MenuHeading and representative MenuRows are present.
- expect(
- screen.getByTestId("older-conversations-filter-menu"),
- ).toBeInTheDocument();
- expect(screen.getByText("CONVERSATION_PANEL$ORGANIZE")).toBeInTheDocument();
- expect(
- screen.getByTestId("toggle-older-conversations"),
- ).toBeInTheDocument();
- expect(screen.getByTestId("delete-all-conversations")).toBeInTheDocument();
- });
-
- it("orders metadata toggles as repo/branch, model, then tags", () => {
- renderFilterMenu({ filterMenuOpen: true });
-
- const repo = screen.getByTestId("toggle-repo-branch-metadata");
- const model = screen.getByTestId("toggle-llm-profiles");
- const tags = screen.getByTestId("toggle-tags-metadata");
-
- expect(
- repo.compareDocumentPosition(model) & Node.DOCUMENT_POSITION_FOLLOWING,
- ).toBeTruthy();
- expect(
- model.compareDocumentPosition(tags) & Node.DOCUMENT_POSITION_FOLLOWING,
- ).toBeTruthy();
- });
-
- it("runs a row's action and closes the menu when the row is clicked", async () => {
- // Arrange
- const user = userEvent.setup();
- const props = renderFilterMenu({ filterMenuOpen: true });
-
- // Act
- await user.click(screen.getByTestId("toggle-llm-profiles"));
-
- // Assert
- expect(props.toggleShowLlmProfiles).toHaveBeenCalledTimes(1);
- expect(props.setFilterMenuOpen).toHaveBeenCalledWith(false);
- });
-
- it("disables the delete-all row when there are no conversations", () => {
- // Arrange + Act
- renderFilterMenu({ filterMenuOpen: true, totalConversationsCount: 0 });
-
- // Assert
- expect(screen.getByTestId("delete-all-conversations")).toBeDisabled();
- });
-
- it("selects an automation filter mode and closes the menu", async () => {
- // Arrange: default mode is "all", so the trigger shows no active dot.
- const user = userEvent.setup();
- const props = renderFilterMenu();
- expect(
- screen.queryByTestId("automation-filter-active-indicator"),
- ).not.toBeInTheDocument();
-
- // Act
- await user.click(screen.getByTestId("automation-filter-hide"));
-
- // Assert
- expect(props.setAutomationFilterMode).toHaveBeenCalledWith(
- "hide-automations",
- );
- expect(props.setFilterMenuOpen).toHaveBeenCalledWith(false);
- });
-
- it("hides the automation-name rows outside only-automations mode", () => {
- // Arrange + Act
- renderFilterMenu({
- automationFilterMode: "hide-automations",
- automationNameFacets: ["Nightly Audit"],
- });
-
- // Assert
- expect(
- screen.queryByTestId("automation-name-filter-Nightly Audit"),
- ).not.toBeInTheDocument();
- });
-
- it("toggles automation names without closing the menu in only-automations mode", async () => {
- // Arrange: only-automations mode also lights the trigger's active dot;
- // the unnamed bucket renders with its translated label.
- const user = userEvent.setup();
- const props = renderFilterMenu({
- automationFilterMode: "only-automations",
- automationNameFacets: ["Nightly Audit", UNNAMED_AUTOMATION_FACET],
- selectedAutomationNames: ["Nightly Audit"],
- });
- expect(
- screen.getByTestId("automation-filter-active-indicator"),
- ).toBeInTheDocument();
- expect(
- screen.getByText("CONVERSATION_PANEL$AUTOMATION_UNNAMED"),
- ).toBeInTheDocument();
-
- // Act
- await user.click(
- screen.getByTestId(`automation-name-filter-${UNNAMED_AUTOMATION_FACET}`),
- );
-
- // Assert: the name toggles while the menu stays open for multi-select.
- expect(props.onToggleAutomationName).toHaveBeenCalledWith(
- UNNAMED_AUTOMATION_FACET,
- );
- expect(props.setFilterMenuOpen).not.toHaveBeenCalled();
- });
-});
diff --git a/__tests__/components/features/conversation-panel/conversation-panel-list-helpers.test.ts b/__tests__/components/features/conversation-panel/conversation-panel-list-helpers.test.ts
index 2c18c9c316..2453a0277f 100644
--- a/__tests__/components/features/conversation-panel/conversation-panel-list-helpers.test.ts
+++ b/__tests__/components/features/conversation-panel/conversation-panel-list-helpers.test.ts
@@ -2,13 +2,19 @@ import { describe, expect, it } from "vitest";
import {
applyAutomationConversationFilter,
applyGroupFolderOrder,
+ applyTagConversationFilter,
collectAutomationNameFacets,
+ collectTagFacets,
+ formatTagFacetLabel,
getGroupConversationPreview,
getGroupDiscoveryConversationIds,
groupConversations,
GROUP_CONVERSATIONS_PREVIEW_LIMIT,
isAutomationConversation,
+ isOlderConversationCutoff,
parseConversationTimeMs,
+ partitionByCutoff,
+ OLDER_CONVERSATION_CUTOFF_MS,
moveGroupFolderOrder,
resolvePinnedConversations,
sortConversationsByField,
@@ -714,4 +720,160 @@ describe("conversation-panel-list-helpers", () => {
);
expect(groups).toHaveLength(0);
});
+
+ it("collects distinct user-facing key=value tag facets, sorted A–Z, excluding reserved keys", () => {
+ const conversations: AppConversation[] = [
+ {
+ ...base,
+ id: "t1",
+ title: "t1",
+ tags: {
+ origin: "slack",
+ owner: "alice",
+ // Reserved/internal keys must not surface as facets — including
+ // the automation provenance family, which the automation filter
+ // owns exclusively.
+ acpserver: "claude-code",
+ title: "internal title stamp",
+ automationname: "Nightly Audit",
+ automationtrigger: "cron",
+ },
+ },
+ {
+ ...base,
+ id: "t2",
+ title: "t2",
+ // Duplicate facet (origin=slack again) collapses into one entry.
+ tags: { origin: "slack", project: "fracture" },
+ },
+ // No user tags at all: contributes nothing (no unnamed bucket).
+ { ...base, id: "t3", title: "t3" },
+ { ...base, id: "t4", title: "t4", tags: null },
+ ];
+ expect(collectTagFacets(conversations)).toEqual([
+ "origin=slack",
+ "owner=alice",
+ "project=fracture",
+ ]);
+ });
+
+ it("formats bare-tag facets (empty value) as just the key", () => {
+ expect(formatTagFacetLabel("work=")).toBe("work");
+ expect(formatTagFacetLabel("project=fracture")).toBe("project=fracture");
+ });
+
+ const tagFilterFixtures: AppConversation[] = [
+ { ...base, id: "untagged", title: "untagged" },
+ {
+ ...base,
+ id: "slack",
+ title: "slack",
+ tags: { origin: "slack" },
+ },
+ {
+ ...base,
+ id: "alice",
+ title: "alice",
+ tags: { owner: "alice" },
+ },
+ {
+ ...base,
+ id: "both",
+ title: "both",
+ tags: { origin: "slack", owner: "alice" },
+ },
+ ];
+ const tagFilterFacets = ["origin=slack", "owner=alice"];
+
+ it("applies the tag filter with union semantics: any selected facet matches", () => {
+ expect(
+ applyTagConversationFilter(
+ tagFilterFixtures,
+ ["origin=slack", "owner=alice"],
+ tagFilterFacets,
+ ).map((c) => c.id),
+ ).toEqual(["slack", "alice", "both"]);
+
+ expect(
+ applyTagConversationFilter(
+ tagFilterFixtures,
+ ["origin=slack"],
+ tagFilterFacets,
+ ).map((c) => c.id),
+ ).toEqual(["slack", "both"]);
+ });
+
+ it("leaves the list unfiltered for empty or stale tag selections", () => {
+ // An empty selection is "no tag filter", and a selection that no longer
+ // intersects the available facets (tags edited away, selections persisted
+ // from another backend) self-heals the same way instead of yielding an
+ // unfillable empty list — mirroring the automation filter.
+ expect(
+ applyTagConversationFilter(tagFilterFixtures, [], tagFilterFacets).map(
+ (c) => c.id,
+ ),
+ ).toEqual(["untagged", "slack", "alice", "both"]);
+
+ expect(
+ applyTagConversationFilter(
+ tagFilterFixtures,
+ ["origin=irc"],
+ tagFilterFacets,
+ ).map((c) => c.id),
+ ).toEqual(["untagged", "slack", "alice", "both"]);
+ });
+});
+
+describe("partitionByCutoff", () => {
+ const now = Date.parse("2026-08-25T12:00:00.000Z");
+
+ it("puts conversations older than the cutoff in the older bucket", () => {
+ const items = [
+ { updated_at: "2026-08-25T11:30:00.000Z" },
+ { updated_at: "2026-08-25T10:00:00.000Z" },
+ ];
+
+ const { recent, older } = partitionByCutoff(
+ items,
+ OLDER_CONVERSATION_CUTOFF_MS["1h"],
+ now,
+ );
+
+ expect(recent.map((item) => item.updated_at)).toEqual([
+ "2026-08-25T11:30:00.000Z",
+ ]);
+ expect(older.map((item) => item.updated_at)).toEqual([
+ "2026-08-25T10:00:00.000Z",
+ ]);
+ });
+
+ it("keeps a 2-hour-old conversation recent when the cutoff is 1 day", () => {
+ const items = [{ updated_at: "2026-08-25T10:00:00.000Z" }];
+
+ const { recent, older } = partitionByCutoff(
+ items,
+ OLDER_CONVERSATION_CUTOFF_MS["1d"],
+ now,
+ );
+
+ expect(recent).toHaveLength(1);
+ expect(older).toHaveLength(0);
+ });
+
+ it("leaves missing timestamps in recent so they are not hidden", () => {
+ const { recent, older } = partitionByCutoff(
+ [{ updated_at: "" }],
+ OLDER_CONVERSATION_CUTOFF_MS["1h"],
+ now,
+ );
+
+ expect(recent).toHaveLength(1);
+ expect(older).toHaveLength(0);
+ });
+
+ it("accepts only the known cutoff ids", () => {
+ expect(isOlderConversationCutoff("1h")).toBe(true);
+ expect(isOlderConversationCutoff("1d")).toBe(true);
+ expect(isOlderConversationCutoff("2h")).toBe(false);
+ });
});
diff --git a/__tests__/components/features/conversation-panel/conversation-panel.test.tsx b/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
index aa80543499..c699f076ed 100644
--- a/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
+++ b/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
@@ -107,6 +107,17 @@ describe("ConversationPanel", () => {
options?: Parameters<typeof renderWithProviders>[1],
) => renderWithProviders(<RouterStub />, options);
+ // The old single-click filter menu is now the layouts menu, with the
+ // display toggles one level deeper in the Advanced options modal. The
+ // modal stays open across row clicks, so a second call is a no-op.
+ const openAdvancedOptions = async (
+ user: ReturnType<typeof userEvent.setup>,
+ ) => {
+ if (screen.queryByTestId("advanced-conversation-options-modal")) return;
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+ await user.click(screen.getByTestId("advanced-options-row"));
+ };
+
beforeAll(() => {
vi.mock("react-router", async (importOriginal) => ({
...(await importOriginal<typeof import("react-router")>()),
@@ -138,9 +149,13 @@ describe("ConversationPanel", () => {
usePinnedConversationsStore.setState({ pinsByBackendId: {} });
useArchivedConversationsStore.setState({ archivesByBackendId: {} });
useConversationPanelPreferencesStore.setState({
+ showOlderConversations: true,
+ olderConversationCutoff: "7d",
showArchivedConversations: false,
automationFilterMode: "all",
selectedAutomationNames: [],
+ selectedTagFacets: [],
+ showTagsMetadata: false,
});
// Setup default mock for searchConversations
vi.spyOn(
@@ -413,6 +428,188 @@ describe("ConversationPanel", () => {
expect(screen.queryByText("Manual 1")).not.toBeInTheDocument();
});
+ it("filters from the persistent filter bar and couples automation chips to the mode", async () => {
+ // Arrange: one tagged manual conversation, one untagged, one automation
+ // run (recognized by its automation tags).
+ const user = userEvent.setup();
+ vi.spyOn(
+ AgentServerConversationService,
+ "searchConversations",
+ ).mockResolvedValue({
+ items: [
+ createMockConversation({
+ id: "1",
+ title: "Manual 1",
+ tags: { project: "vault" },
+ }),
+ createMockConversation({ id: "2", title: "Manual 2" }),
+ createMockConversation({
+ id: "3",
+ title: "Nightly Run",
+ tags: { automationname: "Nightly Audit", automationtrigger: "cron" },
+ }),
+ ],
+ next_page_id: null,
+ });
+
+ renderConversationPanel();
+
+ // Selecting a facet in the layouts menu narrows the list.
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+ await user.click(screen.getByTestId("tag-filters-section"));
+ await user.click(screen.getByTestId("tag-facet-row-project=vault"));
+ expect(await screen.findByText("Manual 1")).toBeInTheDocument();
+ expect(screen.queryByText("Manual 2")).not.toBeInTheDocument();
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedTagFacets,
+ ).toEqual(["project=vault"]);
+
+ // Deselecting the facet restores the full list.
+ await user.click(screen.getByTestId("tag-facet-row-project=vault"));
+ expect(await screen.findByText("Manual 2")).toBeInTheDocument();
+
+ // The automation scope lives in the Advanced options modal.
+ await user.click(screen.getByTestId("advanced-options-row"));
+ await user.click(screen.getByTestId("automation-filter-only"));
+ expect(
+ useConversationPanelPreferencesStore.getState().automationFilterMode,
+ ).toBe("only-automations");
+ expect(await screen.findByText("Nightly Run")).toBeInTheDocument();
+ expect(screen.queryByText("Manual 1")).not.toBeInTheDocument();
+ });
+
+ it("keeps an active tag filter visible outside the layouts menu", async () => {
+ const user = userEvent.setup();
+ vi.spyOn(
+ AgentServerConversationService,
+ "searchConversations",
+ ).mockResolvedValue({
+ items: [
+ createMockConversation({
+ id: "1",
+ title: "Manual 1",
+ tags: { project: "vault" },
+ }),
+ createMockConversation({ id: "2", title: "Manual 2" }),
+ ],
+ next_page_id: null,
+ });
+
+ renderConversationPanel();
+
+ // Nothing to announce until something is actually filtering.
+ expect(
+ screen.queryByTestId("conversation-active-tag-filters"),
+ ).not.toBeInTheDocument();
+
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+ await user.click(screen.getByTestId("tag-filters-section"));
+ await user.click(screen.getByTestId("tag-facet-row-project=vault"));
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+
+ // With the menu closed, the strip is the only thing on screen that says
+ // where Manual 2 went — the facet checkmark is two levels inside a menu.
+ expect(
+ await screen.findByTestId("active-tag-filter-project=vault"),
+ ).toBeInTheDocument();
+ expect(screen.queryByText("Manual 2")).not.toBeInTheDocument();
+
+ // And the way back out is on the strip too, not buried with the facets.
+ await user.click(screen.getByTestId("clear-tag-filters"));
+ expect(await screen.findByText("Manual 2")).toBeInTheDocument();
+ expect(
+ screen.queryByTestId("conversation-active-tag-filters"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("keeps a persisted automation-name filter both reachable and visible", async () => {
+ // `selectedAutomationNames` is persisted and narrows the list on its own,
+ // so it needs a control that can see and undo it — otherwise a reload
+ // hides conversations with nothing on screen to say why.
+ const user = userEvent.setup();
+ vi.spyOn(
+ AgentServerConversationService,
+ "searchConversations",
+ ).mockResolvedValue({
+ items: [
+ createMockConversation({
+ id: "1",
+ title: "Nightly Run",
+ tags: { automationid: "a-1", automationname: "Nightly Audit" },
+ }),
+ createMockConversation({
+ id: "2",
+ title: "Weekly Run",
+ tags: { automationid: "a-2", automationname: "Weekly Sweep" },
+ }),
+ ],
+ next_page_id: null,
+ });
+
+ renderConversationPanel();
+ expect(await screen.findByText("Nightly Run")).toBeInTheDocument();
+
+ // The name rows live in the advanced-options modal, under the scope.
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+ await user.click(screen.getByTestId("advanced-options-row"));
+ await user.click(screen.getByTestId("automation-filter-only"));
+ await user.click(
+ await screen.findByTestId("automation-name-row-Nightly Audit"),
+ );
+ await user.click(screen.getByTestId("advanced-options-close"));
+
+ expect(await screen.findByText("Nightly Run")).toBeInTheDocument();
+ expect(screen.queryByText("Weekly Run")).not.toBeInTheDocument();
+
+ // With every menu closed, the strip is the only thing naming the
+ // narrowing — and the way back out.
+ const chip = await screen.findByTestId(
+ "active-automation-filter-Nightly Audit",
+ );
+ expect(chip).toHaveTextContent("Nightly Audit");
+
+ await user.click(chip);
+ expect(await screen.findByText("Weekly Run")).toBeInTheDocument();
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedAutomationNames,
+ ).toEqual([]);
+ });
+
+ it("clears tag chips from the cards when the Tag chips preference is off", async () => {
+ vi.spyOn(
+ AgentServerConversationService,
+ "searchConversations",
+ ).mockResolvedValue({
+ items: [
+ createMockConversation({
+ id: "1",
+ title: "Tagged 1",
+ tags: { project: "vault" },
+ }),
+ ],
+ next_page_id: null,
+ });
+ useConversationPanelPreferencesStore.setState({ showTagsMetadata: true });
+
+ renderConversationPanel();
+
+ expect(
+ await screen.findByTestId("conversation-card-tag-chip"),
+ ).toBeInTheDocument();
+
+ act(() => {
+ useConversationPanelPreferencesStore.setState({
+ showTagsMetadata: false,
+ });
+ });
+
+ await waitFor(() => {
+ expect(
+ screen.queryByTestId("conversation-card-tag-chip"),
+ ).not.toBeInTheDocument();
+ });
+ });
+
it("keeps load more reachable with the filtered empty message when the automation filter hides every loaded conversation", async () => {
// Arrange: page 1 holds only an automation run (hidden by the active
// filter); a manual conversation sits on page 2.
@@ -966,7 +1163,7 @@ describe("ConversationPanel", () => {
await screen.findByText("Old Touched");
// Act: open the filter menu and switch sort to Created.
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await openAdvancedOptions(user);
await user.click(
screen.getByRole("menuitemradio", {
name: /CONVERSATION_PANEL\$SORT_CREATED/,
@@ -1585,9 +1782,9 @@ describe("ConversationPanel", () => {
describe("older conversations cutoff", () => {
const recentIso = () => new Date().toISOString();
const olderIso = () =>
- new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString();
+ new Date(Date.now() - 8 * 24 * 60 * 60 * 1000).toISOString();
- it("shows conversations older than 1h and includes a summary line", async () => {
+ it("shows conversations older than 1 week and includes a summary line", async () => {
vi.spyOn(
AgentServerConversationService,
"searchConversations",
@@ -1623,7 +1820,7 @@ describe("ConversationPanel", () => {
const summary = screen.getByTestId("older-conversations-summary");
expect(summary).toHaveTextContent("SIDEBAR$CONVERSATIONS");
expect(
- within(summary).getByTestId("older-conversations-filter-toggle"),
+ within(summary).getByTestId("conversation-layouts-toggle"),
).toBeInTheDocument();
});
@@ -1653,7 +1850,7 @@ describe("ConversationPanel", () => {
const summary = screen.getByTestId("older-conversations-summary");
expect(summary).toBeInTheDocument();
expect(
- within(summary).getByTestId("older-conversations-filter-toggle"),
+ within(summary).getByTestId("conversation-layouts-toggle"),
).toBeInTheDocument();
});
@@ -1661,16 +1858,18 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
renderConversationPanel();
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ // Delete all lives in the layouts menu itself.
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
+ const deleteAllRow = screen.getByTestId("delete-all-conversations");
+ expect(deleteAllRow.querySelector("svg")).toBeInTheDocument();
+ expect(deleteAllRow).toHaveClass("text-danger");
+ expect(deleteAllRow).not.toHaveClass("text-[var(--oh-foreground)]");
+ // The older-conversations toggle lives in the Advanced options modal.
+ await user.click(screen.getByTestId("advanced-options-row"));
const hideRow = await screen.findByTestId("toggle-older-conversations");
expect(hideRow.querySelector("svg")).toBeInTheDocument();
expect(hideRow).toHaveClass("group");
-
- const deleteAllRow = screen.getByTestId("delete-all-conversations");
- expect(deleteAllRow.querySelector("svg")).toBeInTheDocument();
- expect(deleteAllRow).toHaveClass("text-[var(--oh-foreground)]");
- expect(deleteAllRow).not.toHaveClass("text-danger");
});
it("toggles older conversations visibility via the filter dropdown", async () => {
@@ -1699,17 +1898,16 @@ describe("ConversationPanel", () => {
let cards = await screen.findAllByTestId("conversation-card");
expect(cards).toHaveLength(2);
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await openAdvancedOptions(user);
let toggle = await screen.findByTestId("toggle-older-conversations");
- expect(toggle).toHaveTextContent("CONVERSATION$HIDE");
+ expect(toggle).toHaveAttribute("aria-checked", "false");
await user.click(toggle);
cards = await screen.findAllByTestId("conversation-card");
expect(cards).toHaveLength(1);
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
toggle = await screen.findByTestId("toggle-older-conversations");
- expect(toggle).toHaveTextContent("CONVERSATION$SHOW_ALL");
+ expect(toggle).toHaveAttribute("aria-checked", "true");
await user.click(toggle);
cards = await screen.findAllByTestId("conversation-card");
expect(cards).toHaveLength(2);
@@ -1749,7 +1947,7 @@ describe("ConversationPanel", () => {
screen.queryByTestId("conversation-card-selected-branch"),
).not.toBeInTheDocument();
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await openAdvancedOptions(user);
await user.click(screen.getByTestId("toggle-repo-branch-metadata"));
expect(
@@ -1790,7 +1988,7 @@ describe("ConversationPanel", () => {
renderConversationPanel();
await screen.findAllByTestId("conversation-card");
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
const deleteAllButton = await screen.findByTestId(
"delete-all-conversations",
);
@@ -1855,7 +2053,7 @@ describe("ConversationPanel", () => {
expect(screen.getByText("Visible 1")).toBeInTheDocument();
expect(screen.queryByText("Archived 1")).not.toBeInTheDocument();
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
const deleteAllButton = await screen.findByTestId(
"delete-all-conversations",
);
@@ -1917,7 +2115,7 @@ describe("ConversationPanel", () => {
});
await screen.findAllByTestId("conversation-card");
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
await user.click(screen.getByTestId("delete-all-conversations"));
await user.click(await screen.findByRole("button", { name: /confirm/i }));
@@ -1972,7 +2170,7 @@ describe("ConversationPanel", () => {
});
await screen.findAllByTestId("conversation-card");
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await user.click(screen.getByTestId("conversation-layouts-toggle"));
await user.click(screen.getByTestId("delete-all-conversations"));
await user.click(await screen.findByRole("button", { name: /confirm/i }));
@@ -2032,7 +2230,7 @@ describe("ConversationPanel", () => {
describe("load-more link", () => {
const recentIso = () => new Date().toISOString();
const olderIso = () =>
- new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString();
+ new Date(Date.now() - 8 * 24 * 60 * 60 * 1000).toISOString();
it("shows a load-more link when there is a next page and no older conversations are hidden", async () => {
vi.spyOn(
@@ -2084,7 +2282,7 @@ describe("ConversationPanel", () => {
// Hide older conversations via the filter dropdown.
const user = userEvent.setup();
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await openAdvancedOptions(user);
await user.click(screen.getByTestId("toggle-older-conversations"));
// Older conversations are hidden → no load-more.
@@ -2093,7 +2291,7 @@ describe("ConversationPanel", () => {
).not.toBeInTheDocument();
// After showing older conversations again, the link reappears.
- await user.click(screen.getByTestId("older-conversations-filter-toggle"));
+ await openAdvancedOptions(user);
await user.click(screen.getByTestId("toggle-older-conversations"));
expect(
await screen.findByTestId("load-more-conversations"),
diff --git a/__tests__/components/features/conversation-panel/conversation-tag-display.test.ts b/__tests__/components/features/conversation-panel/conversation-tag-display.test.ts
index e21fd73e94..4439618e45 100644
--- a/__tests__/components/features/conversation-panel/conversation-tag-display.test.ts
+++ b/__tests__/components/features/conversation-panel/conversation-tag-display.test.ts
@@ -99,6 +99,10 @@ describe("getDisplayConversationTags", () => {
repo: "other/repo",
workspace: "/tmp/ws",
working_dir: "/tmp/wd",
+ automationtrigger: "cron",
+ automationid: "3f2b6c1e-1111-4222-8333-abcdefabcdef",
+ automationname: "Nightly Audit",
+ automationrunid: "run-0001",
}),
).toEqual([
["origin", "slack"],
@@ -127,7 +131,7 @@ describe("getDisplayConversationTags", () => {
expect(getDisplayConversationTags(undefined)).toEqual([]);
});
- it("drops blank and whitespace-only tag values", () => {
+ it("keeps bare tags (empty value) but drops whitespace-only values", () => {
expect(
getDisplayConversationTags({
appmode: "work",
@@ -138,6 +142,7 @@ describe("getDisplayConversationTags", () => {
).toEqual([
["appmode", "work"],
["owner", "alice"],
+ ["worktools", ""],
]);
});
});
@@ -203,6 +208,10 @@ describe("getConversationTagLabel", () => {
expect(getConversationTagLabel("owner", t)).toBe("Owner");
});
+ it("shows the label alone for bare tags (empty value)", () => {
+ expect(formatConversationTagTooltip("work", "", t)).toBe("Work");
+ });
+
it("labels origin and source by their own names, not Git", () => {
expect(getConversationTagLabel("origin", t)).toBe("Origin");
expect(getConversationTagLabel("source", t)).toBe("Source");
diff --git a/__tests__/components/features/conversation-panel/edit-conversation-tags-modal.test.tsx b/__tests__/components/features/conversation-panel/edit-conversation-tags-modal.test.tsx
new file mode 100644
index 0000000000..2264ab5cdd
--- /dev/null
+++ b/__tests__/components/features/conversation-panel/edit-conversation-tags-modal.test.tsx
@@ -0,0 +1,315 @@
+import { describe, it, expect, vi } from "vitest";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { renderWithProviders } from "test-utils";
+import { EditConversationTagsModal } from "#/components/features/conversation-panel/edit-conversation-tags-modal";
+
+describe("EditConversationTagsModal", () => {
+ it("renders the current user-facing tags as rows and hides reserved keys", () => {
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{
+ origin: "slack",
+ owner: "alice",
+ acpserver: "claude-code",
+ automationname: "Nightly Audit",
+ }}
+ onConfirm={vi.fn()}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ expect(screen.getByTestId("edit-tag-row-origin")).toBeInTheDocument();
+ expect(screen.getByTestId("edit-tag-row-owner")).toBeInTheDocument();
+ // Reserved/internal keys are untouchable — no row for them. Automation
+ // provenance stays out too, so a user can't edit (or spoof) it.
+ expect(
+ screen.queryByTestId("edit-tag-row-acpserver"),
+ ).not.toBeInTheDocument();
+ expect(
+ screen.queryByTestId("edit-tag-row-automationname"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("adds a new tag and confirms with the merged map preserving reserved tags", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{ origin: "slack", acpserver: "claude-code" }}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-key-input"), "owner");
+ await user.type(screen.getByTestId("new-tag-value-input"), "alice");
+ await user.click(screen.getByTestId("add-tag-button"));
+
+ expect(screen.getByTestId("edit-tag-row-owner")).toBeInTheDocument();
+
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(onConfirm).toHaveBeenCalledWith({
+ // The internal tag survives the replace-all PATCH untouched.
+ acpserver: "claude-code",
+ origin: "slack",
+ owner: "alice",
+ });
+ });
+
+ it("removes a tag row and omits it from the confirmed map", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{ origin: "slack", owner: "alice" }}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.click(screen.getByTestId("remove-tag-owner"));
+
+ expect(screen.queryByTestId("edit-tag-row-owner")).not.toBeInTheDocument();
+
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(onConfirm).toHaveBeenCalledWith({ origin: "slack" });
+ });
+
+ it("blocks keys that violate the backend rule (lowercase alphanumeric only)", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-key-input"), "Bad Key!");
+ await user.type(screen.getByTestId("new-tag-value-input"), "x");
+ await user.click(screen.getByTestId("add-tag-button"));
+
+ expect(screen.getByTestId("edit-tags-error")).toHaveTextContent(
+ "CONVERSATION$TAG_KEY_INVALID",
+ );
+ expect(screen.queryByTestId("edit-tags-rows")).not.toBeInTheDocument();
+
+ // Save does not paper over the rejected input by discarding it — the
+ // error stands and the modal stays open until the key is fixed or cleared.
+ await user.click(screen.getByTestId("confirm-button"));
+ expect(onConfirm).not.toHaveBeenCalled();
+ expect(screen.getByTestId("edit-tags-error")).toHaveTextContent(
+ "CONVERSATION$TAG_KEY_INVALID",
+ );
+
+ await user.clear(screen.getByTestId("new-tag-key-input"));
+ await user.clear(screen.getByTestId("new-tag-value-input"));
+ await user.click(screen.getByTestId("confirm-button"));
+ expect(onConfirm).toHaveBeenCalledWith({});
+ });
+
+ it("blocks reserved keys and over-long values", async () => {
+ const user = userEvent.setup();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={vi.fn()}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ // Reserved key: allowed by the regex but untouchable by the user.
+ await user.type(screen.getByTestId("new-tag-key-input"), "acpserver");
+ await user.type(screen.getByTestId("new-tag-value-input"), "x");
+ await user.click(screen.getByTestId("add-tag-button"));
+ expect(screen.getByTestId("edit-tags-error")).toHaveTextContent(
+ "CONVERSATION$TAG_KEY_RESERVED",
+ );
+
+ // Automation provenance keys are reserved too: a user-added
+ // ``automationname`` would flip ``isAutomationConversation``.
+ await user.clear(screen.getByTestId("new-tag-key-input"));
+ await user.clear(screen.getByTestId("new-tag-value-input"));
+ await user.type(screen.getByTestId("new-tag-key-input"), "automationname");
+ await user.type(screen.getByTestId("new-tag-value-input"), "x");
+ await user.click(screen.getByTestId("add-tag-button"));
+ expect(screen.getByTestId("edit-tags-error")).toHaveTextContent(
+ "CONVERSATION$TAG_KEY_RESERVED",
+ );
+
+ // Value over the 256-char backend cap.
+ await user.clear(screen.getByTestId("new-tag-key-input"));
+ await user.type(screen.getByTestId("new-tag-key-input"), "owner");
+ await user.type(screen.getByTestId("new-tag-value-input"), "v".repeat(257));
+ await user.click(screen.getByTestId("add-tag-button"));
+ expect(screen.getByTestId("edit-tags-error")).toHaveTextContent(
+ "CONVERSATION$TAG_VALUE_INVALID",
+ );
+
+ expect(screen.queryByTestId("edit-tags-rows")).not.toBeInTheDocument();
+ });
+
+ it("treats an empty value as a bare tag and renders just the key", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-key-input"), "work");
+ await user.click(screen.getByTestId("add-tag-button"));
+
+ const row = screen.getByTestId("edit-tag-row-work");
+ expect(row).toHaveTextContent("work");
+ expect(row).not.toHaveTextContent("=");
+
+ await user.click(screen.getByTestId("confirm-button"));
+ expect(onConfirm).toHaveBeenCalledWith({ work: "" });
+ });
+
+ it("lets a bare tag be removed (merge must not resurrect it)", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{ work: "", acpserver: "claude-code" }}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ // The bare tag is listed alongside valued tags…
+ expect(screen.getByTestId("edit-tag-row-work")).toBeInTheDocument();
+
+ await user.click(screen.getByTestId("remove-tag-work"));
+ await user.click(screen.getByTestId("confirm-button"));
+
+ // …and its removal sticks — only the reserved tag is preserved.
+ expect(onConfirm).toHaveBeenCalledWith({ acpserver: "claude-code" });
+ });
+
+ it("adds the tag when Enter is pressed in either input", async () => {
+ const user = userEvent.setup();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={vi.fn()}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ // Enter in the value input.
+ await user.type(screen.getByTestId("new-tag-key-input"), "owner");
+ await user.type(screen.getByTestId("new-tag-value-input"), "alice{Enter}");
+ expect(screen.getByTestId("edit-tag-row-owner")).toBeInTheDocument();
+ // Focus returns to the key box for the next tag, not the value box.
+ expect(screen.getByTestId("new-tag-key-input")).toHaveFocus();
+
+ // Enter in the key input (bare tag).
+ await user.type(screen.getByTestId("new-tag-key-input"), "work{Enter}");
+ expect(screen.getByTestId("edit-tag-row-work")).toBeInTheDocument();
+ });
+
+ it("commits a typed-but-unadded tag when Save is pressed", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{ acpserver: "claude-code" }}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ // Typing a tag and going straight for Save is the natural flow — Add is an
+ // affordance for entering several, not a toll on entering one. Dropping
+ // the pending row here loses work with no warning.
+ await user.type(screen.getByTestId("new-tag-key-input"), "owner");
+ await user.type(screen.getByTestId("new-tag-value-input"), "alice");
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(onConfirm).toHaveBeenCalledWith({
+ acpserver: "claude-code",
+ owner: "alice",
+ });
+ });
+
+ it("commits a typed-but-unadded bare tag when Save is pressed", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-key-input"), "work");
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(onConfirm).toHaveBeenCalledWith({ work: "" });
+ });
+
+ it("blocks Save on an invalid pending tag instead of dropping it", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-key-input"), "My Project");
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(screen.getByTestId("edit-tags-error")).toBeInTheDocument();
+ expect(onConfirm).not.toHaveBeenCalled();
+ // The typed text survives so it can be corrected.
+ expect(screen.getByTestId("new-tag-key-input")).toHaveValue("My Project");
+ });
+
+ it("blocks Save when a value was typed without a key", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{}}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.type(screen.getByTestId("new-tag-value-input"), "alice");
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(screen.getByTestId("edit-tags-error")).toBeInTheDocument();
+ expect(onConfirm).not.toHaveBeenCalled();
+ });
+
+ it("saves normally when both inputs are empty", async () => {
+ const user = userEvent.setup();
+ const onConfirm = vi.fn();
+ renderWithProviders(
+ <EditConversationTagsModal
+ tags={{ origin: "slack" }}
+ onConfirm={onConfirm}
+ onCancel={vi.fn()}
+ />,
+ );
+
+ await user.click(screen.getByTestId("confirm-button"));
+
+ expect(onConfirm).toHaveBeenCalledWith({ origin: "slack" });
+ });
+});
diff --git a/__tests__/hooks/mutation/use-update-conversation-tags.test.tsx b/__tests__/hooks/mutation/use-update-conversation-tags.test.tsx
new file mode 100644
index 0000000000..9fe58506b8
--- /dev/null
+++ b/__tests__/hooks/mutation/use-update-conversation-tags.test.tsx
@@ -0,0 +1,145 @@
+import { renderHook, waitFor } from "@testing-library/react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { useUpdateConversationTags } from "#/hooks/mutation/use-update-conversation-tags";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import type { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+
+// Mock the AgentServerConversationService
+vi.mock(
+ "#/api/conversation-service/agent-server-conversation-service.api",
+ () => ({
+ default: {
+ updateConversationTags: vi.fn(),
+ },
+ }),
+);
+
+const createWrapper = (queryClient?: QueryClient) => {
+ const client =
+ queryClient ??
+ new QueryClient({
+ defaultOptions: {
+ queries: {
+ retry: false,
+ },
+ mutations: {
+ retry: false,
+ },
+ },
+ });
+
+ const Wrapper = ({ children }: { children: React.ReactNode }) => (
+ <QueryClientProvider client={client}>{children}</QueryClientProvider>
+ );
+
+ return { Wrapper, client };
+};
+
+describe("useUpdateConversationTags", () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it("calls updateConversationTags with the conversation id and merged tags", async () => {
+ vi.mocked(
+ AgentServerConversationService.updateConversationTags,
+ ).mockResolvedValue({
+ id: "test-conversation-id",
+ tags: { origin: "slack" },
+ } as unknown as AppConversation);
+
+ const { Wrapper } = createWrapper();
+ const { result } = renderHook(() => useUpdateConversationTags(), {
+ wrapper: Wrapper,
+ });
+
+ result.current.mutate({
+ conversationId: "test-conversation-id",
+ tags: { origin: "slack" },
+ });
+
+ await waitFor(() => {
+ expect(result.current.isSuccess).toBe(true);
+ });
+
+ expect(
+ AgentServerConversationService.updateConversationTags,
+ ).toHaveBeenCalledWith("test-conversation-id", { origin: "slack" });
+ });
+
+ it("optimistically updates the prefix-keyed conversation cache and rolls back on error", async () => {
+ const conversationId = "test-conversation-id";
+ // Mirror the key shape from `useUserConversation`:
+ // ["user", "conversation", cid, backendId, orgId]
+ const cacheKey = [
+ "user",
+ "conversation",
+ conversationId,
+ "default-local",
+ null,
+ ] as const;
+ const baseConversation = {
+ id: conversationId,
+ tags: { origin: "slack", acpserver: "claude-code" },
+ } as unknown as AppConversation;
+
+ vi.mocked(
+ AgentServerConversationService.updateConversationTags,
+ ).mockRejectedValue(new Error("nope"));
+
+ const { Wrapper, client } = createWrapper();
+ client.setQueryData(cacheKey, baseConversation);
+
+ const { result } = renderHook(() => useUpdateConversationTags(), {
+ wrapper: Wrapper,
+ });
+
+ result.current.mutate({
+ conversationId,
+ tags: { origin: "irc", acpserver: "claude-code" },
+ });
+
+ await waitFor(() => {
+ expect(result.current.isError).toBe(true);
+ });
+
+ const cached = client.getQueryData<AppConversation>(cacheKey);
+ expect(cached?.tags).toEqual({
+ origin: "slack",
+ acpserver: "claude-code",
+ });
+ });
+
+ it("invalidates user-conversation and user-conversations on settle", async () => {
+ const conversationId = "test-conversation-id";
+
+ vi.mocked(
+ AgentServerConversationService.updateConversationTags,
+ ).mockResolvedValue({
+ id: conversationId,
+ tags: { origin: "slack" },
+ } as unknown as AppConversation);
+
+ const { Wrapper, client } = createWrapper();
+ const invalidateSpy = vi.spyOn(client, "invalidateQueries");
+
+ const { result } = renderHook(() => useUpdateConversationTags(), {
+ wrapper: Wrapper,
+ });
+
+ await result.current.mutateAsync({
+ conversationId,
+ tags: { origin: "slack" },
+ });
+
+ await waitFor(() => {
+ expect(invalidateSpy).toHaveBeenCalledWith({
+ queryKey: ["user", "conversation", conversationId],
+ });
+ expect(invalidateSpy).toHaveBeenCalledWith({
+ queryKey: ["user", "conversations"],
+ });
+ });
+ });
+});
diff --git a/__tests__/stores/conversation-panel-preferences-store.test.ts b/__tests__/stores/conversation-panel-preferences-store.test.ts
index 4f351622fb..cf90f92a73 100644
--- a/__tests__/stores/conversation-panel-preferences-store.test.ts
+++ b/__tests__/stores/conversation-panel-preferences-store.test.ts
@@ -11,14 +11,16 @@ describe("conversation-panel-preferences store", () => {
it("defaults to showing older conversations, chronological list, and expected toggles", () => {
const state = useConversationPanelPreferencesStore.getState();
expect(state.showOlderConversations).toBe(true);
+ expect(state.olderConversationCutoff).toBe("7d");
expect(state.showRepoBranchMetadata).toBe(false);
expect(state.showLlmProfiles).toBe(false);
- expect(state.showTagsMetadata).toBe(false);
+ expect(state.showTagsMetadata).toBe(true);
expect(state.organizeMode).toBe("chronological");
expect(state.conversationSort).toBe("updated");
expect(state.threadScope).toBe("all");
expect(state.automationFilterMode).toBe("all");
expect(state.selectedAutomationNames).toEqual([]);
+ expect(state.selectedTagFacets).toEqual([]);
});
it("toggles showOlderConversations and persists the new value to localStorage", () => {
@@ -51,6 +53,21 @@ describe("conversation-panel-preferences store", () => {
expect(persisted.state.showRepoBranchMetadata).toBe(true);
});
+ it("sets the older-conversation cutoff and persists it", () => {
+ useConversationPanelPreferencesStore
+ .getState()
+ .setOlderConversationCutoff("1d");
+
+ expect(
+ useConversationPanelPreferencesStore.getState().olderConversationCutoff,
+ ).toBe("1d");
+
+ const persisted = JSON.parse(
+ window.localStorage.getItem(STORAGE_KEY) ?? "{}",
+ );
+ expect(persisted.state.olderConversationCutoff).toBe("1d");
+ });
+
it("supports explicit setters for both preferences", () => {
useConversationPanelPreferencesStore
.getState()
@@ -76,8 +93,10 @@ describe("conversation-panel-preferences store", () => {
"automationFilterMode",
"conversationSort",
"groupFolderOrder",
+ "olderConversationCutoff",
"organizeMode",
"selectedAutomationNames",
+ "selectedTagFacets",
"showArchivedConversations",
"showHoverMetadata",
"showLlmProfiles",
@@ -88,6 +107,20 @@ describe("conversation-panel-preferences store", () => {
]);
});
+ it("applies a layout preset's partial bundle in one action", () => {
+ useConversationPanelPreferencesStore.getState().applyLayoutSettings({
+ organizeMode: "grouped",
+ showOlderConversations: false,
+ });
+
+ const state = useConversationPanelPreferencesStore.getState();
+ expect(state.organizeMode).toBe("grouped");
+ expect(state.showOlderConversations).toBe(false);
+ // Fields the preset does not name stay untouched.
+ expect(state.conversationSort).toBe("updated");
+ expect(state.threadScope).toBe("all");
+ });
+
it("exposes setters and a toggler for the LLM-profiles preference", () => {
useConversationPanelPreferencesStore.getState().setShowLlmProfiles(true);
expect(
@@ -142,6 +175,77 @@ describe("conversation-panel-preferences store", () => {
});
});
+ it("clears both facet selections without touching the automation scope", () => {
+ // The active-filter strip renders a chip per facet selection but none for
+ // the automation mode, so Clear all must not silently switch a surface it
+ // does not show.
+ useConversationPanelPreferencesStore.setState({
+ automationFilterMode: "only-automations",
+ selectedAutomationNames: ["Nightly Audit"],
+ selectedTagFacets: ["project=vault"],
+ });
+
+ useConversationPanelPreferencesStore.getState().clearFilterSelections();
+
+ const next = useConversationPanelPreferencesStore.getState();
+ expect({
+ selectedTagFacets: next.selectedTagFacets,
+ selectedAutomationNames: next.selectedAutomationNames,
+ automationFilterMode: next.automationFilterMode,
+ }).toEqual({
+ selectedTagFacets: [],
+ selectedAutomationNames: [],
+ automationFilterMode: "only-automations",
+ });
+
+ // Restore defaults so later tests in this file see a pristine store.
+ useConversationPanelPreferencesStore.setState({
+ automationFilterMode: "all",
+ });
+ });
+
+ it("clears a selected automation name when the mode leaves only-automations", () => {
+ // Self-healing: a hidden name row must never keep narrowing the list.
+ const store = useConversationPanelPreferencesStore.getState();
+ store.setAutomationFilterMode("only-automations");
+ store.toggleAutomationName("Nightly Audit");
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedAutomationNames,
+ ).toEqual(["Nightly Audit"]);
+
+ store.setAutomationFilterMode("hide-automations");
+ expect(
+ useConversationPanelPreferencesStore.getState().selectedAutomationNames,
+ ).toEqual([]);
+
+ // Restore defaults so later tests in this file see a pristine store.
+ useConversationPanelPreferencesStore.setState({
+ automationFilterMode: "all",
+ selectedAutomationNames: [],
+ });
+ });
+
+ it("toggles selected tag facets and persists them to localStorage", () => {
+ const store = useConversationPanelPreferencesStore.getState();
+ store.toggleTagFacet("origin=slack");
+ store.toggleTagFacet("owner=alice");
+ store.toggleTagFacet("origin=slack");
+
+ const next = useConversationPanelPreferencesStore.getState();
+ // Toggling twice removes the facet again; the other selection stays.
+ expect(next.selectedTagFacets).toEqual(["owner=alice"]);
+
+ const persisted = JSON.parse(
+ window.localStorage.getItem(STORAGE_KEY) ?? "{}",
+ );
+ expect(persisted.state.selectedTagFacets).toEqual(["owner=alice"]);
+
+ // Restore defaults so later tests in this file see a pristine store.
+ useConversationPanelPreferencesStore.setState({
+ selectedTagFacets: [],
+ });
+ });
+
it("rehydrates legacy localStorage payloads (older fields preserved, new fields filled with defaults)", async () => {
// Simulate a user upgrading from a build that only persisted the two
// original preferences. After rehydration the store should keep the
diff --git a/__tests__/utils/scroll-fade-state.test.ts b/__tests__/utils/scroll-fade-state.test.ts
new file mode 100644
index 0000000000..d3deae5573
--- /dev/null
+++ b/__tests__/utils/scroll-fade-state.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from "vitest";
+import { readVerticalScrollEdgeState } from "#/utils/scroll-fade-state";
+
+function mockVerticalScrollMetrics(
+ element: HTMLElement,
+ metrics: { scrollHeight: number; clientHeight: number; scrollTop: number },
+) {
+ Object.defineProperty(element, "scrollHeight", {
+ configurable: true,
+ value: metrics.scrollHeight,
+ });
+ Object.defineProperty(element, "clientHeight", {
+ configurable: true,
+ value: metrics.clientHeight,
+ });
+ Object.defineProperty(element, "scrollTop", {
+ configurable: true,
+ writable: true,
+ value: metrics.scrollTop,
+ });
+}
+
+describe("readVerticalScrollEdgeState", () => {
+ it("hides both edges when the content fits", () => {
+ const element = document.createElement("div");
+ mockVerticalScrollMetrics(element, {
+ scrollHeight: 400,
+ clientHeight: 400,
+ scrollTop: 0,
+ });
+
+ expect(readVerticalScrollEdgeState(element)).toEqual({
+ top: false,
+ bottom: false,
+ });
+ });
+
+ it("shows only the bottom edge at the start of overflowing content", () => {
+ const element = document.createElement("div");
+ mockVerticalScrollMetrics(element, {
+ scrollHeight: 800,
+ clientHeight: 300,
+ scrollTop: 0,
+ });
+
+ expect(readVerticalScrollEdgeState(element)).toEqual({
+ top: false,
+ bottom: true,
+ });
+ });
+
+ it("shows both edges in the middle of overflowing content", () => {
+ const element = document.createElement("div");
+ mockVerticalScrollMetrics(element, {
+ scrollHeight: 800,
+ clientHeight: 300,
+ scrollTop: 250,
+ });
+
+ expect(readVerticalScrollEdgeState(element)).toEqual({
+ top: true,
+ bottom: true,
+ });
+ });
+
+ it("shows only the top edge at the end of overflowing content", () => {
+ const element = document.createElement("div");
+ mockVerticalScrollMetrics(element, {
+ scrollHeight: 800,
+ clientHeight: 300,
+ scrollTop: 500,
+ });
+
+ expect(readVerticalScrollEdgeState(element)).toEqual({
+ top: true,
+ bottom: false,
+ });
+ });
+});
diff --git a/src/api/agent-server-adapter.ts b/src/api/agent-server-adapter.ts
index 8febe54e86..3497bcf72d 100644
--- a/src/api/agent-server-adapter.ts
+++ b/src/api/agent-server-adapter.ts
@@ -503,16 +503,20 @@ export const AUTOMATION_TAG_KEYS: readonly string[] = [
* - git / repo / branch / workspace stamps → repo-branch metadata + directory
* footer / hovercard rows (``selected_repository``, ``selected_branch``,
* ``git_provider``, ``workspace.working_dir``)
- * - ``automationid`` / ``automationrunid`` → raw UUIDs consumed by the
- * conversation panel's automation filter (chip noise), while
- * ``automationname`` / ``automationtrigger`` stay visible
+ * - the automation family (``automationtrigger`` / ``automationid`` /
+ * ``automationname`` / ``automationrunid``) → provenance the SDK stamps at
+ * creation; the conversation panel's automation filter is its first-class
+ * UI source. The tag surface is user organization data, so machine stamps
+ * stay out of it — and users can't edit or spoof automation classification.
* - ``localplannerparent`` → internal routing for the local planner; already
* surfaced by the hidden-from-list planner filter
*/
export const RESERVED_CONVERSATION_TAG_KEYS: ReadonlySet<string> = new Set([
ACP_SERVER_TAG_KEY,
CLIENT_SOURCE_TAG_KEY,
+ AUTOMATION_TRIGGER_TAG_KEY,
AUTOMATION_ID_TAG_KEY,
+ AUTOMATION_NAME_TAG_KEY,
AUTOMATION_RUN_ID_TAG_KEY,
"title",
"git_provider",
@@ -560,7 +564,9 @@ export function getDisplayConversationTags(
([key, value]) =>
!RESERVED_CONVERSATION_TAG_KEYS.has(key.trim().toLowerCase()) &&
typeof value === "string" &&
- value.trim().length > 0,
+ // Bare tags (empty value) are displayable — chips/tooltips render
+ // the key. Whitespace-only values stay dropped (raw-write junk).
+ (value === "" || value.trim().length > 0),
)
.sort(([a], [b]) => {
const aRank = priorityRank(a);
diff --git a/src/api/conversation-service/agent-server-conversation-service.api.ts b/src/api/conversation-service/agent-server-conversation-service.api.ts
index fc881d5c16..61f34b562a 100644
--- a/src/api/conversation-service/agent-server-conversation-service.api.ts
+++ b/src/api/conversation-service/agent-server-conversation-service.api.ts
@@ -966,6 +966,27 @@ class AgentServerConversationService {
return requireAppConversation(conversation, conversationId);
}
+ /**
+ * Replaces the conversation's complete server-side tag map (the PATCH is
+ * replace-all, so callers must merge user edits with any reserved/internal
+ * keys before calling). Mirrors `updateConversationTitle`; local
+ * agent-server conversations only — Cloud conversations don't carry tags.
+ */
+ static async updateConversationTags(
+ conversationId: string,
+ tags: Record<string, string>,
+ ): Promise<AppConversation> {
+ await new ConversationClient(
+ getAgentServerClientOptions(),
+ ).updateConversation(conversationId, {
+ tags,
+ });
+ const [conversation] = await this.batchGetAppConversations([
+ conversationId,
+ ]);
+ return requireAppConversation(conversation, conversationId);
+ }
+
/**
* Forks a conversation, copying event history up to and including
* `fromEventId`. Local agent-server only; needs agent-server >= 1.31.0 for
diff --git a/src/components/features/conversation-panel/advanced-conversation-options-modal.tsx b/src/components/features/conversation-panel/advanced-conversation-options-modal.tsx
new file mode 100644
index 0000000000..c96b5f1743
--- /dev/null
+++ b/src/components/features/conversation-panel/advanced-conversation-options-modal.tsx
@@ -0,0 +1,329 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import {
+ Archive,
+ Bot,
+ CalendarArrowDown,
+ Clock3,
+ ClockArrowDown,
+ EyeOff,
+ Folder,
+ GitBranch,
+ MessageCircle,
+ MousePointerClick,
+ Star,
+ Tag,
+} from "lucide-react";
+import AutomationsIcon from "#/icons/automations.svg?react";
+import { I18nKey } from "#/i18n/declaration";
+import type { BackendKind } from "#/api/backend-registry/types";
+import { useConversationPanelPreferencesStore } from "#/stores/conversation-panel-preferences-store";
+import {
+ BaseModalDescription,
+ BaseModalTitle,
+} from "#/components/shared/modals/confirmation-modals/base-modal";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import {
+ MODAL_MAX_WIDTH_VIEWPORT,
+ ModalBody,
+} from "#/components/shared/modals/modal-body";
+import { ModalCloseButton } from "#/components/shared/modals/modal-close-button";
+import { BrandButton } from "#/components/features/settings/brand-button";
+import { cn } from "#/utils/utils";
+import { readVerticalScrollEdgeState } from "#/utils/scroll-fade-state";
+import { MenuHeading } from "./menu-heading";
+import { MenuSeparator } from "./menu-separator";
+import { MenuRow } from "./menu-row";
+import { HideOlderConversationsRow } from "./hide-older-conversations-row";
+import { UNNAMED_AUTOMATION_FACET } from "./conversation-panel-list-helpers";
+
+export interface AdvancedConversationOptionsModalProps {
+ open: boolean;
+ onClose: () => void;
+ backendKind: BackendKind;
+ /**
+ * Distinct automation names among the loaded conversations. Rendered as
+ * selectable rows under the Automations section in `only-automations`
+ * mode — the only control for `selectedAutomationNames`, which is
+ * persisted and narrows the list on its own.
+ */
+ automationNameFacets: readonly string[];
+}
+
+/**
+ * The full preference surface, promoted from the old hamburger filter menu
+ * into its own modal (design from the 2026-08-14 PM walkthrough video).
+ * Rows apply immediately and stay open — the modal closes only via the
+ * top-right X, footer Close, Escape, or backdrop click.
+ */
+export function AdvancedConversationOptionsModal({
+ open,
+ onClose,
+ backendKind,
+ automationNameFacets,
+}: AdvancedConversationOptionsModalProps) {
+ const { t } = useTranslation("openhands");
+ const preferences = useConversationPanelPreferencesStore();
+ const scrollRef = React.useRef<HTMLDivElement>(null);
+ const [scrollEdges, setScrollEdges] = React.useState({
+ top: false,
+ bottom: false,
+ });
+
+ const updateScrollEdges = React.useCallback(() => {
+ const element = scrollRef.current;
+ if (!element) {
+ return;
+ }
+ setScrollEdges(readVerticalScrollEdgeState(element));
+ }, []);
+
+ React.useLayoutEffect(() => {
+ if (!open) {
+ return undefined;
+ }
+ updateScrollEdges();
+
+ const element = scrollRef.current;
+ if (!element) {
+ return undefined;
+ }
+
+ const resizeObserver = new ResizeObserver(updateScrollEdges);
+ resizeObserver.observe(element);
+ if (element.firstElementChild) {
+ resizeObserver.observe(element.firstElementChild);
+ }
+
+ return () => resizeObserver.disconnect();
+ }, [open, updateScrollEdges, preferences.automationFilterMode]);
+
+ if (!open) return null;
+
+ const groupedLabel =
+ backendKind === "local"
+ ? t(I18nKey.CONVERSATION_PANEL$BY_WORKSPACE)
+ : t(I18nKey.CONVERSATION_PANEL$BY_REPOSITORY);
+
+ return (
+ <ModalBackdrop onClose={onClose}>
+ <ModalBody
+ width="md"
+ className={cn(
+ "relative items-start overflow-hidden border border-[var(--oh-border)]",
+ MODAL_MAX_WIDTH_VIEWPORT,
+ )}
+ testID="advanced-conversation-options-modal"
+ >
+ <ModalCloseButton
+ onClose={onClose}
+ testId="advanced-options-modal-close"
+ />
+ <div className="flex w-full flex-col gap-2 pr-8">
+ <BaseModalTitle
+ title={t(I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS)}
+ />
+ <BaseModalDescription>
+ {t(I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS_DESCRIPTION)}
+ </BaseModalDescription>
+ </div>
+
+ <div className="relative -mx-6 w-[calc(100%+3rem)] min-h-0">
+ <div
+ aria-hidden
+ data-testid="advanced-options-scroll-edge-top"
+ data-visible={scrollEdges.top ? "true" : "false"}
+ className={cn(
+ "pointer-events-none absolute inset-x-0 top-0 z-10 h-px bg-[var(--oh-border)]",
+ scrollEdges.top ? "opacity-100" : "opacity-0",
+ )}
+ />
+ <div
+ ref={scrollRef}
+ role="menu"
+ aria-orientation="vertical"
+ aria-label={t(I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS)}
+ // Same idiom as the old filter menu: focusable for jsx-a11y but
+ // out of the natural Tab order (the rows are tabbable buttons).
+ tabIndex={-1}
+ data-testid="advanced-options-scroll"
+ className="custom-scrollbar-always flex max-h-[60vh] w-full flex-col overflow-y-auto px-6"
+ onClick={(event) => event.stopPropagation()}
+ onScroll={updateScrollEdges}
+ >
+ <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$ORGANIZE)}</MenuHeading>
+ <MenuRow
+ icon={Folder}
+ label={groupedLabel}
+ selected={preferences.organizeMode === "grouped"}
+ testId="organize-grouped"
+ onClick={() => preferences.setOrganizeMode("grouped")}
+ />
+ <MenuRow
+ icon={Clock3}
+ label={t(I18nKey.CONVERSATION_PANEL$CHRONOLOGICAL)}
+ selected={preferences.organizeMode === "chronological"}
+ testId="organize-chronological"
+ onClick={() => preferences.setOrganizeMode("chronological")}
+ />
+
+ <MenuSeparator />
+ <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$SORT_BY)}</MenuHeading>
+ <MenuRow
+ icon={CalendarArrowDown}
+ label={t(I18nKey.CONVERSATION_PANEL$SORT_CREATED)}
+ selected={preferences.conversationSort === "created"}
+ testId="sort-created"
+ onClick={() => preferences.setConversationSort("created")}
+ />
+ <MenuRow
+ icon={ClockArrowDown}
+ label={t(I18nKey.CONVERSATION_PANEL$SORT_UPDATED)}
+ selected={preferences.conversationSort === "updated"}
+ testId="sort-updated"
+ onClick={() => preferences.setConversationSort("updated")}
+ />
+
+ <MenuSeparator />
+ <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$THREADS)}</MenuHeading>
+ <MenuRow
+ icon={MessageCircle}
+ label={t(I18nKey.CONVERSATION_PANEL$ALL_THREADS)}
+ selected={preferences.threadScope === "all"}
+ testId="scope-all"
+ onClick={() => preferences.setThreadScope("all")}
+ />
+ <MenuRow
+ icon={Star}
+ label={t(I18nKey.CONVERSATION_PANEL$RELEVANT_THREADS)}
+ selected={preferences.threadScope === "relevant"}
+ testId="scope-relevant"
+ onClick={() => preferences.setThreadScope("relevant")}
+ />
+
+ <MenuSeparator />
+ <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$SHOW)}</MenuHeading>
+ <MenuRow
+ icon={Archive}
+ label={t(I18nKey.CONVERSATION_PANEL$SHOW_ARCHIVED)}
+ selected={preferences.showArchivedConversations}
+ variant="toggle"
+ testId="toggle-show-archived"
+ onClick={preferences.toggleShowArchivedConversations}
+ />
+ <HideOlderConversationsRow />
+ <MenuSeparator />
+ <MenuHeading>
+ {t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS)}
+ </MenuHeading>
+ <MenuRow
+ icon={MessageCircle}
+ label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_ALL)}
+ selected={preferences.automationFilterMode === "all"}
+ testId="automation-filter-all"
+ onClick={() => preferences.setAutomationFilterMode("all")}
+ />
+ <MenuRow
+ icon={EyeOff}
+ label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_HIDE)}
+ selected={preferences.automationFilterMode === "hide-automations"}
+ testId="automation-filter-hide"
+ onClick={() =>
+ preferences.setAutomationFilterMode("hide-automations")
+ }
+ />
+ <MenuRow
+ icon={AutomationsIcon}
+ label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_ONLY)}
+ selected={preferences.automationFilterMode === "only-automations"}
+ testId="automation-filter-only"
+ onClick={() =>
+ preferences.setAutomationFilterMode("only-automations")
+ }
+ />
+ {/* Name rows only make sense while the list is scoped to
+ automations — and `setAutomationFilterMode` clears the selection
+ on the way out, so a hidden row can never keep narrowing. */}
+ {preferences.automationFilterMode === "only-automations"
+ ? automationNameFacets.map((facet) => (
+ <MenuRow
+ key={facet}
+ icon={Tag}
+ label={
+ facet === UNNAMED_AUTOMATION_FACET
+ ? t(I18nKey.CONVERSATION_PANEL$AUTOMATION_UNNAMED)
+ : facet
+ }
+ selected={preferences.selectedAutomationNames.includes(
+ facet,
+ )}
+ variant="toggle"
+ testId={`automation-name-row-${facet}`}
+ onClick={() => preferences.toggleAutomationName(facet)}
+ />
+ ))
+ : null}
+
+ <MenuSeparator />
+ <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$METADATA)}</MenuHeading>
+ <MenuRow
+ icon={GitBranch}
+ label={t(I18nKey.CONVERSATION_PANEL$REPO_BRANCH)}
+ selected={preferences.showRepoBranchMetadata}
+ variant="toggle"
+ testId="toggle-repo-branch-metadata"
+ onClick={preferences.toggleShowRepoBranchMetadata}
+ />
+ <MenuRow
+ icon={Bot}
+ label={t(I18nKey.CONVERSATION_PANEL$LLM_MODEL)}
+ selected={preferences.showLlmProfiles}
+ variant="toggle"
+ testId="toggle-llm-profiles"
+ onClick={preferences.toggleShowLlmProfiles}
+ />
+ <MenuRow
+ icon={Tag}
+ label={t(I18nKey.CONVERSATION_PANEL$TAG_CHIPS)}
+ selected={preferences.showTagsMetadata}
+ variant="toggle"
+ testId="toggle-tags-metadata"
+ onClick={preferences.toggleShowTagsMetadata}
+ />
+ <MenuRow
+ icon={MousePointerClick}
+ label={t(I18nKey.CONVERSATION_PANEL$HOVER_METADATA)}
+ selected={preferences.showHoverMetadata}
+ variant="toggle"
+ testId="toggle-hover-metadata"
+ onClick={preferences.toggleShowHoverMetadata}
+ />
+ </div>
+ <div
+ aria-hidden
+ data-testid="advanced-options-scroll-edge-bottom"
+ data-visible={scrollEdges.bottom ? "true" : "false"}
+ className={cn(
+ "pointer-events-none absolute inset-x-0 bottom-0 z-10 h-px bg-[var(--oh-border)]",
+ scrollEdges.bottom ? "opacity-100" : "opacity-0",
+ )}
+ />
+ </div>
+
+ <div
+ className="flex w-full justify-end"
+ onClick={(event) => event.stopPropagation()}
+ >
+ <BrandButton
+ type="button"
+ variant="primary"
+ onClick={onClose}
+ testId="advanced-options-close"
+ >
+ {t(I18nKey.BUTTON$CLOSE)}
+ </BrandButton>
+ </div>
+ </ModalBody>
+ </ModalBackdrop>
+ );
+}
diff --git a/src/components/features/conversation-panel/conversation-active-tag-filters.tsx b/src/components/features/conversation-panel/conversation-active-tag-filters.tsx
new file mode 100644
index 0000000000..c892b05ff2
--- /dev/null
+++ b/src/components/features/conversation-panel/conversation-active-tag-filters.tsx
@@ -0,0 +1,105 @@
+import { Tag, Workflow, X } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { I18nKey } from "#/i18n/declaration";
+import {
+ formatTagFacetLabel,
+ UNNAMED_AUTOMATION_FACET,
+} from "./conversation-panel-list-helpers";
+
+interface ConversationActiveTagFiltersProps {
+ selectedFacets: readonly string[];
+ onToggleFacet: (facet: string) => void;
+ /** Automation names narrowing the list in `only-automations` mode. */
+ selectedAutomationNames: readonly string[];
+ onToggleAutomationName: (name: string) => void;
+ onClearAll: () => void;
+}
+
+/**
+ * Always-visible record of which facet selections are narrowing the list —
+ * both families: user tags and automation names.
+ *
+ * The facet rows live two levels inside a menu (tag facets behind a toggle in
+ * the layouts menu, automation names inside the advanced-options modal).
+ * Without this strip a filter left switched on just makes conversations
+ * disappear, with nothing on screen to say why or how to get them back — and
+ * both selections are persisted, so a reload brings the narrowing back with
+ * the explanation still buried.
+ *
+ * The automation *mode* deliberately has no chip here: it is a scope, not a
+ * facet selection, and `onClearAll` leaves it alone for the same reason —
+ * this strip must not silently switch a surface it doesn't show.
+ *
+ * Renders nothing when nothing is selected — an empty bar would cost a row
+ * of a narrow sidebar to say "no news".
+ */
+export function ConversationActiveTagFilters({
+ selectedFacets,
+ onToggleFacet,
+ selectedAutomationNames,
+ onToggleAutomationName,
+ onClearAll,
+}: ConversationActiveTagFiltersProps) {
+ const { t } = useTranslation("openhands");
+
+ if (selectedFacets.length === 0 && selectedAutomationNames.length === 0) {
+ return null;
+ }
+
+ const chipClassName =
+ "flex min-w-0 max-w-full cursor-pointer items-center gap-1 rounded-full bg-[var(--oh-surface)] px-2 py-0.5 text-[10px] leading-4 text-white hover:bg-white/10";
+
+ return (
+ <div
+ data-testid="conversation-active-tag-filters"
+ className="flex min-w-0 items-start gap-1.5 border-b border-[var(--oh-border)] px-4 py-1.5"
+ >
+ <Tag
+ className="mt-1 h-3 w-3 shrink-0 text-[var(--oh-muted)]"
+ aria-hidden
+ />
+
+ <div className="flex min-w-0 flex-1 flex-wrap items-center gap-1">
+ {selectedFacets.map((facet) => (
+ <button
+ key={facet}
+ type="button"
+ data-testid={`active-tag-filter-${facet}`}
+ onClick={() => onToggleFacet(facet)}
+ className={chipClassName}
+ >
+ <span className="truncate">{formatTagFacetLabel(facet)}</span>
+ <X className="h-3 w-3 shrink-0" aria-hidden />
+ </button>
+ ))}
+
+ {selectedAutomationNames.map((name) => (
+ <button
+ key={name}
+ type="button"
+ data-testid={`active-automation-filter-${name}`}
+ onClick={() => onToggleAutomationName(name)}
+ className={chipClassName}
+ >
+ <Workflow className="h-3 w-3 shrink-0" aria-hidden />
+ <span className="truncate">
+ {name === UNNAMED_AUTOMATION_FACET
+ ? t(I18nKey.CONVERSATION_PANEL$AUTOMATION_UNNAMED)
+ : name}
+ </span>
+ <X className="h-3 w-3 shrink-0" aria-hidden />
+ </button>
+ ))}
+ </div>
+
+ <button
+ type="button"
+ data-testid="clear-tag-filters"
+ onClick={onClearAll}
+ className="shrink-0 cursor-pointer text-[10px] leading-5 text-[var(--oh-muted)] hover:text-white"
+ >
+ {t(I18nKey.CONVERSATION_PANEL$CLEAR_FILTERS)}
+ </button>
+ </div>
+ );
+}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
index f26f094647..10ed9d24d5 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
@@ -16,6 +16,7 @@ interface ConversationCardActionsProps {
onUnarchive?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onStop?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onEdit?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+ onEditTags?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadViaVSCode?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadConversation?: (event: React.MouseEvent<HTMLButtonElement>) => void;
executionStatus?: ExecutionStatus | null;
@@ -31,6 +32,7 @@ export function ConversationCardActions({
onUnarchive,
onStop,
onEdit,
+ onEditTags,
onDownloadViaVSCode,
onDownloadConversation,
executionStatus,
@@ -118,6 +120,7 @@ export function ConversationCardActions({
onUnarchive={onUnarchive}
onStop={isActive ? onStop : undefined}
onEdit={onEdit}
+ onEditTags={onEditTags}
onDownloadViaVSCode={
conversationId && showOptions ? onDownloadViaVSCode : undefined
}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-context-menu.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-context-menu.tsx
index cbf723e888..d36182329c 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-context-menu.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-context-menu.tsx
@@ -7,7 +7,7 @@ import { ContextMenuListItem } from "../../context-menu/context-menu-list-item";
import { I18nKey } from "#/i18n/declaration";
import { ConversationNameContextMenuIconText } from "../../conversation/conversation-name-context-menu-icon-text";
-import { Archive, ArchiveRestore } from "lucide-react";
+import { Archive, ArchiveRestore, Gauge, Tags } from "lucide-react";
import EditIcon from "#/icons/u-edit.svg?react";
import SkillsIcon from "#/icons/skills.svg?react";
import ToolsIcon from "#/icons/u-tools.svg?react";
@@ -15,7 +15,6 @@ import DownloadIcon from "#/icons/u-download.svg?react";
import CloseIcon from "#/icons/u-close.svg?react";
import DeleteIcon from "#/icons/u-delete.svg?react";
import { Divider } from "#/ui/divider";
-import { Gauge } from "lucide-react";
interface ConversationCardContextMenuProps {
onClose: () => void;
@@ -24,6 +23,7 @@ interface ConversationCardContextMenuProps {
onUnarchive?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onStop?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onEdit?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+ onEditTags?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDisplayCost?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onShowAgentTools?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onShowSkills?: (event: React.MouseEvent<HTMLButtonElement>) => void;
@@ -45,6 +45,7 @@ export function ConversationCardContextMenu({
onUnarchive,
onStop,
onEdit,
+ onEditTags,
onDisplayCost,
onShowAgentTools,
onShowSkills,
@@ -115,6 +116,18 @@ export function ConversationCardContextMenu({
/>
</ContextMenuListItem>
),
+ onEditTags && (
+ <ContextMenuListItem
+ key="edit-tags-button"
+ testId="edit-tags-button"
+ onClick={onEditTags}
+ >
+ <ConversationNameContextMenuIconText
+ icon={<Tags className="h-4 w-4" aria-hidden />}
+ text={t(I18nKey.CONVERSATION$EDIT_TAGS)}
+ />
+ </ContextMenuListItem>
+ ),
],
// eslint-disable-next-line i18next/no-literal-string -- internal section id, not user-facing
"edit-section",
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-preview.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-preview.tsx
index 474a5afb8f..315283065a 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-preview.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-preview.tsx
@@ -214,7 +214,9 @@ export function ConversationCardPreview({
tagKey={key}
icon={<Icon aria-hidden className="h-3 w-3" />}
>
- {value}
+ {/* Bare tags (empty value) show an em dash — the row label
+ already carries the key, so repeating it would stutter. */}
+ {value || "—"}
</PreviewValueWithIcon>
</PreviewRow>
);
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
index c96929e08f..275e7af170 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
@@ -35,6 +35,12 @@ interface ConversationCardProps {
onUnarchive?: () => void;
onStop?: () => void;
onChangeTitle?: (title: string) => void;
+ /**
+ * Opens the tag editor for this conversation. Local agent-server backends
+ * only — Cloud conversations don't carry server-side tags, so the panel
+ * leaves this undefined there and the menu item disappears.
+ */
+ onEditTags?: () => void;
showOptions?: boolean;
title: string;
selectedRepository: RepositorySelection | null;
@@ -69,6 +75,7 @@ export function ConversationCard({
onUnarchive,
onStop,
onChangeTitle,
+ onEditTags,
showOptions,
title,
selectedRepository,
@@ -98,6 +105,10 @@ export function ConversationCard({
const [titleMode, setTitleMode] = React.useState<"view" | "edit">("view");
const { mutateAsync: downloadConversation } = useDownloadConversation();
+ const displayTags = getDisplayConversationTags(tags);
+ const hasDisplayTags = displayTags.length > 0;
+ const showTagChipRow = showTags && hasDisplayTags;
+
const onTitleSave = (newTitle: string) => {
if (newTitle !== "" && newTitle !== title) {
onChangeTitle?.(newTitle);
@@ -140,6 +151,13 @@ export function ConversationCard({
onContextMenuToggle?.(false);
};
+ const handleEditTags = (event: React.MouseEvent<HTMLButtonElement>) => {
+ event.preventDefault();
+ event.stopPropagation();
+ onEditTags?.();
+ onContextMenuToggle?.(false);
+ };
+
const handleDownloadViaVSCode = async (
event: React.MouseEvent<HTMLButtonElement>,
) => {
@@ -216,6 +234,7 @@ export function ConversationCard({
onArchive ||
onUnarchive ||
onChangeTitle ||
+ onEditTags ||
showOptions
);
const hasHoverActions = hasContextMenu || !!onTogglePin;
@@ -224,7 +243,7 @@ export function ConversationCard({
showRepositoryMetadata ||
isArchived ||
(showLlmProfiles && (agentKind === "acp" || !!llmModel)) ||
- (showTags && getDisplayConversationTags(tags).length > 0);
+ (showTagChipRow && displayTags.length > 0);
return (
<div
@@ -251,6 +270,7 @@ export function ConversationCard({
</div>
<div
+ data-testid="conversation-card-trailing-slot"
className={cn(
"relative ml-auto pl-2 flex items-center justify-end shrink-0",
// The hover action overlay (pin + ellipsis) is absolutely
@@ -277,6 +297,7 @@ export function ConversationCard({
{hasHoverActions ? (
<div
+ data-testid="conversation-card-hover-actions"
className={cn(
"absolute right-0 top-1/2 flex -translate-y-1/2 items-center gap-0.5 transition-opacity",
showPersistentPinIcon
@@ -298,6 +319,7 @@ export function ConversationCard({
onUnarchive={onUnarchive && handleUnarchive}
onStop={onStop && handleStop}
onEdit={onChangeTitle && handleEdit}
+ onEditTags={onEditTags && handleEditTags}
onDownloadViaVSCode={handleDownloadViaVSCode}
onDownloadConversation={handleDownloadConversation}
executionStatus={executionStatus}
@@ -325,6 +347,7 @@ export function ConversationCard({
onUnarchive={onUnarchive && handleUnarchive}
onStop={onStop && handleStop}
onEdit={onChangeTitle && handleEdit}
+ onEditTags={onEditTags && handleEditTags}
onDownloadViaVSCode={handleDownloadViaVSCode}
onDownloadConversation={handleDownloadConversation}
executionStatus={executionStatus}
@@ -351,7 +374,7 @@ export function ConversationCard({
agentKind={agentKind}
acpServer={acpServer}
tags={tags}
- showTags={showTags}
+ showTags={showTagChipRow}
isArchived={isArchived}
/>
)}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-tag-chips.tsx b/src/components/features/conversation-panel/conversation-card/conversation-tag-chips.tsx
index a974ceb8fa..b1a006f5ef 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-tag-chips.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-tag-chips.tsx
@@ -71,14 +71,19 @@ function TagChipContent({
return (
<>
<TagIconSlot icon={icon} keyName={keyName} testId={iconTestId} />
- <span className="truncate leading-4">{truncateTagChipValue(value)}</span>
+ {/* Bare tags (empty value) fall back to the key so the chip is never
+ an empty pill. */}
+ <span className="truncate leading-4">
+ {truncateTagChipValue(value || keyName)}
+ </span>
</>
);
}
/**
* Single-row tag chips for a conversation card. Chip labels are value-only
- * (key lives in the tooltip); chips that do not fit fold behind a ``+N``
+ * (bare tags with an empty value show the key; the full ``key: value`` pair
+ * lives in the tooltip); chips that do not fit fold behind a ``+N``
* button that opens a key/value popover.
*
* The overflow popover is portaled with ``position: fixed`` so it is not
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-tag-display.ts b/src/components/features/conversation-panel/conversation-card/conversation-tag-display.ts
index 72d08458a5..73206c3823 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-tag-display.ts
+++ b/src/components/features/conversation-panel/conversation-card/conversation-tag-display.ts
@@ -115,13 +115,15 @@ export function getConversationTagLabel(
}
}
-/** ``Branch: main`` — used by chip ``title`` tooltips. */
+/** ``Branch: main`` — used by chip ``title`` tooltips. Bare tags (empty
+ * value) show the label alone, no dangling colon. */
export function formatConversationTagTooltip(
key: string,
value: string,
t: (key: I18nKey) => string,
): string {
- return `${getConversationTagLabel(key, t)}: ${value}`;
+ const label = getConversationTagLabel(key, t);
+ return value ? `${label}: ${value}` : label;
}
/**
diff --git a/src/components/features/conversation-panel/conversation-layouts-menu.tsx b/src/components/features/conversation-panel/conversation-layouts-menu.tsx
new file mode 100644
index 0000000000..df231e8388
--- /dev/null
+++ b/src/components/features/conversation-panel/conversation-layouts-menu.tsx
@@ -0,0 +1,310 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import {
+ Clock3,
+ Folder,
+ ListFilter,
+ Shrink,
+ SlidersHorizontal,
+ Star,
+ Tag,
+ Trash2,
+} from "lucide-react";
+import { I18nKey } from "#/i18n/declaration";
+import type { BackendKind } from "#/api/backend-registry/types";
+import { cn } from "#/utils/utils";
+import {
+ dropdownInstantColorClassName,
+ dropdownMenuListClassName,
+ dropdownMenuViewportScrollClassName,
+} from "#/utils/dropdown-classes";
+import {
+ DEFAULT_LAYOUT_SETTINGS,
+ useConversationPanelPreferencesStore,
+ type LayoutSettingsSlice,
+} from "#/stores/conversation-panel-preferences-store";
+import { formatTagFacetLabel } from "./conversation-panel-list-helpers";
+import { MenuHeading } from "./menu-heading";
+import { MenuSeparator } from "./menu-separator";
+import { MenuRow } from "./menu-row";
+import { AdvancedConversationOptionsModal } from "./advanced-conversation-options-modal";
+
+interface LayoutPreset {
+ id: string;
+ icon: React.ComponentType<{ className?: string; "aria-hidden"?: boolean }>;
+ /** Omitted for the backend-dependent first preset (workspace vs repo). */
+ labelKey?: I18nKey;
+ settings: LayoutSettingsSlice;
+}
+
+/**
+ * Layout presets are complete preference bundles (design inference from the
+ * 2026-08-14 PM walkthrough video; the video names the presets but not their
+ * exact bundles). Applying one replaces every layout-controlled field so a
+ * previous preset cannot leak into the next one. Any manual deviation reads
+ * as "Custom".
+ */
+const LAYOUT_PRESETS: LayoutPreset[] = [
+ {
+ id: "by-workspace",
+ icon: Folder,
+ settings: {
+ ...DEFAULT_LAYOUT_SETTINGS,
+ organizeMode: "grouped",
+ },
+ },
+ {
+ id: "recent-activity",
+ icon: Clock3,
+ labelKey: I18nKey.CONVERSATION_PANEL$LAYOUT_RECENT_ACTIVITY,
+ settings: {
+ ...DEFAULT_LAYOUT_SETTINGS,
+ showOlderConversations: false,
+ },
+ },
+ {
+ id: "focused",
+ icon: Star,
+ labelKey: I18nKey.CONVERSATION_PANEL$LAYOUT_FOCUSED,
+ settings: {
+ ...DEFAULT_LAYOUT_SETTINGS,
+ threadScope: "relevant",
+ showOlderConversations: false,
+ },
+ },
+ {
+ id: "minimal",
+ icon: Shrink,
+ labelKey: I18nKey.CONVERSATION_PANEL$LAYOUT_MINIMAL,
+ settings: {
+ ...DEFAULT_LAYOUT_SETTINGS,
+ threadScope: "relevant",
+ showOlderConversations: false,
+ showRepoBranchMetadata: false,
+ showLlmProfiles: false,
+ showTagsMetadata: false,
+ showHoverMetadata: false,
+ },
+ },
+];
+
+export function getActiveLayoutPreset(
+ settings: LayoutSettingsSlice,
+): LayoutPreset | null {
+ return (
+ LAYOUT_PRESETS.find((preset) =>
+ Object.entries(preset.settings).every(
+ ([key, value]) => settings[key as keyof LayoutSettingsSlice] === value,
+ ),
+ ) ?? null
+ );
+}
+
+export interface ConversationLayoutsMenuProps {
+ menuOpen: boolean;
+ setMenuOpen: (open: boolean) => void;
+ menuRef: React.RefObject<HTMLDivElement | null>;
+ backendKind: BackendKind;
+ /** Distinct user-facing `key=value` facets among the loaded conversations. */
+ tagFacets: readonly string[];
+ /** Distinct automation names; the advanced modal owns their facet rows. */
+ automationNameFacets: readonly string[];
+ totalConversationsCount: number;
+ onRequestDeleteAll: () => void;
+}
+
+export function ConversationLayoutsMenu({
+ menuOpen,
+ setMenuOpen,
+ menuRef,
+ backendKind,
+ tagFacets,
+ automationNameFacets,
+ totalConversationsCount,
+ onRequestDeleteAll,
+}: ConversationLayoutsMenuProps) {
+ const { t } = useTranslation("openhands");
+ const preferences = useConversationPanelPreferencesStore();
+ const [tagSectionExpanded, setTagSectionExpanded] = React.useState(false);
+ const [advancedOpen, setAdvancedOpen] = React.useState(false);
+
+ const groupedLabel =
+ backendKind === "local"
+ ? t(I18nKey.CONVERSATION_PANEL$BY_WORKSPACE)
+ : t(I18nKey.CONVERSATION_PANEL$BY_REPOSITORY);
+
+ const activePreset = getActiveLayoutPreset(preferences);
+
+ const triggerRef = React.useRef<HTMLButtonElement>(null);
+ const menuContentRef = React.useRef<HTMLDivElement>(null);
+
+ // Mirror the filter menu's focus management: focus into the menu on open,
+ // return focus to the trigger on close.
+ const wasOpenRef = React.useRef(menuOpen);
+ React.useEffect(() => {
+ if (menuOpen) {
+ const firstItem =
+ menuContentRef.current?.querySelector<HTMLButtonElement>(
+ '[role="menuitem"], [role="menuitemradio"], [role="menuitemcheckbox"]',
+ );
+ firstItem?.focus();
+ } else if (wasOpenRef.current) {
+ triggerRef.current?.focus();
+ }
+ wasOpenRef.current = menuOpen;
+ }, [menuOpen]);
+
+ const handleMenuKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+ if (event.key === "Escape") {
+ event.preventDefault();
+ setMenuOpen(false);
+ return;
+ }
+ if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return;
+ const container = menuContentRef.current;
+ if (!container) return;
+ const items = Array.from(
+ container.querySelectorAll<HTMLButtonElement>(
+ '[role="menuitem"], [role="menuitemradio"], [role="menuitemcheckbox"]',
+ ),
+ ).filter((el) => !el.disabled);
+ if (items.length === 0) return;
+ const currentIdx = items.indexOf(
+ document.activeElement as HTMLButtonElement,
+ );
+ const delta = event.key === "ArrowDown" ? 1 : -1;
+ const start = currentIdx === -1 ? 0 : currentIdx;
+ const nextIdx = (start + delta + items.length) % items.length;
+ event.preventDefault();
+ items[nextIdx]?.focus();
+ };
+
+ return (
+ <div ref={menuRef} className="relative shrink-0 pr-0.5">
+ <button
+ ref={triggerRef}
+ type="button"
+ data-testid="conversation-layouts-toggle"
+ aria-label={t(I18nKey.CONVERSATION_PANEL$LAYOUTS_HEADING)}
+ aria-haspopup="menu"
+ aria-expanded={menuOpen}
+ onClick={() => setMenuOpen(!menuOpen)}
+ className={cn(
+ "relative inline-flex h-7 w-7 items-center justify-center rounded-md text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
+ dropdownInstantColorClassName,
+ )}
+ >
+ <ListFilter
+ className="shrink-0"
+ size={14}
+ strokeWidth={2}
+ aria-hidden
+ />
+ </button>
+
+ {menuOpen ? (
+ <div
+ ref={menuContentRef}
+ role="menu"
+ aria-orientation="vertical"
+ aria-label={t(I18nKey.CONVERSATION_PANEL$LAYOUTS_HEADING)}
+ tabIndex={-1}
+ data-testid="conversation-layouts-menu"
+ onKeyDown={handleMenuKeyDown}
+ className={cn(
+ "absolute right-0 top-full z-50 mt-0 w-64 rounded-md border border-[var(--oh-border-subtle)] bg-tertiary px-1 py-1 text-[var(--oh-foreground)] shadow-lg",
+ dropdownMenuListClassName,
+ dropdownMenuViewportScrollClassName,
+ )}
+ >
+ <MenuHeading>
+ {t(I18nKey.CONVERSATION_PANEL$LAYOUTS_HEADING)}
+ </MenuHeading>
+ {LAYOUT_PRESETS.map((preset) => (
+ <MenuRow
+ key={preset.id}
+ icon={preset.icon}
+ label={preset.labelKey ? t(preset.labelKey) : groupedLabel}
+ selected={activePreset?.id === preset.id}
+ testId={`layout-preset-${preset.id}`}
+ onClick={() => {
+ preferences.applyLayoutSettings(preset.settings);
+ setMenuOpen(false);
+ }}
+ />
+ ))}
+
+ <MenuSeparator />
+ <MenuRow
+ icon={Tag}
+ label={t(I18nKey.CONVERSATION_PANEL$TAG_FILTERS)}
+ testId="tag-filters-section"
+ onClick={() => setTagSectionExpanded(!tagSectionExpanded)}
+ />
+ {tagSectionExpanded ? (
+ tagFacets.length > 0 ? (
+ tagFacets.map((facet) => (
+ <MenuRow
+ key={facet}
+ icon={Tag}
+ label={formatTagFacetLabel(facet)}
+ selected={preferences.selectedTagFacets.includes(facet)}
+ testId={`tag-facet-row-${facet}`}
+ onClick={() => preferences.toggleTagFacet(facet)}
+ />
+ ))
+ ) : (
+ <p
+ data-testid="tag-filters-empty"
+ className="px-2 py-1 text-[11px] text-[var(--oh-muted)]/70"
+ >
+ {t(I18nKey.CONVERSATION_PANEL$NO_VISIBLE_TAGS)}
+ </p>
+ )
+ ) : null}
+
+ <MenuSeparator />
+ <MenuRow
+ icon={SlidersHorizontal}
+ label={
+ activePreset
+ ? t(I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS)
+ : `${t(I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS)} · ${t(
+ I18nKey.CONVERSATION_PANEL$ADVANCED_OPTIONS_CUSTOM,
+ )}`
+ }
+ testId="advanced-options-row"
+ onClick={() => {
+ setMenuOpen(false);
+ setAdvancedOpen(true);
+ }}
+ />
+
+ <MenuSeparator />
+ <MenuRow
+ testId="delete-all-conversations"
+ icon={Trash2}
+ label={capitalizeLabel(t(I18nKey.CONVERSATION$DELETE_ALL))}
+ disabled={totalConversationsCount === 0}
+ destructive
+ onClick={() => {
+ if (totalConversationsCount === 0) return;
+ onRequestDeleteAll();
+ setMenuOpen(false);
+ }}
+ />
+ </div>
+ ) : null}
+
+ <AdvancedConversationOptionsModal
+ open={advancedOpen}
+ onClose={() => setAdvancedOpen(false)}
+ backendKind={backendKind}
+ automationNameFacets={automationNameFacets}
+ />
+ </div>
+ );
+}
+
+const capitalizeLabel = (label: string) =>
+ label.length > 0 ? label.charAt(0).toUpperCase() + label.slice(1) : label;
diff --git a/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx b/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx
deleted file mode 100644
index f80967709b..0000000000
--- a/src/components/features/conversation-panel/conversation-panel-filter-menu.tsx
+++ /dev/null
@@ -1,422 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import {
- Archive,
- Bot,
- CalendarArrowDown,
- Clock3,
- ClockArrowDown,
- Eye,
- EyeOff,
- Folder,
- GitBranch,
- ListFilter,
- MessageCircle,
- MousePointerClick,
- Star,
- Tag,
- Trash2,
- Workflow,
-} from "lucide-react";
-import { I18nKey } from "#/i18n/declaration";
-import type { BackendKind } from "#/api/backend-registry/types";
-import { cn } from "#/utils/utils";
-import {
- dropdownInstantColorClassName,
- dropdownMenuListClassName,
- dropdownMenuViewportScrollClassName,
-} from "#/utils/dropdown-classes";
-import {
- UNNAMED_AUTOMATION_FACET,
- type AutomationFilterMode,
- type ConversationSortField,
- type OrganizeMode,
- type ThreadScope,
-} from "./conversation-panel-list-helpers";
-import { MenuHeading } from "./menu-heading";
-import { MenuSeparator } from "./menu-separator";
-import { MenuRow } from "./menu-row";
-
-const capitalizeLabel = (label: string) =>
- label.length > 0 ? label.charAt(0).toUpperCase() + label.slice(1) : label;
-
-export interface ConversationPanelFilterMenuProps {
- filterMenuOpen: boolean;
- setFilterMenuOpen: (open: boolean) => void;
- menuRef: React.RefObject<HTMLDivElement | null>;
- backendKind: BackendKind;
- organizeMode: OrganizeMode;
- setOrganizeMode: (mode: OrganizeMode) => void;
- conversationSort: ConversationSortField;
- setConversationSort: (sort: ConversationSortField) => void;
- threadScope: ThreadScope;
- setThreadScope: (scope: ThreadScope) => void;
- automationFilterMode: AutomationFilterMode;
- setAutomationFilterMode: (mode: AutomationFilterMode) => void;
- selectedAutomationNames: string[];
- onToggleAutomationName: (name: string) => void;
- automationNameFacets: string[];
- showOlderConversations: boolean;
- showArchivedConversations: boolean;
- toggleShowArchivedConversations: () => void;
- toggleShowOlderConversations: () => void;
- showRepoBranchMetadata: boolean;
- toggleShowRepoBranchMetadata: () => void;
- showLlmProfiles: boolean;
- toggleShowLlmProfiles: () => void;
- showTagsMetadata: boolean;
- toggleShowTagsMetadata: () => void;
- showHoverMetadata: boolean;
- toggleShowHoverMetadata: () => void;
- totalConversationsCount: number;
- onRequestDeleteAll: () => void;
-}
-
-export function ConversationPanelFilterMenu({
- filterMenuOpen,
- setFilterMenuOpen,
- menuRef,
- backendKind,
- organizeMode,
- setOrganizeMode,
- conversationSort,
- setConversationSort,
- threadScope,
- setThreadScope,
- automationFilterMode,
- setAutomationFilterMode,
- selectedAutomationNames,
- onToggleAutomationName,
- automationNameFacets,
- showOlderConversations,
- showArchivedConversations,
- toggleShowArchivedConversations,
- toggleShowOlderConversations,
- showRepoBranchMetadata,
- toggleShowRepoBranchMetadata,
- showLlmProfiles,
- toggleShowLlmProfiles,
- showTagsMetadata,
- toggleShowTagsMetadata,
- showHoverMetadata,
- toggleShowHoverMetadata,
- totalConversationsCount,
- onRequestDeleteAll,
-}: ConversationPanelFilterMenuProps) {
- const { t } = useTranslation("openhands");
-
- const groupedLabel =
- backendKind === "local"
- ? t(I18nKey.CONVERSATION_PANEL$BY_WORKSPACE)
- : t(I18nKey.CONVERSATION_PANEL$BY_REPOSITORY);
-
- const triggerRef = React.useRef<HTMLButtonElement>(null);
- const menuContentRef = React.useRef<HTMLDivElement>(null);
-
- // When the menu opens, move keyboard focus into it so screen-reader /
- // keyboard-only users can interact with the options immediately. When
- // it closes, return focus to the trigger so Tab order picks up where
- // the user left off.
- const wasOpenRef = React.useRef(filterMenuOpen);
- React.useEffect(() => {
- if (filterMenuOpen) {
- const firstItem =
- menuContentRef.current?.querySelector<HTMLButtonElement>(
- '[role="menuitem"], [role="menuitemradio"]',
- );
- firstItem?.focus();
- } else if (wasOpenRef.current) {
- // Only return focus on a real open→close transition (not the
- // mount-with-open=false case).
- triggerRef.current?.focus();
- }
- wasOpenRef.current = filterMenuOpen;
- }, [filterMenuOpen]);
-
- // Roving Arrow Up/Down + Escape across the menu items. Tab still works
- // natively; Escape closes the menu and returns focus to the trigger
- // (via the effect above).
- const handleMenuKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
- if (event.key === "Escape") {
- event.preventDefault();
- setFilterMenuOpen(false);
- return;
- }
- if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return;
- const container = menuContentRef.current;
- if (!container) return;
- const items = Array.from(
- container.querySelectorAll<HTMLButtonElement>(
- '[role="menuitem"], [role="menuitemradio"]',
- ),
- ).filter((el) => !el.disabled);
- if (items.length === 0) return;
- const currentIdx = items.indexOf(
- document.activeElement as HTMLButtonElement,
- );
- const delta = event.key === "ArrowDown" ? 1 : -1;
- const start = currentIdx === -1 ? 0 : currentIdx;
- const nextIdx = (start + delta + items.length) % items.length;
- event.preventDefault();
- items[nextIdx]?.focus();
- };
-
- return (
- <div ref={menuRef} className="relative shrink-0 pr-0.5">
- <button
- ref={triggerRef}
- type="button"
- data-testid="older-conversations-filter-toggle"
- aria-label={t(I18nKey.CONVERSATION_PANEL$FILTER_LABEL)}
- aria-haspopup="menu"
- aria-expanded={filterMenuOpen}
- onClick={() => setFilterMenuOpen(!filterMenuOpen)}
- className={cn(
- "relative inline-flex h-7 w-7 items-center justify-center rounded-md text-[var(--oh-muted)] hover:text-white hover:bg-[var(--oh-surface-raised)]",
- dropdownInstantColorClassName,
- )}
- >
- <ListFilter
- className="lucide lucide-list-filter shrink-0"
- width={14}
- height={14}
- strokeWidth={2}
- aria-hidden
- />
- {automationFilterMode !== "all" ? (
- <span
- aria-hidden
- data-testid="automation-filter-active-indicator"
- className="absolute right-0.5 top-0.5 h-1.5 w-1.5 rounded-full bg-[var(--oh-accent)]"
- />
- ) : null}
- </button>
-
- {filterMenuOpen ? (
- <div
- ref={menuContentRef}
- role="menu"
- aria-orientation="vertical"
- aria-label={t(I18nKey.CONVERSATION_PANEL$FILTER_LABEL)}
- // `role="menu"` is an interactive ARIA role, so the container
- // must be focusable to satisfy jsx-a11y. `-1` keeps it out of
- // the natural Tab order (the menu items themselves are
- // `<button>`s and tabbable on their own) but still allows the
- // open-effect to focus it / its children programmatically.
- tabIndex={-1}
- data-testid="older-conversations-filter-menu"
- onKeyDown={handleMenuKeyDown}
- className={cn(
- "absolute right-0 top-full z-50 mt-0 w-64 rounded-md border border-[var(--oh-border-subtle)] bg-tertiary px-1 py-1 text-[var(--oh-foreground)] shadow-lg",
- dropdownMenuListClassName,
- dropdownMenuViewportScrollClassName,
- )}
- >
- <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$ORGANIZE)}</MenuHeading>
- <MenuRow
- icon={Folder}
- label={groupedLabel}
- selected={organizeMode === "grouped"}
- onClick={() => {
- setOrganizeMode("grouped");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Clock3}
- label={t(I18nKey.CONVERSATION_PANEL$CHRONOLOGICAL)}
- selected={organizeMode === "chronological"}
- onClick={() => {
- setOrganizeMode("chronological");
- setFilterMenuOpen(false);
- }}
- />
-
- <MenuSeparator />
- <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$SORT_BY)}</MenuHeading>
- <MenuRow
- icon={CalendarArrowDown}
- label={t(I18nKey.CONVERSATION_PANEL$SORT_CREATED)}
- selected={conversationSort === "created"}
- onClick={() => {
- setConversationSort("created");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={ClockArrowDown}
- label={t(I18nKey.CONVERSATION_PANEL$SORT_UPDATED)}
- selected={conversationSort === "updated"}
- onClick={() => {
- setConversationSort("updated");
- setFilterMenuOpen(false);
- }}
- />
-
- <MenuSeparator />
- <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$SHOW)}</MenuHeading>
- <MenuRow
- icon={MessageCircle}
- label={t(I18nKey.CONVERSATION_PANEL$ALL_THREADS)}
- selected={threadScope === "all"}
- onClick={() => {
- setThreadScope("all");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Star}
- label={t(I18nKey.CONVERSATION_PANEL$RELEVANT_THREADS)}
- selected={threadScope === "relevant"}
- onClick={() => {
- setThreadScope("relevant");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Archive}
- label={t(I18nKey.CONVERSATION_PANEL$SHOW_ARCHIVED)}
- selected={showArchivedConversations}
- testId="toggle-show-archived"
- onClick={() => {
- toggleShowArchivedConversations();
- setFilterMenuOpen(false);
- }}
- />
-
- <MenuSeparator />
- <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS)}</MenuHeading>
- <MenuRow
- icon={MessageCircle}
- label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_ALL)}
- selected={automationFilterMode === "all"}
- testId="automation-filter-all"
- onClick={() => {
- setAutomationFilterMode("all");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={EyeOff}
- label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_HIDE)}
- selected={automationFilterMode === "hide-automations"}
- testId="automation-filter-hide"
- onClick={() => {
- setAutomationFilterMode("hide-automations");
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Workflow}
- label={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS_ONLY)}
- selected={automationFilterMode === "only-automations"}
- testId="automation-filter-only"
- onClick={() => {
- setAutomationFilterMode("only-automations");
- setFilterMenuOpen(false);
- }}
- />
- {automationFilterMode === "only-automations"
- ? automationNameFacets.map((facet) => (
- <MenuRow
- key={facet}
- icon={Tag}
- label={
- facet === UNNAMED_AUTOMATION_FACET
- ? t(I18nKey.CONVERSATION_PANEL$AUTOMATION_UNNAMED)
- : facet
- }
- selected={selectedAutomationNames.includes(facet)}
- testId={`automation-name-filter-${facet}`}
- // Multi-select name rows keep the menu open (unlike the
- // mode radios above) so several names can be toggled in
- // one visit.
- onClick={() => onToggleAutomationName(facet)}
- />
- ))
- : null}
-
- <MenuSeparator />
- <MenuHeading>{t(I18nKey.CONVERSATION_PANEL$METADATA)}</MenuHeading>
- <MenuRow
- icon={GitBranch}
- label={t(I18nKey.CONVERSATION_PANEL$REPO_BRANCH)}
- selected={showRepoBranchMetadata}
- testId="toggle-repo-branch-metadata"
- onClick={() => {
- toggleShowRepoBranchMetadata();
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Bot}
- label={t(I18nKey.CONVERSATION_PANEL$LLM_MODEL)}
- selected={showLlmProfiles}
- testId="toggle-llm-profiles"
- onClick={() => {
- toggleShowLlmProfiles();
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={Tag}
- label={t(I18nKey.CONVERSATION_PANEL$TAGS)}
- selected={showTagsMetadata}
- testId="toggle-tags-metadata"
- onClick={() => {
- toggleShowTagsMetadata();
- setFilterMenuOpen(false);
- }}
- />
- <MenuRow
- icon={MousePointerClick}
- label={t(I18nKey.CONVERSATION_PANEL$HOVER_METADATA)}
- selected={showHoverMetadata}
- testId="toggle-hover-metadata"
- onClick={() => {
- toggleShowHoverMetadata();
- setFilterMenuOpen(false);
- }}
- />
-
- <MenuSeparator />
- <MenuHeading
- suffix={
- <span className="shrink-0 text-right text-[10px] font-medium normal-case tracking-normal text-[var(--oh-muted)]/70">
- {t(I18nKey.CONVERSATION_PANEL$OLDER_OVER_ONE_HOUR)}
- </span>
- }
- >
- {t(I18nKey.CONVERSATION_PANEL$OLDER_SECTION)}
- </MenuHeading>
- <MenuRow
- testId="toggle-older-conversations"
- icon={showOlderConversations ? EyeOff : Eye}
- label={
- showOlderConversations
- ? capitalizeLabel(t(I18nKey.CONVERSATION$HIDE))
- : capitalizeLabel(t(I18nKey.CONVERSATION$SHOW_ALL))
- }
- onClick={() => {
- toggleShowOlderConversations();
- setFilterMenuOpen(false);
- }}
- />
-
- <MenuSeparator />
- <MenuRow
- testId="delete-all-conversations"
- icon={Trash2}
- label={capitalizeLabel(t(I18nKey.CONVERSATION$DELETE_ALL))}
- disabled={totalConversationsCount === 0}
- onClick={() => {
- if (totalConversationsCount === 0) return;
- onRequestDeleteAll();
- setFilterMenuOpen(false);
- }}
- />
- </div>
- ) : null}
- </div>
- );
-}
diff --git a/src/components/features/conversation-panel/conversation-panel-list-helpers.ts b/src/components/features/conversation-panel/conversation-panel-list-helpers.ts
index 0efba6e7dc..aa25b3253a 100644
--- a/src/components/features/conversation-panel/conversation-panel-list-helpers.ts
+++ b/src/components/features/conversation-panel/conversation-panel-list-helpers.ts
@@ -5,6 +5,7 @@ import type { Provider } from "#/types/settings";
import {
AUTOMATION_NAME_TAG_KEY,
AUTOMATION_TAG_KEYS,
+ getDisplayConversationTags,
} from "#/api/agent-server-adapter";
export type ConversationSortField = "created" | "updated";
@@ -14,6 +15,59 @@ export type AutomationFilterMode =
| "all"
| "hide-automations"
| "only-automations";
+export type OlderConversationCutoff = "1h" | "1d" | "7d" | "30d";
+
+export const OLDER_CONVERSATION_CUTOFFS = [
+ "1h",
+ "1d",
+ "7d",
+ "30d",
+] as const satisfies readonly OlderConversationCutoff[];
+
+export const DEFAULT_OLDER_CONVERSATION_CUTOFF: OlderConversationCutoff = "7d";
+
+export const OLDER_CONVERSATION_CUTOFF_MS: Record<
+ OlderConversationCutoff,
+ number
+> = {
+ "1h": 60 * 60 * 1000,
+ "1d": 24 * 60 * 60 * 1000,
+ "7d": 7 * 24 * 60 * 60 * 1000,
+ "30d": 30 * 24 * 60 * 60 * 1000,
+};
+
+export function isOlderConversationCutoff(
+ value: unknown,
+): value is OlderConversationCutoff {
+ return (
+ typeof value === "string" &&
+ (OLDER_CONVERSATION_CUTOFFS as readonly string[]).includes(value)
+ );
+}
+
+/**
+ * Splits conversations by last update relative to `nowMs`. Missing or
+ * unparseable timestamps stay in `recent` so they are never hidden by the
+ * hide-older toggle.
+ */
+export function partitionByCutoff<T extends { updated_at: string }>(
+ items: readonly T[],
+ cutoffMs: number,
+ nowMs: number = Date.now(),
+): { recent: T[]; older: T[] } {
+ const cutoff = nowMs - cutoffMs;
+ const recent: T[] = [];
+ const older: T[] = [];
+ for (const item of items) {
+ const updatedAt = item.updated_at ? Date.parse(item.updated_at) : NaN;
+ if (Number.isFinite(updatedAt) && updatedAt < cutoff) {
+ older.push(item);
+ } else {
+ recent.push(item);
+ }
+ }
+ return { recent, older };
+}
/** Max conversations shown under a workspace/repo folder before "View more". */
export const GROUP_CONVERSATIONS_PREVIEW_LIMIT = 5;
@@ -235,6 +289,58 @@ export function applyAutomationConversationFilter(
});
}
+/**
+ * Distinct user-facing `key=value` facets among the given conversations,
+ * sorted A–Z for stable menu order. Reserved/internal tag keys are excluded
+ * via `getDisplayConversationTags`; unlike the automation filter there is no
+ * unnamed bucket — a conversation with no user tags simply yields no facet.
+ */
+export function collectTagFacets(
+ conversations: readonly AppConversation[],
+): string[] {
+ const facets = new Set<string>();
+ for (const conversation of conversations) {
+ for (const [key, value] of getDisplayConversationTags(conversation.tags)) {
+ facets.add(`${key}=${value}`);
+ }
+ }
+ return [...facets].sort((a, b) => a.localeCompare(b));
+}
+
+/**
+ * Display form of a stored facet: a bare tag (empty value, stored as `key=`)
+ * renders as just the key. Matching keeps the raw `key=value` form — this is
+ * label-only.
+ */
+export function formatTagFacetLabel(facet: string): string {
+ return facet.endsWith("=") ? facet.slice(0, -1) : facet;
+}
+
+/**
+ * Union semantics: a conversation matches when it carries ANY selected
+ * facet, mirroring the automation multi-select. An empty selection — or one
+ * that no longer intersects the available facets (tags edited away, stale
+ * selections persisted from another backend) — leaves the list unfiltered
+ * instead of yielding an unfillable empty list.
+ */
+export function applyTagConversationFilter(
+ conversations: readonly AppConversation[],
+ selectedFacets: readonly string[],
+ availableFacets: readonly string[],
+): AppConversation[] {
+ const facetSet = new Set(availableFacets);
+ const effectiveFacets = selectedFacets.filter((facet) => facetSet.has(facet));
+ if (effectiveFacets.length === 0) {
+ return [...conversations];
+ }
+ const narrowing = new Set(effectiveFacets);
+ return conversations.filter((conversation) =>
+ getDisplayConversationTags(conversation.tags).some(([key, value]) =>
+ narrowing.has(`${key}=${value}`),
+ ),
+ );
+}
+
/** Subset of `useCreateConversation` variables for launching from a group row */
export type ConversationGroupLaunch = {
workingDir?: string;
diff --git a/src/components/features/conversation-panel/conversation-panel.tsx b/src/components/features/conversation-panel/conversation-panel.tsx
index 878118930f..70759260f0 100644
--- a/src/components/features/conversation-panel/conversation-panel.tsx
+++ b/src/components/features/conversation-panel/conversation-panel.tsx
@@ -19,6 +19,8 @@ import { useClickOutsideElement } from "#/hooks/use-click-outside-element";
import { Provider } from "#/types/settings";
import type { LocalWorkspace } from "#/types/workspace";
import { useUpdateConversation } from "#/hooks/mutation/use-update-conversation";
+import { useUpdateConversationTags } from "#/hooks/mutation/use-update-conversation-tags";
+import { EditConversationTagsModal } from "./edit-conversation-tags-modal";
import {
displayErrorToast,
displaySuccessToast,
@@ -33,18 +35,25 @@ import { ConversationCardSkeleton } from "./conversation-card/conversation-card-
import { CompactConversationRow } from "./compact-conversation-row";
import { useConversationPanelPreferencesStore } from "#/stores/conversation-panel-preferences-store";
import { cn } from "#/utils/utils";
-import { ConversationPanelFilterMenu } from "./conversation-panel-filter-menu";
+import { ConversationLayoutsMenu } from "./conversation-layouts-menu";
+import { ConversationActiveTagFilters } from "./conversation-active-tag-filters";
import { ConversationPanelNewThreadPicker } from "./conversation-panel-new-thread-picker";
import { ConversationGroupFolderList } from "./conversation-group-folder-list";
import { ConversationPanelPinnedSection } from "./conversation-panel-pinned-section";
import {
applyAutomationConversationFilter,
applyGroupFolderOrder,
+ applyTagConversationFilter,
collectAutomationNameFacets,
+ collectTagFacets,
+ DEFAULT_OLDER_CONVERSATION_CUTOFF,
filterOutPinnedConversations,
getGroupDiscoveryConversationIds,
groupConversations,
+ isOlderConversationCutoff,
MAX_PAGES_PER_LOAD_MORE_CLICK,
+ OLDER_CONVERSATION_CUTOFF_MS,
+ partitionByCutoff,
resolvePinnedConversations,
sortConversationsByField,
type ConversationGroupLaunch,
@@ -66,30 +75,6 @@ const noop = () => {};
const EMPTY_PINNED_CONVERSATION_IDS: readonly string[] = [];
-const ONE_HOUR_MS = 60 * 60 * 1000;
-
-const partitionByCutoff = <T extends { updated_at: string }>(
- items: readonly T[],
-): { recent: T[]; older: T[] } => {
- // The cutoff is intentionally relative to "now" each time the list is
- // recomputed, so conversations naturally age into the older bucket as the
- // conversations query refreshes.
- const cutoff = Date.now() - ONE_HOUR_MS;
- const recent: T[] = [];
- const older: T[] = [];
- for (const item of items) {
- const updatedAt = item.updated_at ? Date.parse(item.updated_at) : NaN;
- // Missing or unparseable timestamps stay in the "recent" bucket so we
- // do not accidentally hide them behind the older-conversations toggle.
- if (Number.isFinite(updatedAt) && updatedAt < cutoff) {
- older.push(item);
- } else {
- recent.push(item);
- }
- }
- return { recent, older };
-};
-
export function ConversationPanel({
onClose,
compact = false,
@@ -108,6 +93,7 @@ export function ConversationPanel({
React.useState(false);
const [confirmArchiveModalVisible, setConfirmArchiveModalVisible] =
React.useState(false);
+ const [editTagsModalVisible, setEditTagsModalVisible] = React.useState(false);
const [confirmStopModalVisible, setConfirmStopModalVisible] =
React.useState(false);
const [
@@ -119,69 +105,51 @@ export function ConversationPanel({
const showOlderConversations = useConversationPanelPreferencesStore(
(state) => state.showOlderConversations,
);
+ const olderConversationCutoff = useConversationPanelPreferencesStore(
+ (state) => state.olderConversationCutoff,
+ );
const showArchivedConversations = useConversationPanelPreferencesStore(
(state) => state.showArchivedConversations,
);
- const toggleShowArchivedConversations = useConversationPanelPreferencesStore(
- (state) => state.toggleShowArchivedConversations,
- );
- const toggleShowOlderConversations = useConversationPanelPreferencesStore(
- (state) => state.toggleShowOlderConversations,
- );
const showRepoBranchMetadata = useConversationPanelPreferencesStore(
(state) => state.showRepoBranchMetadata,
);
- const toggleShowRepoBranchMetadata = useConversationPanelPreferencesStore(
- (state) => state.toggleShowRepoBranchMetadata,
- );
const showLlmProfiles = useConversationPanelPreferencesStore(
(state) => state.showLlmProfiles,
);
- const toggleShowLlmProfiles = useConversationPanelPreferencesStore(
- (state) => state.toggleShowLlmProfiles,
- );
const showTagsMetadata = useConversationPanelPreferencesStore(
(state) => state.showTagsMetadata,
);
- const toggleShowTagsMetadata = useConversationPanelPreferencesStore(
- (state) => state.toggleShowTagsMetadata,
- );
const showHoverMetadata = useConversationPanelPreferencesStore(
(state) => state.showHoverMetadata,
);
- const toggleShowHoverMetadata = useConversationPanelPreferencesStore(
- (state) => state.toggleShowHoverMetadata,
- );
const organizeMode = useConversationPanelPreferencesStore(
(state) => state.organizeMode,
);
- const setOrganizeMode = useConversationPanelPreferencesStore(
- (state) => state.setOrganizeMode,
- );
const conversationSort = useConversationPanelPreferencesStore(
(state) => state.conversationSort,
);
- const setConversationSort = useConversationPanelPreferencesStore(
- (state) => state.setConversationSort,
- );
const threadScope = useConversationPanelPreferencesStore(
(state) => state.threadScope,
);
- const setThreadScope = useConversationPanelPreferencesStore(
- (state) => state.setThreadScope,
- );
const automationFilterMode = useConversationPanelPreferencesStore(
(state) => state.automationFilterMode,
);
- const setAutomationFilterMode = useConversationPanelPreferencesStore(
- (state) => state.setAutomationFilterMode,
- );
const selectedAutomationNames = useConversationPanelPreferencesStore(
(state) => state.selectedAutomationNames,
);
+ const selectedTagFacets = useConversationPanelPreferencesStore(
+ (state) => state.selectedTagFacets,
+ );
+ const toggleTagFacet = useConversationPanelPreferencesStore(
+ (state) => state.toggleTagFacet,
+ );
const toggleAutomationName = useConversationPanelPreferencesStore(
(state) => state.toggleAutomationName,
);
+ const clearFilterSelections = useConversationPanelPreferencesStore(
+ (state) => state.clearFilterSelections,
+ );
const groupFolderOrder = useConversationPanelPreferencesStore(
(state) => state.groupFolderOrder,
);
@@ -339,7 +307,7 @@ export function ConversationPanel({
}, [allLoadedConversations, archivedIdSet, showArchivedConversations]);
// Facets derive from the unfiltered list so the automation-name rows in the
- // filter menu don't vanish while a narrowing selection is active.
+ // advanced-options modal don't vanish while a narrowing selection is active.
const automationNameFacets = React.useMemo(
() => collectAutomationNameFacets(conversations),
[conversations],
@@ -401,6 +369,25 @@ export function ConversationPanel({
],
);
+ // Tag facets likewise derive from the unfiltered list so the tag rows in
+ // the layouts menu don't vanish while a narrowing selection is active.
+ const tagFacets = React.useMemo(
+ () => collectTagFacets(conversations),
+ [conversations],
+ );
+
+ // The tag filter applies after the automation filter so a conversation
+ // must pass both.
+ const tagFilteredConversations = React.useMemo(
+ () =>
+ applyTagConversationFilter(
+ automationFilteredConversations,
+ selectedTagFacets,
+ tagFacets,
+ ),
+ [automationFilteredConversations, selectedTagFacets, tagFacets],
+ );
+
const pinnedConversations = React.useMemo(
() => resolvePinnedConversations(pinnedIds, conversations),
[conversations, pinnedIds],
@@ -426,14 +413,15 @@ export function ConversationPanel({
}, [pinnedIds.length]);
const scopedConversations = React.useMemo(() => {
- // The pinned section intentionally bypasses the automation filter (same
- // exemption the thread scope has): a pin is an explicit user override.
+ // The pinned section intentionally bypasses the automation and tag
+ // filters (same exemption the thread scope has): a pin is an explicit
+ // user override.
const scopeFiltered =
threadScope === "relevant"
- ? automationFilteredConversations.filter((c) =>
+ ? tagFilteredConversations.filter((c) =>
isExecutionActive(c.execution_status),
)
- : automationFilteredConversations;
+ : tagFilteredConversations;
// In the expanded panel, pinned conversations should only appear inside
// the dedicated pinned section (not duplicated in grouped/flat lists).
@@ -442,12 +430,17 @@ export function ConversationPanel({
}
return filterOutPinnedConversations(scopeFiltered, pinnedIds);
- }, [automationFilteredConversations, compact, pinnedIds, threadScope]);
-
- const { recent: recentScoped, older: olderScoped } = React.useMemo(
- () => partitionByCutoff(scopedConversations),
- [scopedConversations],
- );
+ }, [tagFilteredConversations, compact, pinnedIds, threadScope]);
+
+ const { recent: recentScoped, older: olderScoped } = React.useMemo(() => {
+ const cutoff = isOlderConversationCutoff(olderConversationCutoff)
+ ? olderConversationCutoff
+ : DEFAULT_OLDER_CONVERSATION_CUTOFF;
+ return partitionByCutoff(
+ scopedConversations,
+ OLDER_CONVERSATION_CUTOFF_MS[cutoff],
+ );
+ }, [olderConversationCutoff, scopedConversations]);
// Sort the full visible set as one list. The recent/older partition is
// still computed (it gates the "Show older" toggle and "Load more"
@@ -566,6 +559,14 @@ export function ConversationPanel({
conversations.length > 0 &&
automationFilteredConversations.length === 0;
+ // Same attribution for the tag filter: it produced zero rows out of what
+ // the automation filter left behind.
+ const emptyDueToTagFilter =
+ listIsEffectivelyEmpty &&
+ selectedTagFacets.length > 0 &&
+ automationFilteredConversations.length > 0 &&
+ tagFilteredConversations.length === 0;
+
// Grouped pagination prefers discovering another folder; chronological
// pagination succeeds when another row appears. Pages that only deepen
// already-visible folders are not success for the grouped control — the
@@ -674,6 +675,7 @@ export function ConversationPanel({
useDeleteConversation();
const { mutate: pauseConversation } = useUnifiedPauseConversation();
const { mutate: updateConversation } = useUpdateConversation();
+ const { mutate: updateConversationTags } = useUpdateConversationTags();
// The next page of conversations is loaded only via the explicit "Load
// more" link rendered at the end of the list — there is no scroll-driven
@@ -730,6 +732,31 @@ export function ConversationPanel({
[],
);
+ // Editing tags is a local agent-server affordance: Cloud conversations
+ // don't carry server-side tags (`tags` stays null), so the card leaves
+ // `onEditTags` undefined on Cloud and the menu item never appears there.
+ const handleEditTags = React.useCallback((conversationId: string) => {
+ setEditTagsModalVisible(true);
+ setSelectedConversationId(conversationId);
+ }, []);
+
+ const handleConfirmEditTags = React.useCallback(
+ (mergedTags: Record<string, string>) => {
+ if (!selectedConversationId) {
+ return;
+ }
+ updateConversationTags(
+ { conversationId: selectedConversationId, tags: mergedTags },
+ {
+ onSuccess: () => {
+ displaySuccessToast(t(I18nKey.CONVERSATION$TAGS_UPDATED));
+ },
+ },
+ );
+ },
+ [selectedConversationId, t, updateConversationTags],
+ );
+
// Unarchiving needs no confirmation: it restores a row the user can archive
// again in one click, and nothing about the conversation itself changes.
const handleUnarchiveProject = React.useCallback(
@@ -932,6 +959,11 @@ export function ConversationPanel({
: undefined
}
onStop={() => handleStopConversation(conversation.id)}
+ onEditTags={
+ activeBackend.kind === "local"
+ ? () => handleEditTags(conversation.id)
+ : undefined
+ }
onChangeTitle={(title) =>
handleConversationTitleChange(conversation.id, title)
}
@@ -973,12 +1005,14 @@ export function ConversationPanel({
},
[
activeBackend.id,
+ activeBackend.kind,
archivedIdSet,
compact,
currentConversationId,
handleArchiveProject,
handleConversationTitleChange,
handleDeleteProject,
+ handleEditTags,
handleStopConversation,
handleUnarchiveProject,
onClose,
@@ -1044,36 +1078,13 @@ export function ConversationPanel({
<ConversationPanelNewThreadPicker
backendKind={activeBackend.kind}
/>
- <ConversationPanelFilterMenu
- filterMenuOpen={filterMenuOpen}
- setFilterMenuOpen={setFilterMenuOpen}
+ <ConversationLayoutsMenu
+ menuOpen={filterMenuOpen}
+ setMenuOpen={setFilterMenuOpen}
menuRef={filterMenuRef}
backendKind={activeBackend.kind}
- organizeMode={organizeMode}
- setOrganizeMode={setOrganizeMode}
- conversationSort={conversationSort}
- setConversationSort={setConversationSort}
- threadScope={threadScope}
- setThreadScope={setThreadScope}
- automationFilterMode={automationFilterMode}
- setAutomationFilterMode={setAutomationFilterMode}
- selectedAutomationNames={selectedAutomationNames}
- onToggleAutomationName={toggleAutomationName}
+ tagFacets={tagFacets}
automationNameFacets={automationNameFacets}
- showOlderConversations={showOlderConversations}
- showArchivedConversations={showArchivedConversations}
- toggleShowArchivedConversations={
- toggleShowArchivedConversations
- }
- toggleShowOlderConversations={toggleShowOlderConversations}
- showRepoBranchMetadata={showRepoBranchMetadata}
- toggleShowRepoBranchMetadata={toggleShowRepoBranchMetadata}
- showLlmProfiles={showLlmProfiles}
- toggleShowLlmProfiles={toggleShowLlmProfiles}
- showTagsMetadata={showTagsMetadata}
- toggleShowTagsMetadata={toggleShowTagsMetadata}
- showHoverMetadata={showHoverMetadata}
- toggleShowHoverMetadata={toggleShowHoverMetadata}
totalConversationsCount={allLoadedConversations.length}
onRequestDeleteAll={() => setConfirmDeleteAllVisible(true)}
/>
@@ -1082,6 +1093,18 @@ export function ConversationPanel({
</div>
)}
+ {/* Sits above the list, not inside the scroll container: a filter that
+ scrolls out of view is a filter the user can't see. */}
+ {!compact && (
+ <ConversationActiveTagFilters
+ selectedFacets={selectedTagFacets}
+ onToggleFacet={toggleTagFacet}
+ selectedAutomationNames={selectedAutomationNames}
+ onToggleAutomationName={toggleAutomationName}
+ onClearAll={clearFilterSelections}
+ />
+ )}
+
<div
ref={scrollContainerRef}
data-testid="conversation-panel-list-scroll"
@@ -1104,7 +1127,9 @@ export function ConversationPanel({
{t(
emptyDueToAutomationFilter
? I18nKey.CONVERSATION_PANEL$NO_AUTOMATION_MATCHES
- : I18nKey.CONVERSATION$NO_CONVERSATIONS,
+ : emptyDueToTagFilter
+ ? I18nKey.CONVERSATION_PANEL$NO_TAG_MATCHES
+ : I18nKey.CONVERSATION$NO_CONVERSATIONS,
)}
</p>
</div>
@@ -1232,6 +1257,24 @@ export function ConversationPanel({
/>
)}
+ {editTagsModalVisible && (
+ <EditConversationTagsModal
+ // Read the complete map (including reserved/internal keys) so the
+ // modal can merge user edits without dropping them; look it up in
+ // the unfiltered loaded set so archived rows still resolve.
+ tags={
+ allLoadedConversations.find(
+ (conversation) => conversation.id === selectedConversationId,
+ )?.tags
+ }
+ onConfirm={(mergedTags) => {
+ handleConfirmEditTags(mergedTags);
+ setEditTagsModalVisible(false);
+ }}
+ onCancel={() => setEditTagsModalVisible(false)}
+ />
+ )}
+
{confirmDeleteAllVisible && (
<ConfirmDeleteModal
title={t(I18nKey.CONVERSATION$CONFIRM_DELETE_ALL_TITLE)}
diff --git a/src/components/features/conversation-panel/edit-conversation-tags-modal.tsx b/src/components/features/conversation-panel/edit-conversation-tags-modal.tsx
new file mode 100644
index 0000000000..660a6ba963
--- /dev/null
+++ b/src/components/features/conversation-panel/edit-conversation-tags-modal.tsx
@@ -0,0 +1,266 @@
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { X } from "lucide-react";
+import {
+ BaseModalDescription,
+ BaseModalTitle,
+} from "#/components/shared/modals/confirmation-modals/base-modal";
+import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
+import { ModalBody } from "#/components/shared/modals/modal-body";
+import { BrandButton } from "../settings/brand-button";
+import { I18nKey } from "#/i18n/declaration";
+import {
+ getDisplayConversationTags,
+ RESERVED_CONVERSATION_TAG_KEYS,
+} from "#/api/agent-server-adapter";
+
+/** Backend rule for tag keys (see `ConversationInfo.tags` in the SDK). */
+export const CONVERSATION_TAG_KEY_PATTERN = /^[a-z0-9]+$/;
+/** Backend cap on tag values (see `ConversationInfo.tags` in the SDK). */
+export const CONVERSATION_TAG_VALUE_MAX_LENGTH = 256;
+
+interface TagRow {
+ key: string;
+ value: string;
+}
+
+/**
+ * Merges the user's edited display tags with every entry the display helper
+ * drops from the current map (reserved/internal keys, whitespace-only or
+ * non-string values), so the replace-all PATCH never silently discards
+ * internal tags. Bare tags (empty-string values) are user-manageable and
+ * come through `editedUserTags` like any valued tag.
+ */
+export function mergeConversationTagEdits(
+ currentTags: Record<string, string> | null | undefined,
+ editedUserTags: readonly (readonly [string, string])[],
+): Record<string, string> {
+ const merged: Record<string, string> = {};
+ for (const [key, value] of Object.entries(currentTags ?? {})) {
+ // Preserve what the editor does not surface: reserved keys, non-string
+ // values, and whitespace-only values (raw-write junk the display drops).
+ // Empty-string values are bare tags — the editor manages them, so they
+ // must NOT be preserved here or a removed bare tag would resurrect.
+ if (
+ RESERVED_CONVERSATION_TAG_KEYS.has(key.trim().toLowerCase()) ||
+ typeof value !== "string" ||
+ (value !== "" && value.trim().length === 0)
+ ) {
+ merged[key] = value;
+ }
+ }
+ for (const [key, value] of editedUserTags) {
+ merged[key] = value;
+ }
+ return merged;
+}
+
+interface EditConversationTagsModalProps {
+ /** The conversation's complete server-side tag map (including internals). */
+ tags: Record<string, string> | null | undefined;
+ /** Called with the merged complete map (user edits + preserved internals). */
+ onConfirm: (mergedTags: Record<string, string>) => void;
+ onCancel: () => void;
+}
+
+export function EditConversationTagsModal({
+ tags,
+ onConfirm,
+ onCancel,
+}: EditConversationTagsModalProps) {
+ const { t } = useTranslation("openhands");
+ const [rows, setRows] = React.useState<TagRow[]>(() =>
+ getDisplayConversationTags(tags).map(([key, value]) => ({ key, value })),
+ );
+ const [newKey, setNewKey] = React.useState("");
+ const [newValue, setNewValue] = React.useState("");
+ const [errorKey, setErrorKey] = React.useState<I18nKey | null>(null);
+ const keyInputRef = React.useRef<HTMLInputElement>(null);
+
+ /**
+ * Validates whatever is sitting in the key/value inputs against the backend's
+ * tag rules and the rows already staged. Shared by Add and Save so both
+ * doors apply the same checks.
+ */
+ const buildPendingRow = (): { row: TagRow } | { errorKey: I18nKey } => {
+ const key = newKey.trim();
+ const value = newValue.trim();
+ if (!CONVERSATION_TAG_KEY_PATTERN.test(key)) {
+ return { errorKey: I18nKey.CONVERSATION$TAG_KEY_INVALID };
+ }
+ if (RESERVED_CONVERSATION_TAG_KEYS.has(key)) {
+ return { errorKey: I18nKey.CONVERSATION$TAG_KEY_RESERVED };
+ }
+ if (rows.some((row) => row.key === key)) {
+ return { errorKey: I18nKey.CONVERSATION$TAG_KEY_DUPLICATE };
+ }
+ // The value is optional: an empty value is a bare tag — stored as "" (the
+ // backend validator allows it) and rendered as just the key.
+ if (value.length > CONVERSATION_TAG_VALUE_MAX_LENGTH) {
+ return { errorKey: I18nKey.CONVERSATION$TAG_VALUE_INVALID };
+ }
+ return { row: { key, value } };
+ };
+
+ const handleAdd = () => {
+ const result = buildPendingRow();
+ if ("errorKey" in result) {
+ setErrorKey(result.errorKey);
+ return;
+ }
+ setRows((prev) => [...prev, result.row]);
+ setNewKey("");
+ setNewValue("");
+ setErrorKey(null);
+ // Ready for the next tag: focus returns to the key box, not the value box.
+ keyInputRef.current?.focus();
+ };
+
+ const handleInputKeyDown = (event: React.KeyboardEvent) => {
+ if (event.key === "Enter") {
+ event.preventDefault();
+ handleAdd();
+ }
+ };
+
+ const handleRemove = (key: string) => {
+ setRows((prev) => prev.filter((row) => row.key !== key));
+ };
+
+ const handleConfirm = () => {
+ // Add is an affordance for entering several tags, not a toll on entering
+ // one: a tag typed into the inputs and never Added is still a tag the user
+ // asked for, so Save commits it. If it doesn't validate, surface the error
+ // and keep the modal open — never drop the typing on the floor.
+ const hasPendingInput = newKey.trim() !== "" || newValue.trim() !== "";
+ let committedRows = rows;
+ if (hasPendingInput) {
+ const result = buildPendingRow();
+ if ("errorKey" in result) {
+ setErrorKey(result.errorKey);
+ return;
+ }
+ committedRows = [...rows, result.row];
+ }
+
+ onConfirm(
+ mergeConversationTagEdits(
+ tags,
+ committedRows.map((row) => [row.key, row.value] as const),
+ ),
+ );
+ };
+
+ return (
+ <ModalBackdrop onClose={onCancel}>
+ <ModalBody
+ className="items-start border border-[var(--oh-border)]"
+ testID="edit-conversation-tags-modal"
+ >
+ <div className="flex flex-col gap-2">
+ <BaseModalTitle title={t(I18nKey.CONVERSATION$EDIT_TAGS)} />
+ <BaseModalDescription>
+ {t(I18nKey.CONVERSATION$EDIT_TAGS_DESCRIPTION)}
+ </BaseModalDescription>
+ </div>
+
+ <div
+ className="flex w-full flex-col gap-2"
+ onClick={(event) => event.stopPropagation()}
+ >
+ {rows.length > 0 ? (
+ <ul
+ className="flex w-full flex-col gap-1"
+ data-testid="edit-tags-rows"
+ >
+ {rows.map((row) => (
+ <li
+ key={row.key}
+ className="flex items-center gap-2 rounded-md border border-[var(--oh-border)] px-2 py-1"
+ data-testid={`edit-tag-row-${row.key}`}
+ >
+ <span className="min-w-0 flex-1 truncate text-xs text-white">
+ {row.value ? `${row.key}=${row.value}` : row.key}
+ </span>
+ <button
+ type="button"
+ aria-label={t(I18nKey.CONVERSATION$REMOVE_TAG)}
+ data-testid={`remove-tag-${row.key}`}
+ onClick={() => handleRemove(row.key)}
+ className="shrink-0 text-[var(--oh-muted)] hover:text-white"
+ >
+ <X className="h-3.5 w-3.5" aria-hidden />
+ </button>
+ </li>
+ ))}
+ </ul>
+ ) : null}
+
+ <div className="flex w-full items-center gap-2">
+ <input
+ type="text"
+ value={newKey}
+ placeholder={t(I18nKey.CONVERSATION$TAG_KEY_PLACEHOLDER)}
+ aria-label={t(I18nKey.CONVERSATION$TAG_KEY_PLACEHOLDER)}
+ data-testid="new-tag-key-input"
+ ref={keyInputRef}
+ onChange={(event) => setNewKey(event.target.value)}
+ onKeyDown={handleInputKeyDown}
+ className="w-28 shrink-0 rounded-md border border-[var(--oh-border)] bg-base-secondary px-2 py-1 text-xs text-white placeholder:text-[var(--oh-muted)]"
+ />
+ <input
+ type="text"
+ value={newValue}
+ placeholder={t(I18nKey.CONVERSATION$TAG_VALUE_PLACEHOLDER)}
+ aria-label={t(I18nKey.CONVERSATION$TAG_VALUE_PLACEHOLDER)}
+ data-testid="new-tag-value-input"
+ onChange={(event) => setNewValue(event.target.value)}
+ onKeyDown={handleInputKeyDown}
+ className="min-w-0 flex-1 rounded-md border border-[var(--oh-border)] bg-base-secondary px-2 py-1 text-xs text-white placeholder:text-[var(--oh-muted)]"
+ />
+ <BrandButton
+ type="button"
+ variant="secondary"
+ onClick={handleAdd}
+ testId="add-tag-button"
+ >
+ {t(I18nKey.BUTTON$ADD)}
+ </BrandButton>
+ </div>
+
+ {errorKey ? (
+ <p
+ role="alert"
+ data-testid="edit-tags-error"
+ className="text-xs text-red-400"
+ >
+ {t(errorKey)}
+ </p>
+ ) : null}
+ </div>
+
+ <div
+ className="flex justify-end gap-2 w-full"
+ onClick={(event) => event.stopPropagation()}
+ >
+ <BrandButton
+ type="button"
+ variant="secondary"
+ onClick={onCancel}
+ testId="cancel-button"
+ >
+ {t(I18nKey.BUTTON$CANCEL)}
+ </BrandButton>
+ <BrandButton
+ type="button"
+ variant="primary"
+ onClick={handleConfirm}
+ testId="confirm-button"
+ >
+ {t(I18nKey.BUTTON$SAVE)}
+ </BrandButton>
+ </div>
+ </ModalBody>
+ </ModalBackdrop>
+ );
+}
diff --git a/src/components/features/conversation-panel/hide-older-conversations-row.tsx b/src/components/features/conversation-panel/hide-older-conversations-row.tsx
new file mode 100644
index 0000000000..d17ff91550
--- /dev/null
+++ b/src/components/features/conversation-panel/hide-older-conversations-row.tsx
@@ -0,0 +1,98 @@
+import { useTranslation } from "react-i18next";
+import { EyeOff } from "lucide-react";
+import { I18nKey } from "#/i18n/declaration";
+import { cn } from "#/utils/utils";
+import {
+ dropdownMenuRowClassName,
+ dropdownMenuRowIconClassName,
+} from "#/utils/dropdown-classes";
+import { ToggleSwitchVisual } from "#/ui/toggle-switch";
+import { EnumFilterDropdown } from "#/components/shared/filters/enum-filter-dropdown";
+import { useConversationPanelPreferencesStore } from "#/stores/conversation-panel-preferences-store";
+import {
+ DEFAULT_OLDER_CONVERSATION_CUTOFF,
+ isOlderConversationCutoff,
+ OLDER_CONVERSATION_CUTOFFS,
+} from "./conversation-panel-list-helpers";
+
+const CUTOFF_LABEL_KEYS = {
+ "1h": I18nKey.CONVERSATION_PANEL$OLDER_OVER_ONE_HOUR,
+ "1d": I18nKey.CONVERSATION_PANEL$OLDER_OVER_ONE_DAY,
+ "7d": I18nKey.CONVERSATION_PANEL$OLDER_OVER_ONE_WEEK,
+ "30d": I18nKey.CONVERSATION_PANEL$OLDER_OVER_THIRTY_DAYS,
+} as const;
+
+/**
+ * Hide-older control: a toggle plus an interval select. The persisted
+ * preference is still `showOlderConversations` (true = show everything);
+ * the toggle is inverted so on means hide.
+ */
+export function HideOlderConversationsRow() {
+ const { t } = useTranslation("openhands");
+ const showOlderConversations = useConversationPanelPreferencesStore(
+ (state) => state.showOlderConversations,
+ );
+ const olderConversationCutoff = useConversationPanelPreferencesStore(
+ (state) => state.olderConversationCutoff,
+ );
+ const toggleShowOlderConversations = useConversationPanelPreferencesStore(
+ (state) => state.toggleShowOlderConversations,
+ );
+ const setOlderConversationCutoff = useConversationPanelPreferencesStore(
+ (state) => state.setOlderConversationCutoff,
+ );
+
+ const hideOlder = !showOlderConversations;
+ const cutoff = isOlderConversationCutoff(olderConversationCutoff)
+ ? olderConversationCutoff
+ : DEFAULT_OLDER_CONVERSATION_CUTOFF;
+
+ return (
+ <div
+ role="menuitemcheckbox"
+ aria-checked={hideOlder}
+ data-testid="toggle-older-conversations"
+ tabIndex={0}
+ onClick={toggleShowOlderConversations}
+ onKeyDown={(event) => {
+ if (event.key === " " || event.key === "Enter") {
+ event.preventDefault();
+ toggleShowOlderConversations();
+ }
+ }}
+ className={cn(
+ "group",
+ dropdownMenuRowClassName,
+ "text-[var(--oh-foreground)]",
+ )}
+ >
+ <EyeOff
+ className={cn("h-3.5 w-3.5", dropdownMenuRowIconClassName)}
+ aria-hidden
+ />
+ <span className="min-w-0 shrink truncate">
+ {t(I18nKey.CONVERSATION_PANEL$HIDE_CONVERSATIONS)}
+ </span>
+ <div
+ className="shrink-0"
+ onClick={(event) => event.stopPropagation()}
+ onKeyDown={(event) => event.stopPropagation()}
+ >
+ <EnumFilterDropdown
+ testId="older-conversation-cutoff"
+ value={cutoff}
+ onChange={setOlderConversationCutoff}
+ options={OLDER_CONVERSATION_CUTOFFS}
+ labelKeyByValue={CUTOFF_LABEL_KEYS}
+ ariaLabel={t(I18nKey.CONVERSATION_PANEL$OLDER_CUTOFF_LABEL)}
+ emphasizeNonDefault={false}
+ triggerClassName={cn(
+ "h-7 gap-1 rounded py-0 pl-2 pr-1.5 font-normal",
+ "text-[var(--oh-foreground)] [&_svg]:h-3 [&_svg]:w-3 [&_svg]:text-[var(--oh-muted)]",
+ )}
+ />
+ </div>
+ <ToggleSwitchVisual enabled={hideOlder} size="sm" className="ml-auto" />
+ </div>
+ );
+}
diff --git a/src/components/features/conversation-panel/menu-row.tsx b/src/components/features/conversation-panel/menu-row.tsx
index fc072354c2..95c3971898 100644
--- a/src/components/features/conversation-panel/menu-row.tsx
+++ b/src/components/features/conversation-panel/menu-row.tsx
@@ -5,29 +5,42 @@ import {
dropdownMenuRowClassName,
dropdownMenuRowIconClassName,
} from "#/utils/dropdown-classes";
+import { ToggleSwitchVisual } from "#/ui/toggle-switch";
export function MenuRow({
icon: Icon,
label,
+ sublabel,
selected,
onClick,
testId,
disabled,
+ destructive,
+ variant = "radio",
}: {
icon: React.ComponentType<{ className?: string; "aria-hidden"?: boolean }>;
label: string;
+ /** Muted second line under the label (e.g. a threshold hint). */
+ sublabel?: string;
selected?: boolean;
onClick: () => void;
testId?: string;
disabled?: boolean;
+ /** Destructive action rows (delete/reset) render in the danger color. */
+ destructive?: boolean;
+ /**
+ * "radio" rows mark selection with a checkmark (mutually exclusive
+ * groups); "toggle" rows render a switch pill for independent on/off
+ * preferences that stay put after clicking (modal-style menus).
+ */
+ variant?: "radio" | "toggle";
}) {
- // Rows that show a selection checkmark are toggleable preferences, so
- // they get `role="menuitemradio"` when they're part of a selectable
- // group and `role="menuitemcheckbox"` when they're a standalone toggle.
- // For simplicity we use `menuitemradio` whenever `selected` is provided
- // (every selectable row in this menu is part of a mutually exclusive
- // group in practice) and fall back to plain `menuitem` otherwise.
- const role = selected === undefined ? "menuitem" : "menuitemradio";
+ const role =
+ selected === undefined
+ ? "menuitem"
+ : variant === "toggle"
+ ? "menuitemcheckbox"
+ : "menuitemradio";
return (
<button
type="button"
@@ -39,15 +52,34 @@ export function MenuRow({
className={cn(
"group",
dropdownMenuRowClassName,
- "text-[var(--oh-foreground)] disabled:opacity-50",
+ "disabled:opacity-50",
+ destructive ? "text-danger" : "text-[var(--oh-foreground)]",
)}
>
<Icon
- className={cn("h-3.5 w-3.5", dropdownMenuRowIconClassName)}
+ className={cn(
+ "h-3.5 w-3.5",
+ dropdownMenuRowIconClassName,
+ destructive &&
+ "text-danger group-hover:text-danger group-focus-visible:text-danger",
+ )}
aria-hidden
/>
- <span className="min-w-0 flex-1 truncate">{label}</span>
- {selected ? (
+ <span className="min-w-0 flex-1">
+ <span className="block truncate">{label}</span>
+ {sublabel ? (
+ <span className="block truncate text-[10px] text-[var(--oh-muted)]/70">
+ {sublabel}
+ </span>
+ ) : null}
+ </span>
+ {selected === undefined ? null : variant === "toggle" ? (
+ <ToggleSwitchVisual
+ enabled={Boolean(selected)}
+ size="sm"
+ className="ml-auto"
+ />
+ ) : selected ? (
<Check
className="ml-auto h-3.5 w-3.5 shrink-0 text-white"
aria-hidden
diff --git a/src/components/shared/filters/enum-filter-dropdown.tsx b/src/components/shared/filters/enum-filter-dropdown.tsx
index 018f6688b9..9695d0eba5 100644
--- a/src/components/shared/filters/enum-filter-dropdown.tsx
+++ b/src/components/shared/filters/enum-filter-dropdown.tsx
@@ -20,8 +20,12 @@ interface EnumFilterDropdownProps<T extends string> {
labelByValue?: Record<T, string>;
ariaLabel?: string;
className?: string;
+ /** Overrides trigger chip colors, padding, and radius. Menu styles stay shared. */
+ triggerClassName?: string;
/** Stretch the trigger to the container width, e.g. inside a parent menu. */
fullWidth?: boolean;
+ /** Highlight the trigger when the value is not the first option. */
+ emphasizeNonDefault?: boolean;
}
export function EnumFilterDropdown<T extends string>({
@@ -33,7 +37,9 @@ export function EnumFilterDropdown<T extends string>({
labelByValue,
ariaLabel,
className,
+ triggerClassName,
fullWidth = false,
+ emphasizeNonDefault = true,
}: EnumFilterDropdownProps<T>) {
const { t } = useTranslation("openhands");
const [open, setOpen] = React.useState(false);
@@ -70,9 +76,11 @@ export function EnumFilterDropdown<T extends string>({
className={cn(
dropdownFilterTriggerClassName,
fullWidth && "w-full justify-between",
- defaultOption &&
+ emphasizeNonDefault &&
+ defaultOption &&
value !== defaultOption &&
"border-white/60 bg-white/10",
+ triggerClassName,
)}
>
<span className="whitespace-nowrap">{selectedLabel}</span>
diff --git a/src/hooks/mutation/use-update-conversation-tags.ts b/src/hooks/mutation/use-update-conversation-tags.ts
new file mode 100644
index 0000000000..e0f4d13131
--- /dev/null
+++ b/src/hooks/mutation/use-update-conversation-tags.ts
@@ -0,0 +1,87 @@
+import {
+ useMutation,
+ useQueryClient,
+ type QueryKey,
+} from "@tanstack/react-query";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import type { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+
+export const useUpdateConversationTags = () => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: (variables: {
+ conversationId: string;
+ tags: Record<string, string>;
+ }) =>
+ AgentServerConversationService.updateConversationTags(
+ variables.conversationId,
+ variables.tags,
+ ),
+ onMutate: async (variables) => {
+ // The active conversation is cached under a prefix-extended key
+ // (`["user", "conversation", id, backendId, orgId]`) by
+ // `useUserConversation`. Cancel/snapshot/update via the prefix so the
+ // optimistic change actually reaches the rendered query, not a stale
+ // 3-element key that no observer ever reads.
+ const prefix: QueryKey = [
+ "user",
+ "conversation",
+ variables.conversationId,
+ ];
+ await queryClient.cancelQueries({ queryKey: prefix });
+ await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
+
+ const previousEntries = queryClient.getQueriesData<
+ AppConversation | null | undefined
+ >({ queryKey: prefix });
+ const previousConversations = queryClient.getQueryData([
+ "user",
+ "conversations",
+ ]);
+
+ queryClient.setQueriesData<AppConversation | null | undefined>(
+ { queryKey: prefix },
+ (old) => (old ? { ...old, tags: variables.tags } : old),
+ );
+
+ queryClient.setQueryData(
+ ["user", "conversations"],
+ (
+ old:
+ | { id: string; tags?: Record<string, string> | null }[]
+ | undefined,
+ ) =>
+ old?.map((conv) =>
+ conv.id === variables.conversationId
+ ? { ...conv, tags: variables.tags }
+ : conv,
+ ),
+ );
+
+ return { previousEntries, previousConversations };
+ },
+ onError: (err, variables, context) => {
+ context?.previousEntries.forEach(([key, data]) => {
+ queryClient.setQueryData(key, data);
+ });
+ if (context?.previousConversations) {
+ queryClient.setQueryData(
+ ["user", "conversations"],
+ context.previousConversations,
+ );
+ }
+ },
+ onSettled: (data, error, variables) => {
+ // Invalidate and refetch the conversation list to show the updated tags
+ queryClient.invalidateQueries({
+ queryKey: ["user", "conversations"],
+ });
+
+ // Also invalidate the specific conversation query
+ queryClient.invalidateQueries({
+ queryKey: ["user", "conversation", variables.conversationId],
+ });
+ },
+ });
+};
diff --git a/src/i18n/translation.json b/src/i18n/translation.json
index 09776b08a9..7eb5dd7a15 100644
--- a/src/i18n/translation.json
+++ b/src/i18n/translation.json
@@ -17835,21 +17835,38 @@
"uk": "За репозиторієм"
},
"CONVERSATION_PANEL$CHRONOLOGICAL": {
- "en": "Chronological list",
- "ja": "時系列リスト",
- "zh-CN": "按时间顺序",
- "zh-TW": "時間序列清單",
- "ko-KR": "시간순 목록",
- "no": "Kronologisk liste",
- "ar": "قائمة زمنية",
- "de": "Chronologische Liste",
- "fr": "Liste chronologique",
- "it": "Elenco cronologico",
- "pt": "Lista cronológica",
- "es": "Lista cronológica",
- "ca": "Llista cronològica",
- "tr": "Kronolojik liste",
- "uk": "Хронологічний список"
+ "en": "By date",
+ "ja": "日付順",
+ "zh-CN": "按日期",
+ "zh-TW": "依日期",
+ "ko-KR": "날짜순",
+ "no": "Etter dato",
+ "ar": "حسب التاريخ",
+ "de": "Nach Datum",
+ "fr": "Par date",
+ "it": "Per data",
+ "pt": "Por data",
+ "es": "Por fecha",
+ "ca": "Per data",
+ "tr": "Tarihe göre",
+ "uk": "За датою"
+ },
+ "CONVERSATION_PANEL$CLEAR_FILTERS": {
+ "en": "Clear all",
+ "ja": "すべてクリア",
+ "zh-CN": "全部清除",
+ "zh-TW": "全部清除",
+ "ko-KR": "모두 지우기",
+ "no": "Fjern alle",
+ "it": "Cancella tutto",
+ "pt": "Limpar tudo",
+ "es": "Borrar todo",
+ "ar": "مسح الكل",
+ "fr": "Tout effacer",
+ "tr": "Tümünü temizle",
+ "de": "Alle löschen",
+ "uk": "Очистити все",
+ "ca": "Esborrar tot"
},
"CONVERSATION_PANEL$SORT_BY": {
"en": "Sort by",
@@ -17936,22 +17953,124 @@
"tr": "1 saati aşkın",
"uk": "Понад 1 годину"
},
+ "CONVERSATION_PANEL$OLDER_OVER_ONE_DAY": {
+ "en": "Over 1 day",
+ "ja": "1日以上前",
+ "zh-CN": "超过 1 天",
+ "zh-TW": "超過 1 天",
+ "ko-KR": "1일 이상 지남",
+ "no": "Mer enn 1 dag",
+ "ar": "أكثر من يوم",
+ "de": "Über 1 Tag",
+ "fr": "Plus d’1 jour",
+ "it": "Oltre 1 giorno",
+ "pt": "Há mais de 1 dia",
+ "es": "Más de 1 día",
+ "ca": "Fa més d’1 dia",
+ "tr": "1 günden eski",
+ "uk": "Понад 1 день"
+ },
+ "CONVERSATION_PANEL$OLDER_OVER_ONE_WEEK": {
+ "en": "Over 1 week",
+ "ja": "1週間以上前",
+ "zh-CN": "超过 1 周",
+ "zh-TW": "超過 1 週",
+ "ko-KR": "1주 이상 지남",
+ "no": "Mer enn 1 uke",
+ "ar": "أكثر من أسبوع",
+ "de": "Über 1 Woche",
+ "fr": "Plus d’1 semaine",
+ "it": "Oltre 1 settimana",
+ "pt": "Há mais de 1 semana",
+ "es": "Más de 1 semana",
+ "ca": "Fa més d’1 setmana",
+ "tr": "1 haftadan eski",
+ "uk": "Понад 1 тиждень"
+ },
+ "CONVERSATION_PANEL$OLDER_OVER_THIRTY_DAYS": {
+ "en": "Over 30 days",
+ "ja": "30日以上前",
+ "zh-CN": "超过 30 天",
+ "zh-TW": "超過 30 天",
+ "ko-KR": "30일 이상 지남",
+ "no": "Mer enn 30 dager",
+ "ar": "أكثر من 30 يومًا",
+ "de": "Über 30 Tage",
+ "fr": "Plus de 30 jours",
+ "it": "Oltre 30 giorni",
+ "pt": "Há mais de 30 dias",
+ "es": "Más de 30 días",
+ "ca": "Fa més de 30 dies",
+ "tr": "30 günden eski",
+ "uk": "Понад 30 днів"
+ },
+ "CONVERSATION_PANEL$HIDE_CONVERSATIONS": {
+ "en": "Hide old conversations",
+ "ja": "古い会話を非表示",
+ "zh-CN": "隐藏旧对话",
+ "zh-TW": "隱藏舊對話",
+ "ko-KR": "오래된 대화 숨기기",
+ "no": "Skjul gamle samtaler",
+ "ar": "إخفاء المحادثات القديمة",
+ "de": "Alte Gespräche ausblenden",
+ "fr": "Masquer les anciennes conversations",
+ "it": "Nascondi conversazioni vecchie",
+ "pt": "Ocultar conversas antigas",
+ "es": "Ocultar conversaciones antiguas",
+ "ca": "Amaga les converses antigues",
+ "tr": "Eski konuşmaları gizle",
+ "uk": "Приховати старі розмови"
+ },
+ "CONVERSATION_PANEL$OLDER_CUTOFF_LABEL": {
+ "en": "Hide conversations older than",
+ "ja": "次より古い会話を非表示",
+ "zh-CN": "隐藏早于此时的对话",
+ "zh-TW": "隱藏早於此時間的對話",
+ "ko-KR": "다음보다 오래된 대화 숨기기",
+ "no": "Skjul samtaler eldre enn",
+ "ar": "إخفاء المحادثات الأقدم من",
+ "de": "Gespräche ausblenden, die älter sind als",
+ "fr": "Masquer les conversations plus anciennes que",
+ "it": "Nascondi conversazioni più vecchie di",
+ "pt": "Ocultar conversas mais antigas que",
+ "es": "Ocultar conversaciones anteriores a",
+ "ca": "Amaga les converses més antigues que",
+ "tr": "Şundan eski konuşmaları gizle",
+ "uk": "Приховати розмови старіші за"
+ },
"CONVERSATION_PANEL$SHOW": {
- "en": "Show",
- "ja": "表示",
- "zh-CN": "显示",
- "zh-TW": "顯示",
- "ko-KR": "표시",
- "no": "Vis",
- "ar": "عرض",
- "de": "Anzeigen",
- "fr": "Afficher",
- "it": "Mostra",
- "pt": "Mostrar",
- "es": "Mostrar",
- "ca": "Mostra",
- "tr": "Göster",
- "uk": "Показати"
+ "en": "Additional",
+ "ja": "追加",
+ "zh-CN": "其他",
+ "zh-TW": "其他",
+ "ko-KR": "추가",
+ "no": "Tillegg",
+ "ar": "إضافي",
+ "de": "Zusätzlich",
+ "fr": "Supplémentaire",
+ "it": "Altro",
+ "pt": "Adicional",
+ "es": "Adicional",
+ "ca": "Addicional",
+ "tr": "Ek",
+ "uk": "Додатково"
+ },
+ "CONVERSATION_PANEL$THREADS": {
+ "en": "Threads",
+ "ja": "スレッド",
+ "zh-CN": "会话",
+ "zh-TW": "對話串",
+ "ko-KR": "스레드",
+ "no": "Tråder",
+ "ar": "المحادثات",
+ "de": "Threads",
+ "fr": "Fils",
+ "it": "Thread",
+ "pt": "Threads",
+ "es": "Hilos",
+ "ca": "Fils",
+ "tr": "Konular",
+ "uk": "Потоки"
},
"CONVERSATION_PANEL$ALL_THREADS": {
"en": "All threads",
@@ -17971,21 +18090,21 @@
"uk": "Усі потоки"
},
"CONVERSATION_PANEL$RELEVANT_THREADS": {
- "en": "Relevant (active)",
- "ja": "関連(アクティブ)",
- "zh-CN": "相关(进行中)",
- "zh-TW": "相關(進行中)",
- "ko-KR": "관련(활성)",
- "no": "Relevante (aktive)",
- "ar": "ذات صلة (نشطة)",
- "de": "Relevant (aktiv)",
- "fr": "Pertinent (actif)",
- "it": "Rilevanti (attive)",
- "pt": "Relevantes (ativas)",
- "es": "Relevantes (activas)",
- "ca": "Rellevants (actives)",
- "tr": "İlgili (etkin)",
- "uk": "Релевантні (активні)"
+ "en": "Active only",
+ "ja": "アクティブのみ",
+ "zh-CN": "仅活动",
+ "zh-TW": "僅作用中",
+ "ko-KR": "활성만",
+ "no": "Kun aktive",
+ "ar": "النشطة فقط",
+ "de": "Nur aktive",
+ "fr": "Actifs uniquement",
+ "it": "Solo attive",
+ "pt": "Somente ativas",
+ "es": "Solo activas",
+ "ca": "Només actius",
+ "tr": "Yalnızca aktif",
+ "uk": "Лише активні"
},
"CONVERSATION_PANEL$SHOW_ARCHIVED": {
"en": "Show archived",
@@ -18072,6 +18191,227 @@
"tr": "Etiketler",
"uk": "Теги"
},
+ "CONVERSATION_PANEL$SHOW_TAGS": {
+ "en": "Show {{count}} tags",
+ "ja": "{{count}}件のタグを表示",
+ "zh-CN": "显示 {{count}} 个标签",
+ "zh-TW": "顯示 {{count}} 個標籤",
+ "ko-KR": "태그 {{count}}개 표시",
+ "no": "Vis {{count}} etiketter",
+ "ar": "عرض {{count}} وسوم",
+ "de": "{{count}} Tags anzeigen",
+ "fr": "Afficher {{count}} étiquettes",
+ "it": "Mostra {{count}} tag",
+ "pt": "Mostrar {{count}} etiquetas",
+ "es": "Mostrar {{count}} etiquetas",
+ "ca": "Mostra {{count}} etiquetes",
+ "tr": "{{count}} etiket göster",
+ "uk": "Показати {{count}} тегів"
+ },
+ "CONVERSATION_PANEL$HIDE_TAGS": {
+ "en": "Hide tags",
+ "ja": "タグを隠す",
+ "zh-CN": "隐藏标签",
+ "zh-TW": "隱藏標籤",
+ "ko-KR": "태그 숨기기",
+ "no": "Skjul etiketter",
+ "ar": "إخفاء الوسوم",
+ "de": "Tags ausblenden",
+ "fr": "Masquer les étiquettes",
+ "it": "Nascondi tag",
+ "pt": "Ocultar etiquetas",
+ "es": "Ocultar etiquetas",
+ "ca": "Amaga les etiquetes",
+ "tr": "Etiketleri gizle",
+ "uk": "Сховати теги"
+ },
+ "CONVERSATION_PANEL$TAG_CHIPS": {
+ "en": "Show tags",
+ "ja": "タグを表示",
+ "zh-CN": "显示标签",
+ "zh-TW": "顯示標籤",
+ "ko-KR": "태그 표시",
+ "no": "Vis etiketter",
+ "ar": "عرض الوسوم",
+ "de": "Tags anzeigen",
+ "fr": "Afficher les étiquettes",
+ "it": "Mostra tag",
+ "pt": "Mostrar etiquetas",
+ "es": "Mostrar etiquetas",
+ "ca": "Mostra les etiquetes",
+ "tr": "Etiketleri göster",
+ "uk": "Показати теги"
+ },
+ "CONVERSATION_PANEL$LAYOUTS_HEADING": {
+ "en": "View",
+ "ja": "表示",
+ "zh-CN": "视图",
+ "zh-TW": "檢視",
+ "ko-KR": "보기",
+ "no": "Visning",
+ "ar": "عرض",
+ "de": "Ansicht",
+ "fr": "Affichage",
+ "it": "Vista",
+ "pt": "Visualização",
+ "es": "Vista",
+ "ca": "Vista",
+ "tr": "Görünüm",
+ "uk": "Вигляд"
+ },
+ "CONVERSATION_PANEL$LAYOUT_RECENT_ACTIVITY": {
+ "en": "Recent",
+ "ja": "最近",
+ "zh-CN": "最近",
+ "zh-TW": "最近",
+ "ko-KR": "최근",
+ "no": "Nylig",
+ "ar": "الأحدث",
+ "de": "Zuletzt",
+ "fr": "Récent",
+ "it": "Recenti",
+ "pt": "Recentes",
+ "es": "Recientes",
+ "ca": "Recents",
+ "tr": "Son",
+ "uk": "Нещодавні"
+ },
+ "CONVERSATION_PANEL$LAYOUT_FOCUSED": {
+ "en": "Active",
+ "ja": "アクティブ",
+ "zh-CN": "活动",
+ "zh-TW": "作用中",
+ "ko-KR": "활성",
+ "no": "Aktiv",
+ "ar": "نشط",
+ "de": "Aktiv",
+ "fr": "Actif",
+ "it": "Attiva",
+ "pt": "Ativa",
+ "es": "Activa",
+ "ca": "Actiu",
+ "tr": "Aktif",
+ "uk": "Активний"
+ },
+ "CONVERSATION_PANEL$LAYOUT_MINIMAL": {
+ "en": "Compact",
+ "ja": "コンパクト",
+ "zh-CN": "紧凑",
+ "zh-TW": "精簡",
+ "ko-KR": "간결",
+ "no": "Kompakt",
+ "ar": "مضغوط",
+ "de": "Kompakt",
+ "fr": "Compact",
+ "it": "Compatto",
+ "pt": "Compacto",
+ "es": "Compacto",
+ "ca": "Compacte",
+ "tr": "Kompakt",
+ "uk": "Компактно"
+ },
+ "CONVERSATION_PANEL$TAG_FILTERS": {
+ "en": "Filter by tags",
+ "ja": "タグで絞り込む",
+ "zh-CN": "按标签筛选",
+ "zh-TW": "依標籤篩選",
+ "ko-KR": "태그로 필터",
+ "no": "Filtrer etter etiketter",
+ "ar": "تصفية حسب الوسوم",
+ "de": "Nach Tags filtern",
+ "fr": "Filtrer par étiquettes",
+ "it": "Filtra per tag",
+ "pt": "Filtrar por etiquetas",
+ "es": "Filtrar por etiquetas",
+ "ca": "Filtra per etiquetes",
+ "tr": "Etiketlere göre filtrele",
+ "uk": "Фільтрувати за тегами"
+ },
+ "CONVERSATION_PANEL$NO_VISIBLE_TAGS": {
+ "en": "No tags yet",
+ "ja": "タグはまだありません",
+ "zh-CN": "暂无标签",
+ "zh-TW": "尚無標籤",
+ "ko-KR": "태그가 없습니다",
+ "no": "Ingen etiketter ennå",
+ "ar": "لا وسوم بعد",
+ "de": "Noch keine Tags",
+ "fr": "Aucune étiquette",
+ "it": "Nessun tag",
+ "pt": "Ainda sem etiquetas",
+ "es": "Aún no hay etiquetas",
+ "ca": "Encara no hi ha etiquetes",
+ "tr": "Henüz etiket yok",
+ "uk": "Тегів ще немає"
+ },
+ "CONVERSATION_PANEL$ADVANCED_OPTIONS": {
+ "en": "More options",
+ "ja": "その他のオプション",
+ "zh-CN": "更多选项",
+ "zh-TW": "更多選項",
+ "ko-KR": "추가 옵션",
+ "no": "Flere alternativer",
+ "ar": "المزيد من الخيارات",
+ "de": "Weitere Optionen",
+ "fr": "Plus d'options",
+ "it": "Altre opzioni",
+ "pt": "Mais opções",
+ "es": "Más opciones",
+ "ca": "Més opcions",
+ "tr": "Daha fazla seçenek",
+ "uk": "Інші параметри"
+ },
+ "CONVERSATION_PANEL$ADVANCED_OPTIONS_CUSTOM": {
+ "en": "Custom",
+ "ja": "カスタム",
+ "zh-CN": "自定义",
+ "zh-TW": "自訂",
+ "ko-KR": "사용자 지정",
+ "no": "Tilpasset",
+ "ar": "مخصص",
+ "de": "Benutzerdefiniert",
+ "fr": "Personnalisé",
+ "it": "Personalizzato",
+ "pt": "Personalizado",
+ "es": "Personalizado",
+ "ca": "Personalitzat",
+ "tr": "Özel",
+ "uk": "Користувацький"
+ },
+ "CONVERSATION_PANEL$ADVANCED_OPTIONS_DESCRIPTION": {
+ "en": "Choose how conversations are grouped and what each row shows. Changes save automatically.",
+ "ja": "会話のグループ分けと各行に表示する内容を選びます。変更は自動的に保存されます。",
+ "zh-CN": "选择对话如何分组以及每行显示什么。更改会自动保存。",
+ "zh-TW": "選擇對話如何分組以及每列顯示什麼。變更會自動儲存。",
+ "ko-KR": "대화를 어떻게 묶고 각 행에 무엇을 보여줄지 선택합니다. 변경 사항은 자동으로 저장됩니다.",
+ "no": "Velg hvordan samtaler grupperes og hva hver rad viser. Endringer lagres automatisk.",
+ "ar": "اختر كيفية تجميع المحادثات وما يظهر في كل صف. تُحفظ التغييرات تلقائيًا.",
+ "de": "Wählen Sie, wie Gespräche gruppiert werden und was jede Zeile zeigt. Änderungen werden automatisch gespeichert.",
+ "fr": "Choisissez comment les conversations sont groupées et ce que chaque ligne affiche. Les modifications sont enregistrées automatiquement.",
+ "it": "Scegli come raggruppare le conversazioni e cosa mostra ogni riga. Le modifiche vengono salvate automaticamente.",
+ "pt": "Escolha como as conversas são agrupadas e o que cada linha mostra. As alterações são salvas automaticamente.",
+ "es": "Elige cómo se agrupan las conversaciones y qué muestra cada fila. Los cambios se guardan automáticamente.",
+ "ca": "Trieu com s'agrupen les converses i què mostra cada fila. Els canvis es desen automàticament.",
+ "tr": "Konuşmaların nasıl gruplanacağını ve her satırda ne görüneceğini seçin. Değişiklikler otomatik kaydedilir.",
+ "uk": "Оберіть, як групувати розмови та що показувати в кожному рядку. Зміни зберігаються автоматично."
+ },
+ "CONVERSATION_PANEL$SHOW_OLDER_CONVERSATIONS": {
+ "en": "Show older conversations",
+ "ja": "古い会話を表示",
+ "zh-CN": "显示较早的对话",
+ "zh-TW": "顯示較早的對話",
+ "ko-KR": "이전 대화 표시",
+ "no": "Vis eldre samtaler",
+ "ar": "عرض المحادثات الأقدم",
+ "de": "Ältere Gespräche anzeigen",
+ "fr": "Afficher les conversations anciennes",
+ "it": "Mostra conversazioni meno recenti",
+ "pt": "Mostrar conversas antigas",
+ "es": "Mostrar conversaciones antiguas",
+ "ca": "Mostra converses antigues",
+ "tr": "Eski konuşmaları göster",
+ "uk": "Показати старіші розмови"
+ },
"CONVERSATION_PANEL$AUTOMATIONS": {
"en": "Automations",
"ja": "オートメーション",
@@ -18090,21 +18430,21 @@
"uk": "Автоматизації"
},
"CONVERSATION_PANEL$AUTOMATIONS_ALL": {
- "en": "All conversations",
- "ja": "すべての会話",
- "zh-CN": "所有对话",
- "zh-TW": "所有對話",
- "ko-KR": "모든 대화",
- "no": "Alle samtaler",
- "ar": "كل المحادثات",
- "de": "Alle Gespräche",
- "fr": "Toutes les conversations",
- "it": "Tutte le conversazioni",
- "pt": "Todas as conversas",
- "es": "Todas las conversaciones",
- "ca": "Totes les converses",
- "tr": "Tüm konuşmalar",
- "uk": "Усі розмови"
+ "en": "Shown with all",
+ "ja": "すべてに表示",
+ "zh-CN": "与全部一起显示",
+ "zh-TW": "與全部一起顯示",
+ "ko-KR": "전체와 함께 표시",
+ "no": "Vises med alle",
+ "ar": "ظاهرة مع الكل",
+ "de": "Mit allen anzeigen",
+ "fr": "Affichées avec tout",
+ "it": "Mostrate con tutte",
+ "pt": "Exibidas com todas",
+ "es": "Visibles con todas",
+ "ca": "Es mostren amb totes",
+ "tr": "Tümüyle göster",
+ "uk": "Показані з усіма"
},
"CONVERSATION_PANEL$AUTOMATIONS_HIDE": {
"en": "Hide automation runs",
@@ -18174,22 +18514,39 @@
"tr": "Otomasyon filtresiyle eşleşen konuşma yok",
"uk": "Немає розмов, що відповідають фільтру автоматизацій"
},
+ "CONVERSATION_PANEL$NO_TAG_MATCHES": {
+ "en": "No conversations match the tag filter",
+ "ja": "タグフィルターに一致する会話はありません",
+ "zh-CN": "没有对话匹配标签筛选条件",
+ "zh-TW": "沒有對話符合標籤篩選條件",
+ "ko-KR": "태그 필터와 일치하는 대화가 없습니다",
+ "no": "Ingen samtaler samsvarer med etikettfilteret",
+ "ar": "لا توجد محادثات مطابقة لعامل تصفية الوسوم",
+ "de": "Keine Gespräche entsprechen dem Tag-Filter",
+ "fr": "Aucune conversation ne correspond au filtre d'étiquettes",
+ "it": "Nessuna conversazione corrisponde al filtro dei tag",
+ "pt": "Nenhuma conversa corresponde ao filtro de etiquetas",
+ "es": "Ninguna conversación coincide con el filtro de etiquetas",
+ "ca": "Cap conversa no coincideix amb el filtre d'etiquetes",
+ "tr": "Etiket filtresiyle eşleşen konuşma yok",
+ "uk": "Немає розмов, що відповідають фільтру тегів"
+ },
"CONVERSATION_PANEL$HOVER_METADATA": {
- "en": "Hover metadata",
- "ja": "ホバーメタデータ",
- "zh-CN": "悬停元数据",
- "zh-TW": "懸停中繼資料",
- "ko-KR": "호버 메타데이터",
- "no": "Sveve-metadata",
- "ar": "بيانات التمرير",
- "de": "Hover-Metadaten",
- "fr": "Métadonnées au survol",
- "it": "Metadati al passaggio",
- "pt": "Metadados ao passar",
- "es": "Metadatos al pasar",
- "ca": "Metadades en passar",
- "tr": "Üzerine gelme meta verileri",
- "uk": "Метадані при наведенні"
+ "en": "Details on hover",
+ "ja": "ホバーで詳細を表示",
+ "zh-CN": "悬停时显示详情",
+ "zh-TW": "懸停時顯示詳情",
+ "ko-KR": "마우스 오버 시 세부정보",
+ "no": "Detaljer ved hovering",
+ "ar": "التفاصيل عند التمرير",
+ "de": "Details beim Überfahren",
+ "fr": "Détails au survol",
+ "it": "Dettagli al passaggio",
+ "pt": "Detalhes ao passar o mouse",
+ "es": "Detalles al pasar el cursor",
+ "ca": "Detalls en passar el cursor",
+ "tr": "Üzerine gelince ayrıntılar",
+ "uk": "Подробиці при наведенні"
},
"CONVERSATION_PANEL$NO_WORKSPACE": {
"en": "No workspace",
@@ -38795,6 +39152,176 @@
"tr": "{{count}} etiket daha göster",
"uk": "Показати ще {{count}} тегів"
},
+ "CONVERSATION$EDIT_TAGS": {
+ "en": "Edit tags",
+ "ja": "タグを編集",
+ "zh-CN": "编辑标签",
+ "zh-TW": "編輯標籤",
+ "ko-KR": "태그 편집",
+ "no": "Rediger etiketter",
+ "ar": "تعديل الوسوم",
+ "de": "Tags bearbeiten",
+ "fr": "Modifier les étiquettes",
+ "it": "Modifica tag",
+ "pt": "Editar etiquetas",
+ "es": "Editar etiquetas",
+ "ca": "Edita les etiquetes",
+ "tr": "Etiketleri düzenle",
+ "uk": "Редагувати теги"
+ },
+ "CONVERSATION$EDIT_TAGS_DESCRIPTION": {
+ "en": "Add or remove tags on this conversation.",
+ "ja": "この会話のタグを追加または削除します。",
+ "zh-CN": "为此对话添加或删除标签。",
+ "zh-TW": "為此對話新增或刪除標籤。",
+ "ko-KR": "이 대화의 태그를 추가하거나 삭제합니다.",
+ "no": "Legg til eller fjern etiketter på denne samtalen.",
+ "ar": "أضف الوسوم أو أزلها من هذه المحادثة.",
+ "de": "Tags für dieses Gespräch hinzufügen oder entfernen.",
+ "fr": "Ajoutez ou supprimez des étiquettes sur cette conversation.",
+ "it": "Aggiungi o rimuovi tag su questa conversazione.",
+ "pt": "Adicione ou remova etiquetas nesta conversa.",
+ "es": "Añade o elimina etiquetas en esta conversación.",
+ "ca": "Afegeix o elimina etiquetes d'aquesta conversa.",
+ "tr": "Bu konuşmaya etiket ekleyin veya kaldırın.",
+ "uk": "Додайте або видаліть теги цієї розмови."
+ },
+ "CONVERSATION$TAG_KEY_PLACEHOLDER": {
+ "en": "Name",
+ "ja": "名前",
+ "zh-CN": "名称",
+ "zh-TW": "名稱",
+ "ko-KR": "이름",
+ "no": "Navn",
+ "ar": "الاسم",
+ "de": "Name",
+ "fr": "Nom",
+ "it": "Nome",
+ "pt": "Nome",
+ "es": "Nombre",
+ "ca": "Nom",
+ "tr": "Ad",
+ "uk": "Назва"
+ },
+ "CONVERSATION$TAG_VALUE_PLACEHOLDER": {
+ "en": "Value (optional)",
+ "ja": "値(任意)",
+ "zh-CN": "值(可选)",
+ "zh-TW": "值(選填)",
+ "ko-KR": "값 (선택 사항)",
+ "no": "Verdi (valgfritt)",
+ "ar": "القيمة (اختياري)",
+ "de": "Wert (optional)",
+ "fr": "Valeur (facultatif)",
+ "it": "Valore (facoltativo)",
+ "pt": "Valor (opcional)",
+ "es": "Valor (opcional)",
+ "ca": "Valor (opcional)",
+ "tr": "Değer (isteğe bağlı)",
+ "uk": "Значення (необов'язково)"
+ },
+ "CONVERSATION$REMOVE_TAG": {
+ "en": "Remove tag",
+ "ja": "タグを削除",
+ "zh-CN": "删除标签",
+ "zh-TW": "刪除標籤",
+ "ko-KR": "태그 삭제",
+ "no": "Fjern etikett",
+ "ar": "إزالة الوسم",
+ "de": "Tag entfernen",
+ "fr": "Supprimer l'étiquette",
+ "it": "Rimuovi tag",
+ "pt": "Remover etiqueta",
+ "es": "Eliminar etiqueta",
+ "ca": "Elimina l'etiqueta",
+ "tr": "Etiketi kaldır",
+ "uk": "Видалити тег"
+ },
+ "CONVERSATION$TAG_KEY_INVALID": {
+ "en": "Tag names may only contain lowercase letters and numbers",
+ "ja": "タグ名には小文字の英字と数字のみ使用できます",
+ "zh-CN": "标签名称只能包含小写字母和数字",
+ "zh-TW": "標籤名稱只能包含小寫字母和數字",
+ "ko-KR": "태그 이름에는 소문자와 숫자만 사용할 수 있습니다",
+ "no": "Etikettnavn kan bare inneholde små bokstaver og tall",
+ "ar": "يمكن أن تحتوي أسماء الوسوم على أحرف صغيرة وأرقام فقط",
+ "de": "Tagnamen dürfen nur Kleinbuchstaben und Zahlen enthalten",
+ "fr": "Les noms d'étiquette ne peuvent contenir que des lettres minuscules et des chiffres",
+ "it": "I nomi dei tag possono contenere solo lettere minuscole e numeri",
+ "pt": "Os nomes de etiqueta só podem conter letras minúsculas e números",
+ "es": "Los nombres de etiqueta solo pueden contener letras minúsculas y números",
+ "ca": "Els noms d'etiqueta només poden contenir lletres minúscules i números",
+ "tr": "Etiket adları yalnızca küçük harf ve rakam içerebilir",
+ "uk": "Назви тегів можуть містити лише малі літери та цифри"
+ },
+ "CONVERSATION$TAG_KEY_RESERVED": {
+ "en": "This tag name is reserved",
+ "ja": "このタグ名は予約されています",
+ "zh-CN": "此标签名称已被保留",
+ "zh-TW": "此標籤名稱已被保留",
+ "ko-KR": "이 태그 이름은 예약되어 있습니다",
+ "no": "Dette etikettnavnet er reservert",
+ "ar": "اسم الوسم هذا محجوز",
+ "de": "Dieser Tagname ist reserviert",
+ "fr": "Ce nom d'étiquette est réservé",
+ "it": "Questo nome di tag è riservato",
+ "pt": "Este nome de etiqueta está reservado",
+ "es": "Este nombre de etiqueta está reservado",
+ "ca": "Aquest nom d'etiqueta està reservat",
+ "tr": "Bu etiket adı ayrılmıştır",
+ "uk": "Цю назву тегу зарезервовано"
+ },
+ "CONVERSATION$TAG_KEY_DUPLICATE": {
+ "en": "This tag name is already in use",
+ "ja": "このタグ名はすでに使用されています",
+ "zh-CN": "此标签名称已被使用",
+ "zh-TW": "此標籤名稱已被使用",
+ "ko-KR": "이 태그 이름은 이미 사용 중입니다",
+ "no": "Dette etikettnavnet er allerede i bruk",
+ "ar": "اسم الوسم هذا مستخدم بالفعل",
+ "de": "Dieser Tagname wird bereits verwendet",
+ "fr": "Ce nom d'étiquette est déjà utilisé",
+ "it": "Questo nome di tag è già in uso",
+ "pt": "Este nome de etiqueta já está em uso",
+ "es": "Este nombre de etiqueta ya está en uso",
+ "ca": "Aquest nom d'etiqueta ja s'està usant",
+ "tr": "Bu etiket adı zaten kullanılıyor",
+ "uk": "Цю назву тегу вже використано"
+ },
+ "CONVERSATION$TAG_VALUE_INVALID": {
+ "en": "Tag values must be 256 characters or fewer",
+ "ja": "タグの値は256文字以内にしてください",
+ "zh-CN": "标签值不能超过 256 个字符",
+ "zh-TW": "標籤值不能超過 256 個字元",
+ "ko-KR": "태그 값은 256자 이하여야 합니다",
+ "no": "Taggverdier må være 256 tegn eller færre",
+ "ar": "يجب ألا تتجاوز قيم الوسوم 256 حرفًا",
+ "de": "Tag-Werte dürfen höchstens 256 Zeichen lang sein",
+ "fr": "Les valeurs d'étiquette doivent comporter 256 caractères ou moins",
+ "it": "I valori dei tag devono contenere al massimo 256 caratteri",
+ "pt": "Os valores de etiqueta devem ter no máximo 256 caracteres",
+ "es": "Los valores de etiqueta deben tener 256 caracteres o menos",
+ "ca": "Els valors d'etiqueta han de tenir 256 caràcters o menys",
+ "tr": "Etiket değerleri en fazla 256 karakter olmalıdır",
+ "uk": "Значення тегів мають містити не більше 256 символів"
+ },
+ "CONVERSATION$TAGS_UPDATED": {
+ "en": "Tags updated",
+ "ja": "タグを更新しました",
+ "zh-CN": "标签已更新",
+ "zh-TW": "標籤已更新",
+ "ko-KR": "태그가 업데이트되었습니다",
+ "no": "Etiketter oppdatert",
+ "ar": "تم تحديث الوسوم",
+ "de": "Tags aktualisiert",
+ "fr": "Étiquettes mises à jour",
+ "it": "Tag aggiornati",
+ "pt": "Etiquetas atualizadas",
+ "es": "Etiquetas actualizadas",
+ "ca": "Etiquetes actualitzades",
+ "tr": "Etiketler güncellendi",
+ "uk": "Теги оновлено"
+ },
"CONVERSATION_PANEL$PREVIEW_GIT": {
"en": "Git",
"ja": "Git",
diff --git a/src/mocks/conversation-handlers.ts b/src/mocks/conversation-handlers.ts
index 12077b11e5..5e5e3def1b 100644
--- a/src/mocks/conversation-handlers.ts
+++ b/src/mocks/conversation-handlers.ts
@@ -47,6 +47,9 @@ const conversations: MockConversation[] = [
created_at: new Date(now).toISOString(),
updated_at: new Date(now).toISOString(),
execution_status: "waiting_for_confirmation",
+ // User-authored tags so the layouts menu's Tag Filters section and the
+ // card chips have something to show in mock mode.
+ tags: { project: "vault", work: "" },
},
{
id: "2",
@@ -227,6 +230,7 @@ function createConversationResponse(
metrics: conversation.metrics ?? null,
agent: conversation.agent ?? null,
workspace: conversation.workspace ?? null,
+ tags: conversation.tags ?? null,
};
}
@@ -295,11 +299,17 @@ export const CONVERSATION_HANDLERS = [
const conversation = CONVERSATIONS.get(conversationId);
if (conversation) {
- const body = (await request.json()) as { title?: string } | null;
- if (body?.title) {
+ const body = (await request.json()) as {
+ title?: string;
+ tags?: Record<string, string>;
+ } | null;
+ // PATCH replaces the complete tags map (agent-server semantics);
+ // title-only and tags-only patches both persist.
+ if (body?.title || body?.tags) {
CONVERSATIONS.set(conversationId, {
...conversation,
- title: body.title,
+ ...(body.title ? { title: body.title } : {}),
+ ...(body.tags ? { tags: body.tags } : {}),
updated_at: new Date().toISOString(),
});
return HttpResponse.json(null, { status: 200 });
diff --git a/src/stores/conversation-panel-preferences-store.ts b/src/stores/conversation-panel-preferences-store.ts
index 5a7242220c..9f5c8990b3 100644
--- a/src/stores/conversation-panel-preferences-store.ts
+++ b/src/stores/conversation-panel-preferences-store.ts
@@ -1,19 +1,27 @@
import { create } from "zustand";
import { persist, createJSONStorage } from "zustand/middleware";
import {
+ DEFAULT_OLDER_CONVERSATION_CUTOFF,
+ isOlderConversationCutoff,
type AutomationFilterMode,
type ConversationSortField,
+ type OlderConversationCutoff,
type OrganizeMode,
type ThreadScope,
} from "#/components/features/conversation-panel/conversation-panel-list-helpers";
/**
* User-toggleable display preferences for the sidebar conversation list
- * filter menu. These are intentionally persisted to localStorage (via the
- * same `zustand/persist` pattern used by `home-store` and `workspaces-store`)
- * so the menu state survives full reloads.
+ * (the layouts menu and the advanced-options modal behind it). These are
+ * intentionally persisted to localStorage (via the same `zustand/persist`
+ * pattern used by `home-store` and `workspaces-store`) so the menu state
+ * survives full reloads.
*
- * To add a new preference exposed by the filter menu:
+ * Every persisted narrowing field must have a control that can see and undo
+ * it, or a reload silently hides conversations with nothing on screen to say
+ * why — see `ConversationActiveTagFilters`.
+ *
+ * To add a new preference exposed by those menus:
* 1. Add a field here with a sensible default in `initialState`.
* 2. Add matching `setX`/`toggleX` actions below.
* 3. Read/write through the store in `conversation-panel.tsx`.
@@ -22,6 +30,11 @@ import {
*/
interface ConversationPanelPreferencesState {
showOlderConversations: boolean;
+ /**
+ * Age threshold used when `showOlderConversations` is false. Conversations
+ * last updated before this interval are hidden.
+ */
+ olderConversationCutoff: OlderConversationCutoff;
showArchivedConversations: boolean;
showRepoBranchMetadata: boolean;
showLlmProfiles: boolean;
@@ -32,12 +45,38 @@ interface ConversationPanelPreferencesState {
threadScope: ThreadScope;
automationFilterMode: AutomationFilterMode;
selectedAutomationNames: string[];
+ selectedTagFacets: string[];
groupFolderOrder: string[];
}
+/** The complete preference bundle controlled by conversation layout presets. */
+export type LayoutSettingsSlice = Pick<
+ ConversationPanelPreferencesState,
+ | "organizeMode"
+ | "conversationSort"
+ | "threadScope"
+ | "showOlderConversations"
+ | "showRepoBranchMetadata"
+ | "showLlmProfiles"
+ | "showTagsMetadata"
+ | "showHoverMetadata"
+>;
+
+export const DEFAULT_LAYOUT_SETTINGS: LayoutSettingsSlice = {
+ organizeMode: "chronological",
+ conversationSort: "updated",
+ threadScope: "all",
+ showOlderConversations: true,
+ showRepoBranchMetadata: false,
+ showLlmProfiles: false,
+ showTagsMetadata: true,
+ showHoverMetadata: true,
+};
+
interface ConversationPanelPreferencesActions {
setShowOlderConversations: (value: boolean) => void;
toggleShowOlderConversations: () => void;
+ setOlderConversationCutoff: (value: OlderConversationCutoff) => void;
setShowArchivedConversations: (value: boolean) => void;
toggleShowArchivedConversations: () => void;
setShowRepoBranchMetadata: (value: boolean) => void;
@@ -53,6 +92,18 @@ interface ConversationPanelPreferencesActions {
setThreadScope: (value: ThreadScope) => void;
setAutomationFilterMode: (value: AutomationFilterMode) => void;
toggleAutomationName: (name: string) => void;
+ /**
+ * Clears both facet selections (tags and automation names) — the two
+ * narrowings the active-filter strip renders as chips.
+ *
+ * Deliberately leaves `automationFilterMode` alone: the strip shows no chip
+ * for the mode, and it must not silently switch a surface it doesn't show.
+ * The mode keeps its own rows in the advanced-options modal.
+ */
+ clearFilterSelections: () => void;
+ toggleTagFacet: (facet: string) => void;
+ /** Applies a layout preset's partial bundle in one set(). */
+ applyLayoutSettings: (settings: Partial<LayoutSettingsSlice>) => void;
setGroupFolderOrder: (order: readonly string[]) => void;
}
@@ -60,17 +111,12 @@ type ConversationPanelPreferencesStore = ConversationPanelPreferencesState &
ConversationPanelPreferencesActions;
const initialState: ConversationPanelPreferencesState = {
- showOlderConversations: true,
+ ...DEFAULT_LAYOUT_SETTINGS,
+ olderConversationCutoff: DEFAULT_OLDER_CONVERSATION_CUTOFF,
showArchivedConversations: false,
- showRepoBranchMetadata: false,
- showLlmProfiles: false,
- showTagsMetadata: false,
- showHoverMetadata: true,
- organizeMode: "chronological",
- conversationSort: "updated",
- threadScope: "all",
automationFilterMode: "all",
selectedAutomationNames: [],
+ selectedTagFacets: [],
groupFolderOrder: [],
};
@@ -86,6 +132,12 @@ export const useConversationPanelPreferencesStore =
set((state) => ({
showOlderConversations: !state.showOlderConversations,
})),
+ setOlderConversationCutoff: (value) =>
+ set(() => ({
+ olderConversationCutoff: isOlderConversationCutoff(value)
+ ? value
+ : DEFAULT_OLDER_CONVERSATION_CUTOFF,
+ })),
setShowArchivedConversations: (value) =>
set(() => ({ showArchivedConversations: value })),
@@ -126,7 +178,14 @@ export const useConversationPanelPreferencesStore =
set(() => ({ conversationSort: value })),
setThreadScope: (value) => set(() => ({ threadScope: value })),
setAutomationFilterMode: (value) =>
- set(() => ({ automationFilterMode: value })),
+ set((state) => ({
+ automationFilterMode: value,
+ // Name selections only make sense in only-automations mode;
+ // leaving the mode clears them (self-healing — a stale selection
+ // must never silently narrow an unfiltered-looking list).
+ selectedAutomationNames:
+ value === "only-automations" ? state.selectedAutomationNames : [],
+ })),
toggleAutomationName: (name) =>
set((state) => ({
selectedAutomationNames: state.selectedAutomationNames.includes(
@@ -137,8 +196,21 @@ export const useConversationPanelPreferencesStore =
)
: [...state.selectedAutomationNames, name],
})),
+ clearFilterSelections: () =>
+ set(() => ({
+ selectedTagFacets: [],
+ selectedAutomationNames: [],
+ })),
+ toggleTagFacet: (facet) =>
+ set((state) => ({
+ selectedTagFacets: state.selectedTagFacets.includes(facet)
+ ? state.selectedTagFacets.filter((existing) => existing !== facet)
+ : [...state.selectedTagFacets, facet],
+ })),
setGroupFolderOrder: (order) =>
set(() => ({ groupFolderOrder: [...order] })),
+
+ applyLayoutSettings: (settings) => set(() => ({ ...settings })),
}),
{
name: "conversation-panel-preferences",
@@ -146,6 +218,11 @@ export const useConversationPanelPreferencesStore =
// Only persist the data fields — actions are recreated on each load.
partialize: (state): ConversationPanelPreferencesState => ({
showOlderConversations: state.showOlderConversations,
+ olderConversationCutoff: isOlderConversationCutoff(
+ state.olderConversationCutoff,
+ )
+ ? state.olderConversationCutoff
+ : DEFAULT_OLDER_CONVERSATION_CUTOFF,
showArchivedConversations: state.showArchivedConversations,
showRepoBranchMetadata: state.showRepoBranchMetadata,
showLlmProfiles: state.showLlmProfiles,
@@ -156,6 +233,7 @@ export const useConversationPanelPreferencesStore =
threadScope: state.threadScope,
automationFilterMode: state.automationFilterMode,
selectedAutomationNames: state.selectedAutomationNames,
+ selectedTagFacets: state.selectedTagFacets,
groupFolderOrder: state.groupFolderOrder,
}),
},
diff --git a/src/ui/toggle-switch.tsx b/src/ui/toggle-switch.tsx
index 3416429d6f..059c1ef8b4 100644
--- a/src/ui/toggle-switch.tsx
+++ b/src/ui/toggle-switch.tsx
@@ -1,34 +1,50 @@
import { cn } from "#/utils/utils";
+export type ToggleSwitchSize = "md" | "sm";
+
interface ToggleSwitchVisualProps {
enabled: boolean;
+ /** `sm` is the compact menu-row pill; `md` is the settings/automation switch. */
+ size?: ToggleSwitchSize;
className?: string;
}
/** Shared toggle track + thumb used by settings labels and automation controls. */
export function ToggleSwitchVisual({
enabled,
+ size = "md",
className,
}: ToggleSwitchVisualProps) {
+ const compact = size === "sm";
return (
<span
aria-hidden="true"
className={cn(
- "relative inline-flex h-[22px] w-[40px] shrink-0 items-center rounded-full border",
+ "relative inline-flex shrink-0 items-center rounded-full",
"transition-colors duration-200 ease-in-out motion-reduce:transition-none",
+ compact ? "h-3.5 w-6 p-[3px]" : "h-[22px] w-[40px] border",
enabled
- ? "border-white bg-white"
- : "border-[var(--oh-border)] bg-surface-raised",
+ ? compact
+ ? "bg-white"
+ : "border-white bg-white"
+ : compact
+ ? "bg-[var(--oh-border)]"
+ : "border-[var(--oh-border)] bg-surface-raised",
className,
)}
>
<span
className={cn(
- "inline-block size-4 rounded-full",
+ "inline-block rounded-full",
"transition-transform duration-200 ease-in-out motion-reduce:transition-none",
+ compact ? "size-2" : "size-4",
enabled
- ? "translate-x-[21px] bg-base-secondary"
- : "translate-x-[2px] bg-[var(--oh-muted)]",
+ ? compact
+ ? "translate-x-[10px] bg-base-secondary"
+ : "translate-x-[21px] bg-base-secondary"
+ : compact
+ ? "translate-x-0 bg-[var(--oh-muted)]"
+ : "translate-x-[2px] bg-[var(--oh-muted)]",
)}
/>
</span>
diff --git a/src/utils/scroll-fade-state.ts b/src/utils/scroll-fade-state.ts
index 795996f479..df40c335a7 100644
--- a/src/utils/scroll-fade-state.ts
+++ b/src/utils/scroll-fade-state.ts
@@ -5,6 +5,11 @@ export interface ScrollFadeState {
right: boolean;
}
+export interface VerticalScrollEdgeState {
+ top: boolean;
+ bottom: boolean;
+}
+
/** Whether a horizontal scroller is clipped on each edge. */
export function readScrollFadeState(element: HTMLElement): ScrollFadeState {
const { scrollLeft, scrollWidth, clientWidth } = element;
@@ -16,3 +21,17 @@ export function readScrollFadeState(element: HTMLElement): ScrollFadeState {
right: hasOverflow && scrollLeft < maxScroll - SCROLL_EDGE_THRESHOLD_PX,
};
}
+
+/** Whether a vertical scroller is clipped on each edge. */
+export function readVerticalScrollEdgeState(
+ element: HTMLElement,
+): VerticalScrollEdgeState {
+ const { scrollTop, scrollHeight, clientHeight } = element;
+ const maxScroll = scrollHeight - clientHeight;
+ const hasOverflow = maxScroll > SCROLL_EDGE_THRESHOLD_PX;
+
+ return {
+ top: hasOverflow && scrollTop > SCROLL_EDGE_THRESHOLD_PX,
+ bottom: hasOverflow && scrollTop < maxScroll - SCROLL_EDGE_THRESHOLD_PX,
+ };
+}