Skip to content

🙌 OpenHands: AI-Driven Development

refactor(conversation): remove unreachable overview drawer sections (#18406)

Vasco Schiavof3ec0b9c70ca
diff --git a/.agents/skills/verify-openhands/references/feature-map/F14-secrets.md b/.agents/skills/verify-openhands/references/feature-map/F14-secrets.md
index 2ac38b62df..cddd297102 100644
--- a/.agents/skills/verify-openhands/references/feature-map/F14-secrets.md
+++ b/.agents/skills/verify-openhands/references/feature-map/F14-secrets.md
@@ -57,7 +57,7 @@ Preconditions:
- Edit forms intentionally show an empty value; that is not data loss.
- The invalid-name check is native browser validation. It shows a tooltip that screenshots do not capture, and it leaves any earlier `Secret already exists` paragraph on screen. Assert with `validationMessage` and the API, not the paragraph.
- The model is the weak link in the agent checks, not the product: asked to print a secret's length or last characters, deepseek-flash replies "I can't run that one" and runs nothing, and even for the equality check it may refuse to repeat `True` in its reply. Use the equality prompt and read the terminal `ObservationEvent`; `conversation events` truncates message text to about 160 characters.
-- The conversation Overview has a Secrets drawer (`conversation-overview-secrets-panel`, `conversation-overview-secrets-add-button`) built on the same form, but no UI opens it: the Overview "..." menu (`conversation-overview-ellipsis`) offers Workspace and Git sections only. It is not a user entry point today.
+- The conversation Overview has no Secrets entry point: its "..." menu (`conversation-overview-ellipsis`) offers Workspace and Git sections only.
- There is no empty state to reach safely: `secrets-empty` renders only with zero secrets, which means deleting the launcher-seeded key (see below).
- Secrets reach only conversations started after the save. Reuse an older conversation and the variable is missing.
- At 390 px the name column truncates long names (`OPEN…`); use `browser text` on the row rather than the screenshot to read a name.
diff --git a/__tests__/components/features/conversation/conversation-overview-diffs-row.test.tsx b/__tests__/components/features/conversation/conversation-overview-diffs-row.test.tsx
index 29c3a6b30b..ee5626c561 100644
--- a/__tests__/components/features/conversation/conversation-overview-diffs-row.test.tsx
+++ b/__tests__/components/features/conversation/conversation-overview-diffs-row.test.tsx
@@ -39,8 +39,7 @@ vi.mock(
"#/components/features/conversation/conversation-overview-drawer-context",
() => ({
useConversationOverviewDrawerOptional: () => ({
- section: "skills",
- openAdd: false,
+ section: "pull_requests",
openSection: vi.fn(),
closeDrawer: closeDrawerMock,
}),
diff --git a/__tests__/components/features/conversation/conversation-overview-drawer-content.test.tsx b/__tests__/components/features/conversation/conversation-overview-drawer-content.test.tsx
index 27e9745a33..d4f859b81f 100644
--- a/__tests__/components/features/conversation/conversation-overview-drawer-content.test.tsx
+++ b/__tests__/components/features/conversation/conversation-overview-drawer-content.test.tsx
@@ -2,18 +2,13 @@ import React from "react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { render, screen, within } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
import { ConversationOverviewDrawerContent } from "#/components/features/conversation/conversation-overview-drawer-content";
import {
ConversationOverviewDrawerProvider,
useConversationOverviewDrawer,
} from "#/components/features/conversation/conversation-overview-drawer-context";
import { CONVERSATION_OVERVIEW_DRAWER_SECTION } from "#/components/features/conversation/conversation-overview-drawer.types";
-import { ActiveBackendProvider } from "#/contexts/active-backend-context";
-import SettingsService from "#/api/settings-service/settings-service.api";
-import SkillsService from "#/api/skills-service";
-import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
-import type { SkillInfo } from "#/types/settings";
import { useCloseOnEscape } from "#/hooks/use-close-on-escape";
vi.mock("#/hooks/use-conversation-overview-stats", () => ({
@@ -44,68 +39,6 @@ vi.mock("#/hooks/query/use-repository-git-items", () => ({
}),
}));
-vi.mock("#/hooks/query/use-active-conversation", () => ({
- useActiveConversation: () => ({
- data: { selected_workspace: "/workspace/project/demo" },
- }),
-}));
-
-vi.mock("#/hooks/query/use-automation-health", () => ({
- useAutomationHealth: () => ({
- data: { status: "ok" },
- isLoading: false,
- refetch: vi.fn(),
- }),
-}));
-
-vi.mock("#/hooks/query/use-automations", () => ({
- useAutomations: () => ({
- data: { automations: [], total: 0 },
- isLoading: false,
- isError: false,
- refetch: vi.fn(),
- }),
- useToggleAutomation: () => ({ mutate: vi.fn() }),
- useDeleteAutomation: () => ({ mutate: vi.fn(), isPending: false }),
- useDispatchAutomation: () => ({ mutate: vi.fn() }),
-}));
-
-vi.mock("#/hooks/use-tracking", () => ({
- useTracking: () => ({
- trackPrebuiltAutomationEnabled: vi.fn(),
- }),
-}));
-
-vi.mock("#/hooks/use-create-automation-in-chat", () => ({
- useCreateAutomationInChat: () => vi.fn(),
-}));
-
-vi.mock("#/hooks/use-is-creating-conversation", () => ({
- useIsCreatingConversation: () => false,
-}));
-
-vi.mock("#/hooks/mutation/use-create-conversation", () => ({
- useCreateConversation: () => ({ mutate: vi.fn(), isPending: false }),
-}));
-
-function buildSkill(overrides: Partial<SkillInfo> = {}): SkillInfo {
- return {
- name: "deno",
- type: "knowledge",
- source: "/Users/test/.openhands/cache/skills/public-skills/skills/deno/SKILL.md",
- description: "Use this skill for Deno projects.",
- triggers: ["deno"],
- version: "1.0.0",
- license: "Apache-2.0",
- compatibility: null,
- metadata: null,
- allowed_tools: null,
- is_agentskills_format: true,
- disable_model_invocation: false,
- ...overrides,
- };
-}
-
function OpenSection({
section,
}: {
@@ -159,7 +92,7 @@ function renderDrawer(
})
}
>
- <ActiveBackendProvider>{children}</ActiveBackendProvider>
+ {children}
</QueryClientProvider>
),
},
@@ -167,17 +100,9 @@ function renderDrawer(
}
describe("ConversationOverviewDrawerContent", () => {
- beforeEach(() => {
- vi.restoreAllMocks();
- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
- MOCK_DEFAULT_USER_SETTINGS,
- );
- vi.spyOn(SkillsService, "getSkills").mockResolvedValue([buildSkill()]);
- });
-
- it("places the close button left of the title and the add control on the right", async () => {
+ it("places the close button left of the title", async () => {
const user = userEvent.setup();
- renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.skills);
+ renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests);
await user.click(screen.getByTestId("open-drawer-section"));
@@ -188,21 +113,14 @@ describe("ConversationOverviewDrawerContent", () => {
expect(header).toHaveClass("h-10");
expect(header).toHaveClass("min-h-10");
expect(header).toHaveClass("pr-4");
- expect(
- within(header as HTMLElement).getByTestId(
- "conversation-overview-skills-add-skill-button",
- ),
- ).toHaveClass("h-7");
-
- const headerItems = within(header as HTMLElement).getAllByRole("button");
- expect(headerItems[0]).toHaveAttribute(
- "data-testid",
+ const closeButton = within(header as HTMLElement).getByTestId(
"conversation-overview-drawer-close",
);
- expect(headerItems[1]).toHaveAttribute(
- "data-testid",
- "conversation-overview-skills-add-skill-button",
- );
+ const title = within(header as HTMLElement).getByRole("heading");
+ expect(
+ closeButton.compareDocumentPosition(title) &
+ Node.DOCUMENT_POSITION_FOLLOWING,
+ ).toBeTruthy();
});
it("lets a menu opened over the drawer take the first Escape", async () => {
@@ -224,51 +142,6 @@ describe("ConversationOverviewDrawerContent", () => {
).not.toBeInTheDocument();
});
- it("opens the add skill modal from the header add button", async () => {
- const user = userEvent.setup();
- renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.skills);
-
- await user.click(screen.getByTestId("open-drawer-section"));
- await user.click(
- await screen.findByTestId("conversation-overview-skills-add-skill-button"),
- );
-
- expect(await screen.findByTestId("add-skill-modal")).toBeInTheDocument();
- });
-
- it("shows the automations add button in the header", async () => {
- const user = userEvent.setup();
- renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.automations);
-
- await user.click(screen.getByTestId("open-drawer-section"));
-
- expect(
- await screen.findByTestId("conversation-overview-automations-add"),
- ).toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-automations-panel")
- ?.querySelector(
- '[data-testid="conversation-overview-automations-add"]',
- ),
- ).toBeNull();
- });
-
- it("shows the mcp add button in the header", async () => {
- const user = userEvent.setup();
- renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.mcp);
-
- await user.click(screen.getByTestId("open-drawer-section"));
-
- const header = screen
- .getByTestId("conversation-overview-drawer-content")
- .querySelector("header");
- expect(
- within(header as HTMLElement).getByTestId(
- "conversation-overview-mcp-add-server",
- ),
- ).toBeInTheDocument();
- });
-
it("places the view-on-provider link in the header for pull requests", async () => {
const user = userEvent.setup();
renderDrawer(CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests);
diff --git a/__tests__/components/features/conversation/conversation-overview-panel.test.tsx b/__tests__/components/features/conversation/conversation-overview-panel.test.tsx
index c51cc80671..4bba22cabb 100644
--- a/__tests__/components/features/conversation/conversation-overview-panel.test.tsx
+++ b/__tests__/components/features/conversation/conversation-overview-panel.test.tsx
@@ -118,7 +118,6 @@ vi.mock(
...actual,
useConversationOverviewDrawerOptional: () => ({
section: null,
- openAdd: false,
openSection,
closeDrawer,
}),
@@ -149,7 +148,7 @@ describe("ConversationOverviewPanel", () => {
localStorage.clear();
});
- it("renders workspace and git changes without MCP, secrets, skills, or automations", () => {
+ it("renders workspace and git changes but no Issues row", () => {
renderPanel();
expect(screen.getByTestId("conversation-overview-panel")).toBeInTheDocument();
@@ -158,18 +157,6 @@ describe("ConversationOverviewPanel", () => {
screen.queryByTestId("conversation-overview-git-title"),
).not.toBeInTheDocument();
expect(screen.getByTestId("conversation-overview-diffs")).toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-mcp"),
- ).not.toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-automations"),
- ).not.toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-skills"),
- ).not.toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-secrets"),
- ).not.toBeInTheDocument();
expect(
screen.queryByTestId("conversation-overview-issues"),
).not.toBeInTheDocument();
diff --git a/__tests__/components/features/conversation/conversation-overview-skills-panel.test.tsx b/__tests__/components/features/conversation/conversation-overview-skills-panel.test.tsx
deleted file mode 100644
index ec89ba7b24..0000000000
--- a/__tests__/components/features/conversation/conversation-overview-skills-panel.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { ConversationOverviewSkillsPanel } from "#/components/features/conversation/conversation-overview-skills-panel";
-import SettingsService from "#/api/settings-service/settings-service.api";
-import SkillsService from "#/api/skills-service";
-import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
-import type { SkillInfo } from "#/types/settings";
-import { ActiveBackendProvider } from "#/contexts/active-backend-context";
-
-vi.mock("#/hooks/query/use-active-conversation", () => ({
- useActiveConversation: () => ({
- data: { selected_workspace: "/workspace/project/demo" },
- }),
-}));
-
-function buildSkill(overrides: Partial<SkillInfo> = {}): SkillInfo {
- return {
- name: "deno",
- type: "knowledge",
- source: "/Users/test/.openhands/cache/skills/public-skills/skills/deno/SKILL.md",
- description: "Use this skill for Deno projects.",
- triggers: ["deno"],
- version: "1.0.0",
- license: "Apache-2.0",
- compatibility: null,
- metadata: null,
- allowed_tools: null,
- is_agentskills_format: true,
- disable_model_invocation: false,
- ...overrides,
- };
-}
-
-function renderPanel(openAdd = false) {
- return render(<ConversationOverviewSkillsPanel openAdd={openAdd} />, {
- wrapper: ({ children }) => (
- <QueryClientProvider
- client={
- new QueryClient({
- defaultOptions: { queries: { retry: false } },
- })
- }
- >
- <ActiveBackendProvider>{children}</ActiveBackendProvider>
- </QueryClientProvider>
- ),
- });
-}
-
-describe("ConversationOverviewSkillsPanel", () => {
- beforeEach(() => {
- vi.restoreAllMocks();
- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(
- MOCK_DEFAULT_USER_SETTINGS,
- );
- });
-
- it("opens the add skill modal when openAdd is true", async () => {
- vi.spyOn(SkillsService, "getSkills").mockResolvedValue([buildSkill()]);
-
- renderPanel(true);
-
- expect(await screen.findByTestId("add-skill-modal")).toBeInTheDocument();
- });
-
- it("shows the empty state without an inline add skill button", async () => {
- vi.spyOn(SkillsService, "getSkills").mockResolvedValue([]);
-
- renderPanel();
-
- expect(
- await screen.findByTestId("conversation-overview-skills-empty"),
- ).toBeInTheDocument();
- expect(
- screen.queryByTestId("conversation-overview-skills-add-skill-button"),
- ).not.toBeInTheDocument();
- });
-
- it("defaults to this-project scope and can show all skills", async () => {
- const user = userEvent.setup();
- vi.spyOn(SkillsService, "getSkills").mockResolvedValue([
- buildSkill({
- name: "project-skill",
- source: "/workspace/project/demo/.openhands/skills/project/SKILL.md",
- }),
- buildSkill({ name: "public-skill" }),
- ]);
-
- renderPanel();
-
- expect(
- await screen.findByTestId("conversation-overview-skills-scope"),
- ).toBeInTheDocument();
- expect(await screen.findByText("project-skill")).toBeInTheDocument();
- expect(screen.queryByText("public-skill")).not.toBeInTheDocument();
-
- await user.click(
- screen.getByTestId("conversation-overview-skills-scope-option-all"),
- );
-
- expect(await screen.findByText("public-skill")).toBeInTheDocument();
- expect(screen.getByText("project-skill")).toBeInTheDocument();
- });
-});
diff --git a/__tests__/utils/conversation-overview-project-scope.test.ts b/__tests__/utils/conversation-overview-project-scope.test.ts
deleted file mode 100644
index 282b372169..0000000000
--- a/__tests__/utils/conversation-overview-project-scope.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { SkillInfo } from "#/types/settings";
-import {
- CONVERSATION_OVERVIEW_PROJECT_SCOPE,
- filterSkillsByProjectScope,
- sortSkillsByProjectRelevance,
-} from "#/utils/conversation-overview-project-scope";
-
-function buildSkill(
- overrides: Partial<SkillInfo> & Pick<SkillInfo, "name">,
-): SkillInfo {
- return {
- type: "knowledge",
- source: "public",
- description: null,
- triggers: [],
- license: null,
- compatibility: null,
- metadata: null,
- allowed_tools: null,
- is_agentskills_format: true,
- disable_model_invocation: false,
- ...overrides,
- };
-}
-
-describe("conversation overview project scope", () => {
- it("filters and sorts skills with project skills first", () => {
- const skills = [
- buildSkill({ name: "public-z", source: "public" }),
- buildSkill({ name: "project-a", source: "project" }),
- buildSkill({ name: "personal-b", source: "user" }),
- ];
-
- expect(
- filterSkillsByProjectScope(
- skills,
- CONVERSATION_OVERVIEW_PROJECT_SCOPE.project,
- "/workspace/demo",
- ).map((skill) => skill.name),
- ).toEqual(["project-a"]);
-
- expect(
- sortSkillsByProjectRelevance(skills, "/workspace/demo").map(
- (skill) => skill.name,
- ),
- ).toEqual(["project-a", "personal-b", "public-z"]);
- });
-});
diff --git a/src/components/features/conversation/conversation-overview-automations-panel.tsx b/src/components/features/conversation/conversation-overview-automations-panel.tsx
deleted file mode 100644
index a4f80b757a..0000000000
--- a/src/components/features/conversation/conversation-overview-automations-panel.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useEffect, useRef } from "react";
-import { useTranslation } from "react-i18next";
-import { AutomationCardSkeleton } from "#/components/features/automations/automation-card-skeleton";
-import { AutomationGroup } from "#/components/features/automations/automation-group";
-import { BackendNotConfigured } from "#/components/features/automations/backend-not-configured";
-import { EmptyState } from "#/components/features/automations/empty-state";
-import { ErrorState } from "#/components/features/automations/error-state";
-import { useAutomations } from "#/hooks/query/use-automations";
-import { useAutomationHealth } from "#/hooks/query/use-automation-health";
-import { useStartAutomationSetup } from "#/hooks/use-start-automation-setup";
-import { I18nKey } from "#/i18n/declaration";
-
-/** Opens the setup page once when the drawer asks to add an automation. */
-function LaunchAutomationSetup() {
- const { startSetup } = useStartAutomationSetup();
- const launched = useRef(false);
-
- useEffect(() => {
- if (launched.current) return;
- launched.current = true;
- startSetup();
- }, [startSetup]);
-
- return null;
-}
-
-interface ConversationOverviewAutomationsPanelProps {
- openAdd: boolean;
-}
-
-const NOOP = () => undefined;
-
-/** Reuses the existing Automations list and creation guidance in the drawer. */
-export function ConversationOverviewAutomationsPanel({
- openAdd,
-}: ConversationOverviewAutomationsPanelProps) {
- const { t } = useTranslation("openhands");
- const {
- data: health,
- isLoading: isHealthLoading,
- refetch: refetchHealth,
- } = useAutomationHealth();
- const { data, isLoading, isError, refetch } = useAutomations({
- enabled: health?.status === "ok",
- });
-
- // Every state renders inside the same panel container so the drawer's
- // DOM contract (one `conversation-overview-automations-panel` node) holds
- // regardless of backend health or list contents.
- let body;
- if (isHealthLoading || (health?.status === "ok" && isLoading)) {
- body = <AutomationCardSkeleton />;
- } else if (health?.status !== "ok") {
- body = <BackendNotConfigured onRetry={refetchHealth} />;
- } else if (isError) {
- body = <ErrorState onRetry={refetch} />;
- } else if (!data?.automations.length) {
- body = (
- <>
- <EmptyState />
- {openAdd ? <LaunchAutomationSetup /> : null}
- </>
- );
- } else {
- body = (
- <>
- <AutomationGroup
- title={t(I18nKey.CONVERSATION_PANEL$AUTOMATIONS)}
- count={data.automations.length}
- automations={data.automations}
- view="list"
- onToggle={NOOP}
- onRunNow={NOOP}
- onDelete={NOOP}
- onExport={NOOP}
- />
- {openAdd ? <LaunchAutomationSetup /> : null}
- </>
- );
- }
-
- return (
- <div data-testid="conversation-overview-automations-panel">{body}</div>
- );
-}
diff --git a/src/components/features/conversation/conversation-overview-drawer-content.tsx b/src/components/features/conversation/conversation-overview-drawer-content.tsx
index 56fc1cda3e..37bfd5f91f 100644
--- a/src/components/features/conversation/conversation-overview-drawer-content.tsx
+++ b/src/components/features/conversation/conversation-overview-drawer-content.tsx
@@ -1,6 +1,5 @@
import { useTranslation } from "react-i18next";
import XMarkIcon from "#/icons/x-mark.svg?react";
-import { BrandButton } from "#/components/features/settings/brand-button";
import { I18nKey } from "#/i18n/declaration";
import { cn } from "#/utils/utils";
import { useConversationOverviewDrawer } from "./conversation-overview-drawer-context";
@@ -8,10 +7,6 @@ import {
CONVERSATION_OVERVIEW_DRAWER_SECTION,
type ConversationOverviewDrawerSection,
} from "./conversation-overview-drawer.types";
-import { ConversationOverviewAutomationsPanel } from "./conversation-overview-automations-panel";
-import { ConversationOverviewSkillsPanel } from "./conversation-overview-skills-panel";
-import { ConversationOverviewMcpPanel } from "./conversation-overview-mcp-panel";
-import { ConversationOverviewSecretsPanel } from "./conversation-overview-secrets-panel";
import {
ConversationOverviewGitItemsHeaderLink,
ConversationOverviewGitItemsPanel,
@@ -20,7 +15,6 @@ import { useConversationOverviewStats } from "#/hooks/use-conversation-overview-
import { useCloseOnEscape } from "#/hooks/use-close-on-escape";
import {
CONVERSATION_SECONDARY_DRAWER_CLOSE_BUTTON_CLASSNAME,
- CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME,
CONVERSATION_SECONDARY_DRAWER_HEADER_CLASSNAME,
} from "./conversation-secondary-drawer.classes";
@@ -30,14 +24,6 @@ interface ConversationOverviewDrawerContentProps {
function getSectionTitleKey(section: ConversationOverviewDrawerSection) {
switch (section) {
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.automations:
- return I18nKey.CONVERSATION_PANEL$AUTOMATIONS;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.skills:
- return I18nKey.SETTINGS$NAV_SKILLS;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.mcp:
- return I18nKey.CONVERSATION$OVERVIEW_MCP;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.secrets:
- return I18nKey.SETTINGS$NAV_SECRETS;
case CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests:
return I18nKey.CONVERSATION$OVERVIEW_PULL_REQUESTS;
case CONVERSATION_OVERVIEW_DRAWER_SECTION.issues:
@@ -49,104 +35,11 @@ function getSectionTitleKey(section: ConversationOverviewDrawerSection) {
}
}
-function ConversationOverviewDrawerHeaderAddAction({
- section,
-}: {
- section: ConversationOverviewDrawerSection;
-}) {
- const { t } = useTranslation("openhands");
- const { requestAdd } = useConversationOverviewDrawer();
-
- switch (section) {
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.automations:
- return (
- <BrandButton
- type="button"
- variant="primary"
- testId="conversation-overview-automations-add"
- className={CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME}
- onClick={requestAdd}
- >
- {t(I18nKey.AUTOMATIONS$ADD_AUTOMATION)}
- </BrandButton>
- );
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.skills:
- return (
- <BrandButton
- type="button"
- variant="primary"
- testId="conversation-overview-skills-add-skill-button"
- className={CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME}
- onClick={requestAdd}
- >
- {t(I18nKey.SETTINGS$SKILLS_ADD_BUTTON)}
- </BrandButton>
- );
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.mcp:
- return (
- <BrandButton
- type="button"
- variant="secondary"
- testId="conversation-overview-mcp-add-server"
- className={CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME}
- onClick={requestAdd}
- >
- {t(I18nKey.MCP$ADD_CUSTOM)}
- </BrandButton>
- );
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.secrets:
- return (
- <BrandButton
- type="button"
- variant="primary"
- testId="conversation-overview-secrets-add-button"
- className={CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME}
- onClick={requestAdd}
- >
- {t(I18nKey.SECRETS$ADD_NEW_SECRET)}
- </BrandButton>
- );
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests:
- return <ConversationOverviewGitItemsHeaderLink kind="pull_requests" />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.issues:
- return <ConversationOverviewGitItemsHeaderLink kind="issues" />;
- default:
- return null;
- }
-}
-
-function ConversationOverviewDrawerBody({
- section,
- openAdd,
-}: {
- section: ConversationOverviewDrawerSection;
- openAdd: boolean;
-}) {
- switch (section) {
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.automations:
- return <ConversationOverviewAutomationsPanel openAdd={openAdd} />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.skills:
- return <ConversationOverviewSkillsPanel openAdd={openAdd} />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.mcp:
- return <ConversationOverviewMcpPanel openAdd={openAdd} />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.secrets:
- return <ConversationOverviewSecretsPanel openAdd={openAdd} />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests:
- return <ConversationOverviewGitItemsPanel kind="pull_requests" />;
- case CONVERSATION_OVERVIEW_DRAWER_SECTION.issues:
- return <ConversationOverviewGitItemsPanel kind="issues" />;
- default: {
- const _exhaustive: never = section;
- return _exhaustive;
- }
- }
-}
-
export function ConversationOverviewDrawerContent({
className,
}: ConversationOverviewDrawerContentProps) {
const { t } = useTranslation("openhands");
- const { section, openAdd, closeDrawer } = useConversationOverviewDrawer();
+ const { section, closeDrawer } = useConversationOverviewDrawer();
const { workspaceName } = useConversationOverviewStats();
// A menu opened after the drawer (such as the Overview ⋯ menu) takes
@@ -157,11 +50,6 @@ export function ConversationOverviewDrawerContent({
return null;
}
- const isFullBleedBody =
- section === CONVERSATION_OVERVIEW_DRAWER_SECTION.pull_requests ||
- section === CONVERSATION_OVERVIEW_DRAWER_SECTION.issues ||
- section === CONVERSATION_OVERVIEW_DRAWER_SECTION.secrets;
-
return (
<aside
data-testid="conversation-overview-drawer-content"
@@ -195,19 +83,12 @@ export function ConversationOverviewDrawerContent({
) : null}
</div>
<div className="shrink-0">
- <ConversationOverviewDrawerHeaderAddAction section={section} />
+ <ConversationOverviewGitItemsHeaderLink kind={section} />
</div>
</header>
- <div
- className={cn(
- "min-h-0 flex-1 custom-scrollbar-always",
- isFullBleedBody
- ? "flex flex-col overflow-hidden"
- : "overflow-y-auto px-4 py-4",
- )}
- >
- <ConversationOverviewDrawerBody section={section} openAdd={openAdd} />
+ <div className="flex min-h-0 flex-1 flex-col overflow-hidden custom-scrollbar-always">
+ <ConversationOverviewGitItemsPanel kind={section} />
</div>
</aside>
);
diff --git a/src/components/features/conversation/conversation-overview-drawer-context.tsx b/src/components/features/conversation/conversation-overview-drawer-context.tsx
index 2330c7d755..4d0b9fbbdc 100644
--- a/src/components/features/conversation/conversation-overview-drawer-context.tsx
+++ b/src/components/features/conversation/conversation-overview-drawer-context.tsx
@@ -5,22 +5,12 @@ import React, {
useMemo,
useState,
} from "react";
-import type {
- ConversationOverviewDrawerOpenOptions,
- ConversationOverviewDrawerSection,
-} from "./conversation-overview-drawer.types";
+import type { ConversationOverviewDrawerSection } from "./conversation-overview-drawer.types";
interface ConversationOverviewDrawerContextValue {
section: ConversationOverviewDrawerSection | null;
- openAdd: boolean;
- /** Increments when the drawer header Add control is clicked. */
- addRequestKey: number;
- openSection: (
- section: ConversationOverviewDrawerSection,
- options?: ConversationOverviewDrawerOpenOptions,
- ) => void;
+ openSection: (section: ConversationOverviewDrawerSection) => void;
closeDrawer: () => void;
- requestAdd: () => void;
}
const ConversationOverviewDrawerContext =
@@ -33,41 +23,12 @@ export function ConversationOverviewDrawerProvider({
}) {
const [section, setSection] =
useState<ConversationOverviewDrawerSection | null>(null);
- const [openAdd, setOpenAdd] = useState(false);
- const [addRequestKey, setAddRequestKey] = useState(0);
- const openSection = useCallback(
- (
- nextSection: ConversationOverviewDrawerSection,
- options?: ConversationOverviewDrawerOpenOptions,
- ) => {
- setSection(nextSection);
- setOpenAdd(Boolean(options?.openAdd));
- setAddRequestKey(0);
- },
- [],
- );
-
- const closeDrawer = useCallback(() => {
- setSection(null);
- setOpenAdd(false);
- setAddRequestKey(0);
- }, []);
-
- const requestAdd = useCallback(() => {
- setAddRequestKey((previous) => previous + 1);
- }, []);
+ const closeDrawer = useCallback(() => setSection(null), []);
const value = useMemo(
- () => ({
- section,
- openAdd,
- addRequestKey,
- openSection,
- closeDrawer,
- requestAdd,
- }),
- [addRequestKey, closeDrawer, openAdd, openSection, requestAdd, section],
+ () => ({ section, openSection: setSection, closeDrawer }),
+ [closeDrawer, section],
);
return (
diff --git a/src/components/features/conversation/conversation-overview-drawer.types.ts b/src/components/features/conversation/conversation-overview-drawer.types.ts
index 396f0394f4..a22e279fdc 100644
--- a/src/components/features/conversation/conversation-overview-drawer.types.ts
+++ b/src/components/features/conversation/conversation-overview-drawer.types.ts
@@ -1,15 +1,7 @@
export const CONVERSATION_OVERVIEW_DRAWER_SECTION = {
- automations: "automations",
- skills: "skills",
- mcp: "mcp",
- secrets: "secrets",
pull_requests: "pull_requests",
issues: "issues",
} as const;
export type ConversationOverviewDrawerSection =
(typeof CONVERSATION_OVERVIEW_DRAWER_SECTION)[keyof typeof CONVERSATION_OVERVIEW_DRAWER_SECTION];
-
-export interface ConversationOverviewDrawerOpenOptions {
- openAdd?: boolean;
-}
diff --git a/src/components/features/conversation/conversation-overview-mcp-panel.tsx b/src/components/features/conversation/conversation-overview-mcp-panel.tsx
deleted file mode 100644
index 829dcfb84e..0000000000
--- a/src/components/features/conversation/conversation-overview-mcp-panel.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { AxiosError } from "axios";
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { ConfirmationModal } from "#/components/shared/modals/confirmation-modal";
-import { useSettings } from "#/hooks/query/use-settings";
-import { useDeleteMcpServer } from "#/hooks/mutation/use-delete-mcp-server";
-import { useUpdateMcpServer } from "#/hooks/mutation/use-update-mcp-server";
-import { parseMcpConfig } from "#/utils/mcp-config";
-import {
- displayErrorToast,
- displaySuccessToast,
-} from "#/utils/custom-toast-handlers";
-import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";
-import {
- findCatalogEntryForServer,
- getMcpMarketplaceCatalog,
- installedServerMatchesQuery,
-} from "#/utils/mcp-marketplace-utils";
-import {
- INTEGRATION_CATALOG as MCP_MARKETPLACE,
- type IntegrationCatalogEntry as MarketplaceEntry,
-} from "@openhands/extensions/integrations";
-import { MCPServerConfig } from "#/types/mcp-server";
-import { flattenMcpConfig } from "#/utils/mcp-installed-servers";
-import {
- InstalledServersSection,
- CustomServerEditor,
- InstallServerModal,
- MarketplaceSection,
- McpToolbar,
- type McpSectionFilter,
-} from "#/components/features/mcp-page";
-import { useConversationOverviewDrawerOptional } from "./conversation-overview-drawer-context";
-
-interface ConversationOverviewMcpPanelProps {
- openAdd: boolean;
-}
-
-export function ConversationOverviewMcpPanel({
- openAdd,
-}: ConversationOverviewMcpPanelProps) {
- const { t } = useTranslation("openhands");
- const { data: settings, isLoading } = useSettings();
- const { mutate: deleteMcpServer, isPending: isDeleting } =
- useDeleteMcpServer();
- const { mutate: updateMcpServer } = useUpdateMcpServer();
- const addRequestKey =
- useConversationOverviewDrawerOptional()?.addRequestKey ?? 0;
-
- const [installEntry, setInstallEntry] = useState<MarketplaceEntry | null>(
- null,
- );
- const [editingServer, setEditingServer] = useState<MCPServerConfig | null>(
- null,
- );
- const [serverToDelete, setServerToDelete] = useState<MCPServerConfig | null>(
- null,
- );
- const [searchQuery, setSearchQuery] = useState("");
- const [sectionFilter, setSectionFilter] = useState<McpSectionFilter>("all");
-
- useEffect(() => {
- if (!openAdd) {
- return;
- }
- setEditingServer({ id: "", type: "sse" });
- }, [openAdd]);
-
- useEffect(() => {
- if (addRequestKey === 0) {
- return;
- }
- setEditingServer({ id: "", type: "sse" });
- }, [addRequestKey]);
-
- const mcpConfig = parseMcpConfig(settings?.agent_settings?.mcp_config);
- const allServers = flattenMcpConfig(mcpConfig);
- const mcpMarketplace = getMcpMarketplaceCatalog(MCP_MARKETPLACE);
- const filteredInstalledServers = allServers.filter((server) =>
- installedServerMatchesQuery(
- server,
- findCatalogEntryForServer(server, mcpMarketplace),
- searchQuery,
- ),
- );
-
- const handleToggleEnabled = (server: MCPServerConfig, enabled: boolean) => {
- updateMcpServer(
- { serverId: server.id, server: { ...server, enabled } },
- {
- onError: (error) =>
- displayErrorToast(
- retrieveAxiosErrorMessage(error as AxiosError) ||
- t(I18nKey.ERROR$GENERIC),
- ),
- },
- );
- };
-
- const handleConfirmDelete = () => {
- if (!serverToDelete) {
- return;
- }
- deleteMcpServer(serverToDelete, {
- onSuccess: () => {
- displaySuccessToast(t(I18nKey.MCP$REMOVE_SUCCESS));
- setServerToDelete(null);
- },
- onError: (error) => {
- displayErrorToast(
- retrieveAxiosErrorMessage(error as AxiosError) ||
- t(I18nKey.ERROR$GENERIC),
- );
- setServerToDelete(null);
- },
- });
- };
-
- if (isLoading || !settings) {
- return (
- <div
- data-testid="conversation-overview-mcp-panel"
- className="text-sm text-muted"
- >
- …
- </div>
- );
- }
-
- return (
- <div
- data-testid="conversation-overview-mcp-panel"
- className="flex flex-col gap-4"
- >
- <McpToolbar
- search={searchQuery}
- onSearchChange={setSearchQuery}
- sectionFilter={sectionFilter}
- onSectionFilterChange={setSectionFilter}
- />
-
- {sectionFilter !== "library" ? (
- <section className="flex flex-col gap-3">
- <h3 className="text-sm font-semibold text-foreground">
- {t(I18nKey.MCP$INSTALLED_TITLE)}
- </h3>
- <InstalledServersSection
- servers={filteredInstalledServers}
- hasAnyInstalled={allServers.length > 0}
- query={searchQuery}
- onEdit={setEditingServer}
- onToggleEnabled={handleToggleEnabled}
- />
- </section>
- ) : null}
-
- {sectionFilter !== "installed" ? (
- <MarketplaceSection
- onSelect={setInstallEntry}
- onAdd={setInstallEntry}
- query={searchQuery}
- />
- ) : null}
-
- {installEntry ? (
- <InstallServerModal
- entry={installEntry}
- existingServers={allServers}
- onClose={() => setInstallEntry(null)}
- />
- ) : null}
-
- {editingServer ? (
- <CustomServerEditor
- server={editingServer}
- existingServers={allServers}
- onClose={() => setEditingServer(null)}
- />
- ) : null}
-
- {serverToDelete ? (
- <ConfirmationModal
- text={t(I18nKey.SETTINGS$MCP_CONFIRM_DELETE)}
- onCancel={() => setServerToDelete(null)}
- onConfirm={handleConfirmDelete}
- isConfirming={isDeleting}
- />
- ) : null}
- </div>
- );
-}
diff --git a/src/components/features/conversation/conversation-overview-project-scope-toggle.tsx b/src/components/features/conversation/conversation-overview-project-scope-toggle.tsx
deleted file mode 100644
index 44257fb13f..0000000000
--- a/src/components/features/conversation/conversation-overview-project-scope-toggle.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useTranslation } from "react-i18next";
-import { SegmentedToggle } from "#/components/features/files-tab/segmented-toggle";
-import { I18nKey } from "#/i18n/declaration";
-import {
- CONVERSATION_OVERVIEW_PROJECT_SCOPE,
- type ConversationOverviewProjectScope,
-} from "#/utils/conversation-overview-project-scope";
-
-interface ConversationOverviewProjectScopeToggleProps {
- value: ConversationOverviewProjectScope;
- onChange: (value: ConversationOverviewProjectScope) => void;
- testId: string;
-}
-
-export function ConversationOverviewProjectScopeToggle({
- value,
- onChange,
- testId,
-}: ConversationOverviewProjectScopeToggleProps) {
- const { t } = useTranslation("openhands");
-
- return (
- <div className="flex w-full justify-center [&>[role=radiogroup]]:w-full">
- <SegmentedToggle<ConversationOverviewProjectScope>
- value={value}
- onChange={onChange}
- ariaLabel={t(I18nKey.CONVERSATION$OVERVIEW_SCOPE_FILTER)}
- testId={testId}
- options={[
- {
- value: CONVERSATION_OVERVIEW_PROJECT_SCOPE.project,
- label: t(I18nKey.CONVERSATION$OVERVIEW_SCOPE_PROJECT),
- },
- {
- value: CONVERSATION_OVERVIEW_PROJECT_SCOPE.all,
- label: t(I18nKey.CONVERSATION$OVERVIEW_SCOPE_ALL),
- },
- ]}
- />
- </div>
- );
-}
diff --git a/src/components/features/conversation/conversation-overview-secrets-panel.tsx b/src/components/features/conversation/conversation-overview-secrets-panel.tsx
deleted file mode 100644
index 2da57c02da..0000000000
--- a/src/components/features/conversation/conversation-overview-secrets-panel.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { useQueryClient } from "@tanstack/react-query";
-import { Trash2 } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { useSearchSecrets } from "#/hooks/query/use-get-secrets";
-import { useDeleteSecret } from "#/hooks/mutation/use-delete-secret";
-import { SecretForm } from "#/components/features/settings/secrets-settings/secret-form";
-import { ConfirmationModal } from "#/components/shared/modals/confirmation-modal";
-import { cn } from "#/utils/utils";
-import { extensionModuleEmptyStateClassName } from "#/utils/extension-module-card-classes";
-import { useConversationOverviewDrawerOptional } from "./conversation-overview-drawer-context";
-
-interface ConversationOverviewSecretsPanelProps {
- openAdd: boolean;
-}
-
-export function ConversationOverviewSecretsPanel({
- openAdd,
-}: ConversationOverviewSecretsPanelProps) {
- const queryClient = useQueryClient();
- const { t } = useTranslation("openhands");
- const addRequestKey =
- useConversationOverviewDrawerOptional()?.addRequestKey ?? 0;
-
- const { data: secrets, isLoading } = useSearchSecrets();
- const { mutate: deleteSecret, isPending: isDeleting } = useDeleteSecret();
-
- const [view, setView] = useState<"list" | "add-secret-form">("list");
- const [secretToDelete, setSecretToDelete] = useState<string | null>(null);
-
- useEffect(() => {
- if (!openAdd) {
- return;
- }
- setView("add-secret-form");
- }, [openAdd]);
-
- useEffect(() => {
- if (addRequestKey === 0) {
- return;
- }
- setView("add-secret-form");
- }, [addRequestKey]);
-
- const invalidateSecrets = () => {
- queryClient.invalidateQueries({ queryKey: ["secrets-search"] });
- queryClient.invalidateQueries({ queryKey: ["secrets"] });
- };
-
- if (view === "add-secret-form") {
- return (
- <div
- data-testid="conversation-overview-secrets-add-form"
- className="flex h-full min-h-0 flex-col overflow-y-auto p-4"
- >
- <SecretForm
- mode="add"
- selectedSecret={null}
- onCancel={() => setView("list")}
- />
- </div>
- );
- }
-
- return (
- <div
- data-testid="conversation-overview-secrets-panel"
- className="flex h-full min-h-0 flex-col"
- >
- <div className="min-h-0 flex-1 overflow-y-auto px-2 py-2">
- {isLoading ? (
- <p className="px-2 py-4 text-sm text-muted">
- {t(I18nKey.HOME$LOADING)}
- </p>
- ) : secrets && secrets.length > 0 ? (
- <ul className="flex flex-col gap-0.5">
- {secrets.map((secret) => (
- <li
- key={secret.name}
- data-testid="conversation-overview-secret-item"
- className="group flex items-center gap-2 rounded-md px-2 py-2 hover:bg-contrast/5"
- >
- <div className="min-w-0 flex-1">
- <p className="truncate text-sm text-foreground">
- {secret.name}
- </p>
- {secret.description ? (
- <p className="truncate text-xs text-muted">
- {secret.description}
- </p>
- ) : null}
- </div>
- <button
- type="button"
- data-testid={`conversation-overview-secret-delete-${secret.name}`}
- aria-label={t(I18nKey.BUTTON$DELETE)}
- onClick={() => setSecretToDelete(secret.name)}
- className={cn(
- "shrink-0 rounded-md p-1 text-muted",
- "opacity-0 transition-opacity group-hover:opacity-100",
- "hover:bg-contrast/10 hover:text-foreground",
- )}
- >
- <Trash2 className="size-3.5" aria-hidden />
- </button>
- </li>
- ))}
- </ul>
- ) : (
- <p
- data-testid="conversation-overview-secrets-empty"
- className={cn(
- extensionModuleEmptyStateClassName,
- "px-2 py-6 text-center text-sm",
- )}
- >
- {t(I18nKey.SECRETS$EMPTY)}
- </p>
- )}
- </div>
-
- {secretToDelete ? (
- <ConfirmationModal
- text={t(I18nKey.SECRETS$CONFIRM_DELETE_KEY)}
- isConfirming={isDeleting}
- onCancel={() => setSecretToDelete(null)}
- onConfirm={() => {
- deleteSecret(secretToDelete, {
- onSettled: () => setSecretToDelete(null),
- onSuccess: invalidateSecrets,
- onError: invalidateSecrets,
- });
- }}
- />
- ) : null}
- </div>
- );
-}
diff --git a/src/components/features/conversation/conversation-overview-skills-panel.tsx b/src/components/features/conversation/conversation-overview-skills-panel.tsx
deleted file mode 100644
index c483fafc85..0000000000
--- a/src/components/features/conversation/conversation-overview-skills-panel.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import React, { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { useSettings } from "#/hooks/query/use-settings";
-import { useActiveConversation } from "#/hooks/query/use-active-conversation";
-import { useConversationSkills } from "#/hooks/query/use-conversation-skills";
-import { useSkillEnablement } from "#/hooks/use-skill-enablement";
-import { SkillCard } from "#/components/features/skills/skill-card";
-import { SkillDetailModal } from "#/components/features/skills/skill-detail-modal";
-import { AddSkillModal } from "#/components/features/skills/add-skill-modal";
-import { SkillsToolbar } from "#/components/features/skills/skills-toolbar";
-import { SkillFiltersModal } from "#/components/features/skills/skill-filters-modal";
-import {
- applySkillFilters,
- buildSkillFacetGroups,
- clearSkillFilterFacets,
- countActiveFilters,
- toggleSkillFilterValue,
- EMPTY_SKILL_FILTER_STATE,
- type SkillFilterState,
-} from "#/components/features/skills/skill-filter";
-import {
- extensionModuleCardGridClassName,
- extensionModuleCardGridContainerClassName,
- extensionModuleEmptyStateClassName,
-} from "#/utils/extension-module-card-classes";
-import type { SkillInfo } from "#/types/settings";
-import { cn } from "#/utils/utils";
-import {
- CONVERSATION_OVERVIEW_PROJECT_SCOPE,
- filterSkillsByProjectScope,
- sortSkillsByProjectRelevance,
- type ConversationOverviewProjectScope,
-} from "#/utils/conversation-overview-project-scope";
-import { useConversationOverviewDrawerOptional } from "./conversation-overview-drawer-context";
-import { ConversationOverviewProjectScopeToggle } from "./conversation-overview-project-scope-toggle";
-
-interface ConversationOverviewSkillsPanelProps {
- openAdd: boolean;
-}
-
-export function ConversationOverviewSkillsPanel({
- openAdd,
-}: ConversationOverviewSkillsPanelProps) {
- const { t } = useTranslation("openhands");
- const { isLoading: settingsLoading } = useSettings();
- const { data: conversation } = useActiveConversation();
- const { data: skills, isLoading: skillsLoading } = useConversationSkills();
- const { isEnabled, setEnabled } = useSkillEnablement();
- const addRequestKey =
- useConversationOverviewDrawerOptional()?.addRequestKey ?? 0;
- const projectDir = conversation?.selected_workspace ?? null;
-
- const [projectScope, setProjectScope] =
- useState<ConversationOverviewProjectScope>(
- CONVERSATION_OVERVIEW_PROJECT_SCOPE.project,
- );
- const [filter, setFilter] = useState<SkillFilterState>(
- EMPTY_SKILL_FILTER_STATE,
- );
- const [isFiltersModalOpen, setIsFiltersModalOpen] = useState(false);
- const [selectedSkill, setSelectedSkill] = useState<SkillInfo | null>(null);
- const [showAddSkillModal, setShowAddSkillModal] = useState(false);
-
- useEffect(() => {
- if (!openAdd) {
- return;
- }
- setShowAddSkillModal(true);
- }, [openAdd]);
-
- useEffect(() => {
- if (addRequestKey === 0) {
- return;
- }
- setShowAddSkillModal(true);
- }, [addRequestKey]);
-
- const scopedSkills = useMemo(() => {
- if (!skills) {
- return [];
- }
- const filtered = filterSkillsByProjectScope(
- skills,
- projectScope,
- projectDir,
- );
- return projectScope === CONVERSATION_OVERVIEW_PROJECT_SCOPE.all
- ? sortSkillsByProjectRelevance(filtered, projectDir)
- : filtered;
- }, [skills, projectScope, projectDir]);
-
- const filteredSkills = useMemo(
- () => applySkillFilters(scopedSkills, isEnabled, filter),
- [scopedSkills, isEnabled, filter],
- );
-
- if (skillsLoading || settingsLoading) {
- return (
- <div
- data-testid="conversation-overview-skills-panel"
- className="text-sm text-muted"
- >
- …
- </div>
- );
- }
-
- if (!skills || skills.length === 0) {
- return (
- <div
- data-testid="conversation-overview-skills-panel"
- className="flex flex-col gap-4"
- >
- <div
- data-testid="conversation-overview-skills-empty"
- className={extensionModuleEmptyStateClassName}
- >
- <p className="text-sm text-tertiary-light">
- {t(I18nKey.SETTINGS$SKILLS_NO_SKILLS)}
- </p>
- </div>
- {showAddSkillModal ? (
- <AddSkillModal onClose={() => setShowAddSkillModal(false)} />
- ) : null}
- </div>
- );
- }
-
- return (
- <div
- data-testid="conversation-overview-skills-panel"
- className="flex flex-col gap-4"
- >
- <ConversationOverviewProjectScopeToggle
- value={projectScope}
- onChange={setProjectScope}
- testId="conversation-overview-skills-scope"
- />
- <SkillsToolbar
- search={filter.query}
- onSearchChange={(query) =>
- setFilter((previous) => ({ ...previous, query }))
- }
- activeFilterCount={countActiveFilters(filter)}
- onOpenFilters={() => setIsFiltersModalOpen(true)}
- />
-
- {scopedSkills.length === 0 ? (
- <div
- data-testid="conversation-overview-skills-project-empty"
- className={extensionModuleEmptyStateClassName}
- >
- <p className="text-sm text-tertiary-light">
- {t(I18nKey.CONVERSATION$OVERVIEW_SCOPE_PROJECT_EMPTY_SKILLS)}
- </p>
- </div>
- ) : filteredSkills.length === 0 ? (
- <div
- data-testid="conversation-overview-skills-no-match"
- className={extensionModuleEmptyStateClassName}
- >
- <p className="text-sm text-tertiary-light">
- {t(I18nKey.SETTINGS$SKILLS_NO_MATCH)}
- </p>
- </div>
- ) : (
- <section
- className={cn(
- "flex min-w-0 flex-col gap-3",
- extensionModuleCardGridContainerClassName,
- )}
- >
- <div className={cn(extensionModuleCardGridClassName, "grid-cols-1")}>
- {filteredSkills.map((skill) => (
- <SkillCard
- key={skill.name}
- skill={skill}
- enabled={isEnabled(skill)}
- onOpen={() => setSelectedSkill(skill)}
- onToggle={(enabled) => setEnabled(skill.name, enabled)}
- />
- ))}
- </div>
- </section>
- )}
-
- {selectedSkill ? (
- <SkillDetailModal
- skill={selectedSkill}
- enabled={isEnabled(selectedSkill)}
- onToggle={(enabled) => setEnabled(selectedSkill.name, enabled)}
- onClose={() => setSelectedSkill(null)}
- />
- ) : null}
-
- {showAddSkillModal ? (
- <AddSkillModal onClose={() => setShowAddSkillModal(false)} />
- ) : null}
-
- {isFiltersModalOpen ? (
- <SkillFiltersModal
- groups={buildSkillFacetGroups(scopedSkills, isEnabled, filter)}
- activeCount={countActiveFilters(filter)}
- onToggle={(groupId, value) =>
- setFilter((previous) =>
- toggleSkillFilterValue(previous, groupId, value),
- )
- }
- onClearAll={() =>
- setFilter((previous) => clearSkillFilterFacets(previous))
- }
- onClose={() => setIsFiltersModalOpen(false)}
- />
- ) : null}
- </div>
- );
-}
diff --git a/src/components/features/conversation/conversation-secondary-drawer.classes.ts b/src/components/features/conversation/conversation-secondary-drawer.classes.ts
index c4962c45f3..dd225d0a09 100644
--- a/src/components/features/conversation/conversation-secondary-drawer.classes.ts
+++ b/src/components/features/conversation/conversation-secondary-drawer.classes.ts
@@ -6,10 +6,6 @@ export const CONVERSATION_SECONDARY_DRAWER_HEADER_CLASSNAME = cn(
"border-b border-border py-1 pl-1 pr-4",
);
-export const CONVERSATION_SECONDARY_DRAWER_HEADER_ACTION_CLASSNAME = cn(
- "h-7 min-h-7 shrink-0 whitespace-nowrap px-2.5 text-xs",
-);
-
export const CONVERSATION_SECONDARY_DRAWER_CLOSE_BUTTON_CLASSNAME = cn(
"inline-flex size-7 shrink-0 cursor-pointer items-center justify-center rounded-md",
"text-muted transition-colors hover:bg-contrast/10 hover:text-contrast",
diff --git a/src/i18n/translation.json b/src/i18n/translation.json
index addd54ac98..0b22315a02 100644
--- a/src/i18n/translation.json
+++ b/src/i18n/translation.json
@@ -31265,24 +31265,6 @@
"ca": "Altre",
"id": "Lainnya"
},
- "SETTINGS$NAV_SKILLS": {
- "en": "Skills",
- "ja": "スキル",
- "zh-CN": "技能",
- "zh-TW": "技能",
- "ko-KR": "스킬",
- "no": "Ferdigheter",
- "ar": "المهارات",
- "de": "Fähigkeiten",
- "fr": "Compétences",
- "it": "Competenze",
- "pt": "Habilidades",
- "es": "Habilidades",
- "tr": "Yetenekler",
- "uk": "Навички",
- "ca": "Habilitats",
- "id": "Skill"
- },
"SETTINGS$SKILLS_TITLE": {
"en": "Skills",
"ja": "スキル",
@@ -43721,24 +43703,6 @@
"ca": "Mode",
"id": "Mode"
},
- "CONVERSATION$OVERVIEW_MCP": {
- "en": "MCP servers",
- "ja": "MCPサーバー",
- "zh-CN": "MCP 服务器",
- "zh-TW": "MCP 伺服器",
- "ko-KR": "MCP 서버",
- "no": "MCP-servere",
- "ar": "خوادم MCP",
- "de": "MCP-Server",
- "fr": "Serveurs MCP",
- "it": "Server MCP",
- "pt": "Servidores MCP",
- "es": "Servidores MCP",
- "tr": "MCP sunucuları",
- "uk": "MCP-сервери",
- "ca": "Servidors MCP",
- "id": "Server MCP"
- },
"CONVERSATION$OVERVIEW_NONE": {
"en": "None",
"ja": "なし",
@@ -44117,96 +44081,6 @@
"ca": "Mostra a {{provider}}",
"id": "Lihat di {{provider}}"
},
- "CONVERSATION$OVERVIEW_SCOPE_FILTER": {
- "en": "Filter by project scope",
- "ja": "プロジェクト範囲で絞り込む",
- "zh-CN": "按项目范围筛选",
- "zh-TW": "依專案範圍篩選",
- "ko-KR": "프로젝트 범위로 필터",
- "no": "Filtrer etter prosjektomfang",
- "ar": "تصفية حسب نطاق المشروع",
- "de": "Nach Projektbereich filtern",
- "fr": "Filtrer par portée du projet",
- "it": "Filtra per ambito del progetto",
- "pt": "Filtrar por escopo do projeto",
- "es": "Filtrar por alcance del proyecto",
- "tr": "Proje kapsamına göre filtrele",
- "uk": "Фільтрувати за областю проєкту",
- "ca": "Filtra per abast del projecte",
- "id": "Filter berdasarkan cakupan proyek"
- },
- "CONVERSATION$OVERVIEW_SCOPE_PROJECT": {
- "en": "This project",
- "ja": "このプロジェクト",
- "zh-CN": "此项目",
- "zh-TW": "此專案",
- "ko-KR": "이 프로젝트",
- "no": "Dette prosjektet",
- "ar": "هذا المشروع",
- "de": "Dieses Projekt",
- "fr": "Ce projet",
- "it": "Questo progetto",
- "pt": "Este projeto",
- "es": "Este proyecto",
- "tr": "Bu proje",
- "uk": "Цей проєкт",
- "ca": "Aquest projecte",
- "id": "Proyek ini"
- },
- "CONVERSATION$OVERVIEW_SCOPE_ALL": {
- "en": "All",
- "ja": "すべて",
- "zh-CN": "全部",
- "zh-TW": "全部",
- "ko-KR": "전체",
- "no": "Alle",
- "ar": "الكل",
- "de": "Alle",
- "fr": "Tous",
- "it": "Tutti",
- "pt": "Todos",
- "es": "Todos",
- "tr": "Tümü",
- "uk": "Усі",
- "ca": "Tots",
- "id": "Semua"
- },
- "CONVERSATION$OVERVIEW_SCOPE_PROJECT_EMPTY_AUTOMATIONS": {
- "en": "No automations target this repository. Switch to All to see every automation.",
- "ja": "このリポジトリを対象とする自動化はありません。「すべて」に切り替えて全件を表示してください。",
- "zh-CN": "没有针对此仓库的自动化。切换到“全部”可查看所有自动化。",
- "zh-TW": "沒有以這個存放庫為目標的自動化。切換到「全部」可查看所有自動化。",
- "ko-KR": "이 저장소를 대상으로 하는 자동화가 없습니다. 전체를 보려면 전체로 전환하세요.",
- "no": "Ingen automatiseringer peker på dette repositoriet. Bytt til Alle for å se alle.",
- "ar": "لا توجد أتمتة تستهدف هذا المستودع. بدّل إلى الكل لعرض جميع الأتمتات.",
- "de": "Keine Automatisierungen zielen auf dieses Repository. Wechseln Sie zu Alle, um alle zu sehen.",
- "fr": "Aucune automatisation ne cible ce dépôt. Passez à Tous pour tout afficher.",
- "it": "Nessuna automazione punta a questo repository. Passa a Tutti per vederle tutte.",
- "pt": "Nenhuma automação aponta para este repositório. Mude para Todos para ver todas.",
- "es": "Ninguna automatización apunta a este repositorio. Cambia a Todos para verlas todas.",
- "tr": "Bu depoyu hedefleyen otomasyon yok. Tümünü görmek için Tümü'ne geçin.",
- "uk": "Немає автоматизацій для цього репозиторію. Перейдіть на Усі, щоб побачити всі.",
- "ca": "Cap automatització apunta a aquest repositori. Canvieu a Tots per veure-les totes.",
- "id": "Tidak ada otomatisasi yang menyasar repositori ini. Beralih ke Semua untuk melihat semua otomatisasi."
- },
- "CONVERSATION$OVERVIEW_SCOPE_PROJECT_EMPTY_SKILLS": {
- "en": "No project skills found for this workspace. Switch to All to see personal and public skills.",
- "ja": "このワークスペースのプロジェクトスキルはありません。「すべて」に切り替えて個人・公開スキルを表示してください。",
- "zh-CN": "此工作区没有项目技能。切换到“全部”可查看个人与公共技能。",
- "zh-TW": "此工作區沒有專案技能。切換到「全部」可查看個人與公開技能。",
- "ko-KR": "이 워크스페이스에 프로젝트 스킬이 없습니다. 개인 및 공개 스킬을 보려면 전체로 전환하세요.",
- "no": "Ingen prosjektferdigheter funnet for dette arbeidsområdet. Bytt til Alle for å se personlige og offentlige ferdigheter.",
- "ar": "لا توجد مهارات مشروع لمساحة العمل هذه. بدّل إلى الكل لعرض المهارات الشخصية والعامة.",
- "de": "Keine Projekt-Skills für diesen Workspace. Wechseln Sie zu Alle, um persönliche und öffentliche Skills zu sehen.",
- "fr": "Aucune compétence projet pour cet espace de travail. Passez à Tous pour voir les compétences personnelles et publiques.",
- "it": "Nessuna skill di progetto per questo workspace. Passa a Tutti per vedere quelle personali e pubbliche.",
- "pt": "Nenhuma skill de projeto neste workspace. Mude para Todos para ver skills pessoais e públicas.",
- "es": "No hay skills de proyecto en este workspace. Cambia a Todos para ver las personales y públicas.",
- "tr": "Bu çalışma alanı için proje skill'i yok. Kişisel ve genel skill'leri görmek için Tümü'ne geçin.",
- "uk": "У цьому робочому просторі немає проєктних skills. Перейдіть на Усі, щоб побачити особисті та публічні.",
- "ca": "No hi ha skills de projecte en aquest espai de treball. Canvieu a Tots per veure les personals i públiques.",
- "id": "Tidak ada skill proyek yang ditemukan untuk ruang kerja ini. Beralih ke Semua untuk melihat skill pribadi dan publik."
- },
"SETUP$REPOSITORY_COUNT": {
"en": "{{total}} repositories",
"ja": "{{total}} 個のリポジトリ",
diff --git a/src/utils/conversation-overview-project-scope.ts b/src/utils/conversation-overview-project-scope.ts
deleted file mode 100644
index 3478a4a27d..0000000000
--- a/src/utils/conversation-overview-project-scope.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { SkillInfo } from "#/types/settings";
-import {
- getSkillScope,
- SKILL_SCOPE_ORDER,
- type SkillScope,
-} from "#/utils/skill-scope";
-
-export const CONVERSATION_OVERVIEW_PROJECT_SCOPE = {
- project: "project",
- all: "all",
-} as const;
-
-export type ConversationOverviewProjectScope =
- (typeof CONVERSATION_OVERVIEW_PROJECT_SCOPE)[keyof typeof CONVERSATION_OVERVIEW_PROJECT_SCOPE];
-
-export function isSkillForProject(
- skill: SkillInfo,
- projectDir?: string | null,
-): boolean {
- return getSkillScope(skill, projectDir) === "project";
-}
-
-export function filterSkillsByProjectScope(
- skills: SkillInfo[],
- scope: ConversationOverviewProjectScope,
- projectDir?: string | null,
-): SkillInfo[] {
- if (scope === CONVERSATION_OVERVIEW_PROJECT_SCOPE.all) {
- return skills;
- }
- return skills.filter((skill) => isSkillForProject(skill, projectDir));
-}
-
-export function sortSkillsByProjectRelevance(
- skills: SkillInfo[],
- projectDir?: string | null,
-): SkillInfo[] {
- return [...skills].sort((left, right) => {
- const leftScope = getSkillScope(left, projectDir);
- const rightScope = getSkillScope(right, projectDir);
- const leftOrder = SKILL_SCOPE_ORDER.indexOf(leftScope as SkillScope);
- const rightOrder = SKILL_SCOPE_ORDER.indexOf(rightScope as SkillScope);
- if (leftOrder !== rightOrder) {
- return leftOrder - rightOrder;
- }
- return left.name.localeCompare(right.name);
- });
-}