🙌 OpenHands: AI-Driven Development
fix: render full YAML metadata on the Skills page with search & filters (#336)
Hiep Le7a03d234e94e
diff --git a/__tests__/routes/skills-settings.test.tsx b/__tests__/routes/skills-settings.test.tsxindex 41f6a92cd5..3083ad02d2 100644--- a/__tests__/routes/skills-settings.test.tsx+++ b/__tests__/routes/skills-settings.test.tsx@@ -1,11 +1,12 @@import { QueryClient, QueryClientProvider } from "@tanstack/react-query";-import { render, screen } from "@testing-library/react";+import { render, screen, within } from "@testing-library/react";+import userEvent from "@testing-library/user-event";import { beforeEach, describe, expect, it, vi } from "vitest";import SkillsSettingsScreen from "#/routes/skills-settings";import SettingsService from "#/api/settings-service/settings-service.api";import SkillsService from "#/api/skills-service";import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";-import { Settings } from "#/types/settings";+import { Settings, SkillInfo } from "#/types/settings";import { ActiveBackendProvider } from "#/contexts/active-backend-context";function buildSettings(overrides: Partial<Settings> = {}): Settings {@@ -19,6 +20,25 @@ function buildSettings(overrides: Partial<Settings> = {}): Settings {};}+function buildSkill(overrides: Partial<SkillInfo> = {}): SkillInfo {+ return {+ name: "deno",+ type: "knowledge",+ source: "/Users/test/.openhands/cache/skills/public-skills/skills/deno/SKILL.md",+ description:+ "If the project uses deno, use this skill to initialize Deno projects.",+ triggers: ["deno", "deno.json", "deno.lock"],+ version: "1.0.0",+ license: "Apache-2.0",+ compatibility: "Requires Deno 1.40+",+ metadata: null,+ allowed_tools: ["bash"],+ is_agentskills_format: true,+ disable_model_invocation: false,+ ...overrides,+ };+}+function renderSkillsSettingsScreen() {return render(<SkillsSettingsScreen />, {wrapper: ({ children }) => (@@ -38,10 +58,10 @@ function renderSkillsSettingsScreen() {describe("SkillsSettingsScreen", () => {beforeEach(() => {vi.restoreAllMocks();+ vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());});it("renders the description text inside the description badge", async () => {- vi.spyOn(SettingsService, "getSettings").mockResolvedValue(buildSettings());vi.spyOn(SkillsService, "getSkills").mockResolvedValue([]);renderSkillsSettingsScreen();@@ -51,4 +71,112 @@ describe("SkillsSettingsScreen", () => {);expect(badge).toHaveTextContent("SETTINGS$SKILLS_DESCRIPTION");});++ it("surfaces the YAML description and a friendly type label instead of the raw source path", async () => {+ // Arrange: a skill whose source is a long local filesystem path and whose+ // type is the internal "knowledge" identifier.+ const skill = buildSkill();+ vi.spyOn(SkillsService, "getSkills").mockResolvedValue([skill]);++ // Act+ renderSkillsSettingsScreen();+ const card = await screen.findByTestId(`skill-card-${skill.name}`);++ // Assert: description is the primary subtitle, the type is rendered as+ // its friendly label key, and the raw filesystem path is hidden until+ // the user opens the Details disclosure.+ expect(+ within(card).getByTestId(`skill-description-${skill.name}`),+ ).toHaveTextContent(skill.description!);+ expect(+ within(card).getByTestId("skill-type-badge-knowledge"),+ ).toHaveTextContent("SETTINGS$SKILLS_TYPE_KNOWLEDGE");+ expect(+ within(card).queryByTestId(`skill-source-${skill.name}`),+ ).not.toBeInTheDocument();+ });++ it("filters skills by name, description, or trigger via the search input", async () => {+ const user = userEvent.setup();+ vi.spyOn(SkillsService, "getSkills").mockResolvedValue([+ buildSkill({ name: "deno", description: "Deno runtime helper" }),+ buildSkill({+ name: "vercel",+ description: "Preview deployment helper",+ triggers: ["vercel", "preview deployment"],+ source: "/skills/vercel/SKILL.md",+ }),+ ]);++ renderSkillsSettingsScreen();+ await screen.findByTestId("skill-card-deno");++ await user.type(screen.getByTestId("skills-search-input"), "preview");++ expect(screen.queryByTestId("skill-card-deno")).not.toBeInTheDocument();+ expect(screen.getByTestId("skill-card-vercel")).toBeInTheDocument();+ });++ it("narrows the visible skills when a type filter chip is selected", async () => {+ const user = userEvent.setup();+ vi.spyOn(SkillsService, "getSkills").mockResolvedValue([+ buildSkill({ name: "deno", type: "knowledge" }),+ buildSkill({+ name: "global-rules",+ type: "repo",+ triggers: [],+ source: "/skills/global-rules.md",+ }),+ ]);++ renderSkillsSettingsScreen();+ await screen.findByTestId("skill-card-deno");++ await user.click(screen.getByTestId("skills-type-filter-repo"));++ expect(screen.queryByTestId("skill-card-deno")).not.toBeInTheDocument();+ expect(screen.getByTestId("skill-card-global-rules")).toBeInTheDocument();+ });++ it("reveals license, compatibility, allowed tools, and source path when Details is expanded", async () => {+ const user = userEvent.setup();+ const skill = buildSkill({+ name: "rich",+ license: "MIT",+ compatibility: "Requires Python 3.11+",+ allowed_tools: ["bash", "execute_bash"],+ source: "/skills/rich/SKILL.md",+ });+ vi.spyOn(SkillsService, "getSkills").mockResolvedValue([skill]);++ renderSkillsSettingsScreen();+ const card = await screen.findByTestId(`skill-card-${skill.name}`);++ await user.click(+ within(card).getByTestId(`skill-details-toggle-${skill.name}`),+ );++ const details = within(card).getByTestId(`skill-details-${skill.name}`);+ expect(details).toHaveTextContent("MIT");+ expect(details).toHaveTextContent("Requires Python 3.11+");+ expect(details).toHaveTextContent("execute_bash");+ expect(+ within(card).getByTestId(`skill-source-${skill.name}`),+ ).toHaveTextContent(skill.source!);+ });++ it("shows an empty-state message when no skills match the current filters", async () => {+ const user = userEvent.setup();+ vi.spyOn(SkillsService, "getSkills").mockResolvedValue([buildSkill()]);++ renderSkillsSettingsScreen();+ await screen.findByTestId("skill-card-deno");++ await user.type(+ screen.getByTestId("skills-search-input"),+ "no-such-skill-xyz",+ );++ expect(screen.getByTestId("skills-no-match")).toBeInTheDocument();+ });});diff --git a/src/api/conversation-service/agent-server-conversation-service.types.ts b/src/api/conversation-service/agent-server-conversation-service.types.tsindex 4e6991c7f4..86dd56fc16 100644--- a/src/api/conversation-service/agent-server-conversation-service.types.ts+++ b/src/api/conversation-service/agent-server-conversation-service.types.ts@@ -134,6 +134,15 @@ export interface Skill {type: "repo" | "knowledge" | "agentskills";content: string;triggers: string[];+ source?: string | null;+ description?: string | null;+ version?: string;+ license?: string | null;+ compatibility?: string | null;+ metadata?: Record<string, string> | null;+ allowed_tools?: string[] | null;+ is_agentskills_format?: boolean;+ disable_model_invocation?: boolean;}export interface GetSkillsResponse {diff --git a/src/components/features/skills/skill-card.tsx b/src/components/features/skills/skill-card.tsxnew file mode 100644index 0000000000..980b27e85e--- /dev/null+++ b/src/components/features/skills/skill-card.tsx@@ -0,0 +1,250 @@+import React from "react";+import { useTranslation } from "react-i18next";+import { SettingsSwitch } from "#/components/features/settings/settings-switch";+import { I18nKey } from "#/i18n/declaration";+import type { SkillInfo } from "#/types/settings";+import { cn } from "#/utils/utils";+import {+ displayErrorToast,+ displaySuccessToast,+} from "#/utils/custom-toast-handlers";+import ChevronDownIcon from "#/icons/chevron-down.svg?react";+import CopyIcon from "#/icons/copy.svg?react";+import { SkillTypeBadge } from "./skill-type-badge";++interface SkillCardProps {+ skill: SkillInfo;+ enabled: boolean;+ onToggle: (enabled: boolean) => void;+}++const DESCRIPTION_CLAMP_THRESHOLD = 220;++function hasExpandableMetadata(skill: SkillInfo): boolean {+ return Boolean(+ skill.source ||+ skill.license ||+ skill.compatibility ||+ (skill.allowed_tools && skill.allowed_tools.length > 0) ||+ (skill.metadata && Object.keys(skill.metadata).length > 0),+ );+}++export function SkillCard({ skill, enabled, onToggle }: SkillCardProps) {+ const { t } = useTranslation("openhands");+ const [showFullDescription, setShowFullDescription] = React.useState(false);+ const [detailsOpen, setDetailsOpen] = React.useState(false);++ const description = skill.description?.trim() || "";+ const isDescriptionClamped = description.length > DESCRIPTION_CLAMP_THRESHOLD;+ const showShowMoreButton = isDescriptionClamped;++ const handleCopySource = async () => {+ if (!skill.source) return;+ try {+ await navigator.clipboard.writeText(skill.source);+ displaySuccessToast(t(I18nKey.SETTINGS$SKILLS_COPIED));+ } catch {+ displayErrorToast(t(I18nKey.ERROR$GENERIC));+ }+ };++ const detailsAvailable = hasExpandableMetadata(skill);++ return (+ <article+ data-testid={`skill-card-${skill.name}`}+ className={cn(+ "flex flex-col gap-3 rounded-2xl border border-border bg-surface-card p-4 transition-colors hover:border-border-hover",+ !enabled && "opacity-70",+ )}+ >+ <header className="flex items-start justify-between gap-3">+ <div className="flex min-w-0 flex-1 items-start gap-3">+ <SettingsSwitch+ testId={`skill-toggle-${skill.name}`}+ isToggled={enabled}+ onToggle={onToggle}+ >+ <span+ data-testid={`skill-name-${skill.name}`}+ className="text-sm font-semibold text-white"+ >+ {skill.name}+ </span>+ </SettingsSwitch>+ </div>+ <div className="flex shrink-0 flex-wrap items-center justify-end gap-1.5">+ <SkillTypeBadge type={skill.type} />+ {skill.version && (+ <span+ data-testid={`skill-version-${skill.name}`}+ className="inline-flex items-center rounded-full border border-border px-2 py-0.5 text-[11px] font-medium text-content-muted"+ >+ {t(I18nKey.SETTINGS$SKILLS_VERSION, { version: skill.version })}+ </span>+ )}+ {skill.disable_model_invocation && (+ <span+ data-testid={`skill-disable-model-invocation-${skill.name}`}+ className="inline-flex items-center gap-1 rounded-full border border-[rgba(248,113,113,0.35)] bg-[rgba(248,113,113,0.12)] px-2 py-0.5 text-[11px] font-medium text-[#fca5a5]"+ >+ <span className="size-1.5 rounded-full bg-[#fca5a5]" />+ {t(I18nKey.SETTINGS$SKILLS_DISABLE_MODEL_INVOCATION)}+ </span>+ )}+ </div>+ </header>++ <div data-testid={`skill-description-${skill.name}`} className="text-sm">+ {description ? (+ <p+ className={cn(+ "whitespace-pre-wrap text-content-muted leading-5",+ !showFullDescription && isDescriptionClamped && "line-clamp-3",+ )}+ >+ {description}+ </p>+ ) : (+ <p className="italic text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_NO_DESCRIPTION)}+ </p>+ )}+ {showShowMoreButton && (+ <button+ type="button"+ onClick={() => setShowFullDescription((prev) => !prev)}+ data-testid={`skill-show-more-${skill.name}`}+ className="mt-1 text-xs font-medium text-primary hover:underline"+ >+ {showFullDescription+ ? t(I18nKey.SETTINGS$SKILLS_SHOW_LESS)+ : t(I18nKey.SETTINGS$SKILLS_SHOW_MORE)}+ </button>+ )}+ </div>++ {skill.triggers && skill.triggers.length > 0 && (+ <div+ data-testid={`skill-triggers-${skill.name}`}+ className="flex flex-wrap items-center gap-1.5"+ >+ {skill.triggers.map((trigger) => (+ <span+ key={trigger}+ className="inline-flex items-center rounded-md border border-border bg-[rgba(255,255,255,0.04)] px-1.5 py-0.5 font-mono text-[11px] text-content-muted"+ >+ {trigger}+ </span>+ ))}+ </div>+ )}++ {detailsAvailable && (+ <div className="border-t border-border pt-2">+ <button+ type="button"+ data-testid={`skill-details-toggle-${skill.name}`}+ aria-expanded={detailsOpen}+ onClick={() => setDetailsOpen((prev) => !prev)}+ className="flex w-full items-center justify-between text-xs font-medium text-content-muted hover:text-white"+ >+ <span>{t(I18nKey.SETTINGS$SKILLS_DETAILS)}</span>+ <ChevronDownIcon+ className={cn(+ "size-3.5 transition-transform",+ detailsOpen && "rotate-180",+ )}+ aria-hidden+ />+ </button>++ {detailsOpen && (+ <dl+ data-testid={`skill-details-${skill.name}`}+ className="mt-2 grid grid-cols-1 gap-2 text-xs sm:grid-cols-[max-content_1fr]"+ >+ {skill.source && (+ <>+ <dt className="text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_SOURCE)}+ </dt>+ <dd className="flex items-center gap-2 min-w-0">+ <code+ data-testid={`skill-source-${skill.name}`}+ className="block break-all rounded bg-[rgba(255,255,255,0.04)] px-1.5 py-0.5 font-mono text-[11px] text-white"+ >+ {skill.source}+ </code>+ <button+ type="button"+ onClick={handleCopySource}+ aria-label={t(I18nKey.SETTINGS$SKILLS_COPY_PATH)}+ data-testid={`skill-copy-source-${skill.name}`}+ className="shrink-0 rounded p-1 text-content-muted hover:bg-[rgba(255,255,255,0.06)] hover:text-white"+ >+ <CopyIcon className="size-3.5" />+ </button>+ </dd>+ </>+ )}+ {skill.license && (+ <>+ <dt className="text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_LICENSE)}+ </dt>+ <dd className="text-white">{skill.license}</dd>+ </>+ )}+ {skill.compatibility && (+ <>+ <dt className="text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_COMPATIBILITY)}+ </dt>+ <dd className="text-white">{skill.compatibility}</dd>+ </>+ )}+ {skill.allowed_tools && skill.allowed_tools.length > 0 && (+ <>+ <dt className="text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_ALLOWED_TOOLS)}+ </dt>+ <dd className="flex flex-wrap gap-1">+ {skill.allowed_tools.map((tool) => (+ <span+ key={tool}+ className="inline-flex items-center rounded-md border border-border px-1.5 py-0.5 font-mono text-[11px] text-content-muted"+ >+ {tool}+ </span>+ ))}+ </dd>+ </>+ )}+ {skill.metadata && Object.keys(skill.metadata).length > 0 && (+ <>+ <dt className="text-content-muted">+ {t(I18nKey.SETTINGS$SKILLS_METADATA)}+ </dt>+ <dd>+ <ul className="flex flex-col gap-0.5">+ {Object.entries(skill.metadata).map(([key, value]) => (+ <li key={key} className="flex gap-2">+ <span className="font-mono text-[11px] text-content-muted">+ {key}:+ </span>+ <span className="text-white">{value}</span>+ </li>+ ))}+ </ul>+ </dd>+ </>+ )}+ </dl>+ )}+ </div>+ )}+ </article>+ );+}diff --git a/src/components/features/skills/skill-type-badge.tsx b/src/components/features/skills/skill-type-badge.tsxnew file mode 100644index 0000000000..ccf5951a9b--- /dev/null+++ b/src/components/features/skills/skill-type-badge.tsx@@ -0,0 +1,57 @@+import { useTranslation } from "react-i18next";+import { I18nKey } from "#/i18n/declaration";+import type { SkillType } from "#/types/settings";+import { cn } from "#/utils/utils";+import SparkleIcon from "#/icons/sparkle.svg?react";+import KeyIcon from "#/icons/key.svg?react";+import CheckCircleIcon from "#/icons/u-check-circle.svg?react";++interface SkillTypeBadgeProps {+ type: SkillType;+}++const TYPE_CONFIG: Record<+ SkillType,+ {+ labelKey: I18nKey;+ Icon: React.ComponentType<React.SVGProps<SVGSVGElement>>;+ className: string;+ }+> = {+ agentskills: {+ labelKey: I18nKey.SETTINGS$SKILLS_TYPE_AGENTSKILLS,+ Icon: SparkleIcon,+ className:+ "bg-[rgba(247,206,109,0.12)] text-primary border border-[rgba(247,206,109,0.35)]",+ },+ knowledge: {+ labelKey: I18nKey.SETTINGS$SKILLS_TYPE_KNOWLEDGE,+ Icon: KeyIcon,+ className:+ "bg-[rgba(96,165,250,0.12)] text-[#93c5fd] border border-[rgba(96,165,250,0.35)]",+ },+ repo: {+ labelKey: I18nKey.SETTINGS$SKILLS_TYPE_REPO,+ Icon: CheckCircleIcon,+ className:+ "bg-[rgba(52,211,153,0.12)] text-[#6ee7b7] border border-[rgba(52,211,153,0.35)]",+ },+};++export function SkillTypeBadge({ type }: SkillTypeBadgeProps) {+ const { t } = useTranslation("openhands");+ const config = TYPE_CONFIG[type];+ const { Icon } = config;+ return (+ <span+ data-testid={`skill-type-badge-${type}`}+ className={cn(+ "inline-flex shrink-0 items-center gap-1 rounded-full px-2 py-0.5 text-[11px] font-medium leading-4",+ config.className,+ )}+ >+ <Icon className="size-3" />+ {t(config.labelKey)}+ </span>+ );+}diff --git a/src/components/features/skills/skill-type-filter.ts b/src/components/features/skills/skill-type-filter.tsnew file mode 100644index 0000000000..94e7998c4e--- /dev/null+++ b/src/components/features/skills/skill-type-filter.ts@@ -0,0 +1,10 @@+import type { SkillType } from "#/types/settings";++export type SkillTypeFilter = "all" | SkillType;++export const SKILL_TYPE_FILTER_OPTIONS: SkillTypeFilter[] = [+ "all",+ "agentskills",+ "knowledge",+ "repo",+];diff --git a/src/components/features/skills/skills-toolbar.tsx b/src/components/features/skills/skills-toolbar.tsxnew file mode 100644index 0000000000..5103ea6f5a--- /dev/null+++ b/src/components/features/skills/skills-toolbar.tsx@@ -0,0 +1,93 @@+import { useTranslation } from "react-i18next";+import { I18nKey } from "#/i18n/declaration";+import { cn } from "#/utils/utils";+import SearchIcon from "#/icons/search.svg?react";+import {+ SKILL_TYPE_FILTER_OPTIONS,+ type SkillTypeFilter,+} from "./skill-type-filter";++interface SkillsToolbarProps {+ search: string;+ onSearchChange: (value: string) => void;+ typeFilter: SkillTypeFilter;+ onTypeFilterChange: (filter: SkillTypeFilter) => void;+ shown: number;+ total: number;+}++const FILTER_LABEL_KEY: Record<SkillTypeFilter, I18nKey> = {+ all: I18nKey.SETTINGS$SKILLS_TYPE_ALL,+ agentskills: I18nKey.SETTINGS$SKILLS_TYPE_AGENTSKILLS,+ knowledge: I18nKey.SETTINGS$SKILLS_TYPE_KNOWLEDGE,+ repo: I18nKey.SETTINGS$SKILLS_TYPE_REPO,+};++export function SkillsToolbar({+ search,+ onSearchChange,+ typeFilter,+ onTypeFilterChange,+ shown,+ total,+}: SkillsToolbarProps) {+ const { t } = useTranslation("openhands");++ return (+ <div+ data-testid="skills-toolbar"+ className="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between mb-4"+ >+ <div className="relative flex-1 lg:max-w-md">+ <SearchIcon+ className="pointer-events-none absolute left-3 top-1/2 size-4 -translate-y-1/2 text-content-muted"+ aria-hidden+ />+ <input+ data-testid="skills-search-input"+ type="search"+ value={search}+ onChange={(event) => onSearchChange(event.target.value)}+ placeholder={t(I18nKey.SETTINGS$SKILLS_SEARCH_PLACEHOLDER)}+ aria-label={t(I18nKey.SETTINGS$SKILLS_SEARCH_PLACEHOLDER)}+ className="w-full rounded-full border border-border bg-[rgba(31,31,31,0.6)] py-1.5 pl-9 pr-3 text-sm text-white placeholder:text-content-muted focus:border-primary focus:outline-none"+ />+ </div>++ <div className="flex flex-wrap items-center gap-2">+ <div+ data-testid="skills-type-filter"+ className="flex flex-wrap items-center gap-1.5"+ >+ {SKILL_TYPE_FILTER_OPTIONS.map((option) => {+ const active = option === typeFilter;+ return (+ <button+ key={option}+ type="button"+ data-testid={`skills-type-filter-${option}`}+ aria-pressed={active}+ onClick={() => onTypeFilterChange(option)}+ className={cn(+ "rounded-full border px-3 py-1 text-xs font-medium transition-colors cursor-pointer",+ active+ ? "border-primary bg-primary/15 text-primary"+ : "border-border bg-transparent text-content-muted hover:border-border-hover hover:text-white",+ )}+ >+ {t(FILTER_LABEL_KEY[option])}+ </button>+ );+ })}+ </div>++ <span+ data-testid="skills-count"+ className="text-xs text-content-muted whitespace-nowrap pr-2"+ >+ {t(I18nKey.SETTINGS$SKILLS_COUNT, { shown, total })}+ </span>+ </div>+ </div>+ );+}diff --git a/src/i18n/translation.json b/src/i18n/translation.jsonindex b30b44c4d8..d4c084a6d2 100644--- a/src/i18n/translation.json+++ b/src/i18n/translation.json@@ -21521,6 +21521,346 @@"uk": "Тригери: {{triggers}}","ca": "Activadors: {{triggers}}"},+ "SETTINGS$SKILLS_SEARCH_PLACEHOLDER": {+ "en": "Search skills by name, description, or trigger",+ "ja": "名前、説明、トリガーでスキルを検索",+ "zh-CN": "按名称、描述或触发器搜索技能",+ "zh-TW": "依名稱、描述或觸發器搜尋技能",+ "ko-KR": "이름, 설명 또는 트리거로 스킬 검색",+ "no": "Søk etter ferdigheter etter navn, beskrivelse eller utløser",+ "ar": "ابحث في المهارات بالاسم أو الوصف أو المشغل",+ "de": "Fähigkeiten nach Name, Beschreibung oder Auslöser suchen",+ "fr": "Rechercher des compétences par nom, description ou déclencheur",+ "it": "Cerca competenze per nome, descrizione o trigger",+ "pt": "Pesquisar habilidades por nome, descrição ou gatilho",+ "es": "Buscar habilidades por nombre, descripción o disparador",+ "tr": "Yetenekleri ada, açıklamaya veya tetikleyiciye göre arayın",+ "uk": "Шукати навички за назвою, описом або тригером",+ "ca": "Cerca habilitats per nom, descripció o activador"+ },+ "SETTINGS$SKILLS_TYPE_ALL": {+ "en": "All",+ "ja": "すべて",+ "zh-CN": "全部",+ "zh-TW": "全部",+ "ko-KR": "전체",+ "no": "Alle",+ "ar": "الكل",+ "de": "Alle",+ "fr": "Tout",+ "it": "Tutti",+ "pt": "Todos",+ "es": "Todos",+ "tr": "Tümü",+ "uk": "Усі",+ "ca": "Tot"+ },+ "SETTINGS$SKILLS_TYPE_AGENTSKILLS": {+ "en": "Auto-discovery",+ "ja": "自動検出",+ "zh-CN": "自动发现",+ "zh-TW": "自動探索",+ "ko-KR": "자동 검색",+ "no": "Automatisk oppdaging",+ "ar": "اكتشاف تلقائي",+ "de": "Automatische Erkennung",+ "fr": "Auto-découverte",+ "it": "Rilevamento automatico",+ "pt": "Descoberta automática",+ "es": "Descubrimiento automático",+ "tr": "Otomatik keşif",+ "uk": "Автовиявлення",+ "ca": "Descoberta automàtica"+ },+ "SETTINGS$SKILLS_TYPE_KNOWLEDGE": {+ "en": "Trigger-based",+ "ja": "トリガーベース",+ "zh-CN": "基于触发",+ "zh-TW": "基於觸發",+ "ko-KR": "트리거 기반",+ "no": "Utløserbasert",+ "ar": "قائم على المشغل",+ "de": "Auslösergesteuert",+ "fr": "Basé sur déclencheurs",+ "it": "Basato su trigger",+ "pt": "Baseado em gatilhos",+ "es": "Basado en disparadores",+ "tr": "Tetikleyici tabanlı",+ "uk": "На основі тригерів",+ "ca": "Basat en activadors"+ },+ "SETTINGS$SKILLS_TYPE_REPO": {+ "en": "Always active",+ "ja": "常時有効",+ "zh-CN": "始终激活",+ "zh-TW": "永遠啟用",+ "ko-KR": "항상 활성",+ "no": "Alltid aktiv",+ "ar": "نشط دائمًا",+ "de": "Immer aktiv",+ "fr": "Toujours actif",+ "it": "Sempre attivo",+ "pt": "Sempre ativo",+ "es": "Siempre activo",+ "tr": "Her zaman etkin",+ "uk": "Завжди активний",+ "ca": "Sempre actiu"+ },+ "SETTINGS$SKILLS_VERSION": {+ "en": "v{{version}}",+ "ja": "v{{version}}",+ "zh-CN": "v{{version}}",+ "zh-TW": "v{{version}}",+ "ko-KR": "v{{version}}",+ "no": "v{{version}}",+ "ar": "v{{version}}",+ "de": "v{{version}}",+ "fr": "v{{version}}",+ "it": "v{{version}}",+ "pt": "v{{version}}",+ "es": "v{{version}}",+ "tr": "v{{version}}",+ "uk": "v{{version}}",+ "ca": "v{{version}}"+ },+ "SETTINGS$SKILLS_LICENSE": {+ "en": "License",+ "ja": "ライセンス",+ "zh-CN": "许可证",+ "zh-TW": "授權條款",+ "ko-KR": "라이선스",+ "no": "Lisens",+ "ar": "الترخيص",+ "de": "Lizenz",+ "fr": "Licence",+ "it": "Licenza",+ "pt": "Licença",+ "es": "Licencia",+ "tr": "Lisans",+ "uk": "Ліцензія",+ "ca": "Llicència"+ },+ "SETTINGS$SKILLS_COMPATIBILITY": {+ "en": "Compatibility",+ "ja": "互換性",+ "zh-CN": "兼容性",+ "zh-TW": "相容性",+ "ko-KR": "호환성",+ "no": "Kompatibilitet",+ "ar": "التوافق",+ "de": "Kompatibilität",+ "fr": "Compatibilité",+ "it": "Compatibilità",+ "pt": "Compatibilidade",+ "es": "Compatibilidad",+ "tr": "Uyumluluk",+ "uk": "Сумісність",+ "ca": "Compatibilitat"+ },+ "SETTINGS$SKILLS_ALLOWED_TOOLS": {+ "en": "Allowed tools",+ "ja": "許可されたツール",+ "zh-CN": "允许的工具",+ "zh-TW": "允許的工具",+ "ko-KR": "허용된 도구",+ "no": "Tillatte verktøy",+ "ar": "الأدوات المسموح بها",+ "de": "Erlaubte Tools",+ "fr": "Outils autorisés",+ "it": "Strumenti consentiti",+ "pt": "Ferramentas permitidas",+ "es": "Herramientas permitidas",+ "tr": "İzin verilen araçlar",+ "uk": "Дозволені інструменти",+ "ca": "Eines permeses"+ },+ "SETTINGS$SKILLS_SOURCE": {+ "en": "Source",+ "ja": "ソース",+ "zh-CN": "来源",+ "zh-TW": "來源",+ "ko-KR": "출처",+ "no": "Kilde",+ "ar": "المصدر",+ "de": "Quelle",+ "fr": "Source",+ "it": "Origine",+ "pt": "Origem",+ "es": "Origen",+ "tr": "Kaynak",+ "uk": "Джерело",+ "ca": "Origen"+ },+ "SETTINGS$SKILLS_METADATA": {+ "en": "Metadata",+ "ja": "メタデータ",+ "zh-CN": "元数据",+ "zh-TW": "中繼資料",+ "ko-KR": "메타데이터",+ "no": "Metadata",+ "ar": "البيانات الوصفية",+ "de": "Metadaten",+ "fr": "Métadonnées",+ "it": "Metadati",+ "pt": "Metadados",+ "es": "Metadatos",+ "tr": "Üst veri",+ "uk": "Метадані",+ "ca": "Metadades"+ },+ "SETTINGS$SKILLS_SHOW_MORE": {+ "en": "Show more",+ "ja": "もっと見る",+ "zh-CN": "显示更多",+ "zh-TW": "顯示更多",+ "ko-KR": "더 보기",+ "no": "Vis mer",+ "ar": "عرض المزيد",+ "de": "Mehr anzeigen",+ "fr": "Voir plus",+ "it": "Mostra di più",+ "pt": "Mostrar mais",+ "es": "Mostrar más",+ "tr": "Daha fazla göster",+ "uk": "Показати більше",+ "ca": "Mostra més"+ },+ "SETTINGS$SKILLS_SHOW_LESS": {+ "en": "Show less",+ "ja": "折りたたむ",+ "zh-CN": "显示更少",+ "zh-TW": "顯示較少",+ "ko-KR": "간단히 보기",+ "no": "Vis mindre",+ "ar": "عرض أقل",+ "de": "Weniger anzeigen",+ "fr": "Voir moins",+ "it": "Mostra meno",+ "pt": "Mostrar menos",+ "es": "Mostrar menos",+ "tr": "Daha az göster",+ "uk": "Показати менше",+ "ca": "Mostra menys"+ },+ "SETTINGS$SKILLS_DETAILS": {+ "en": "Details",+ "ja": "詳細",+ "zh-CN": "详细信息",+ "zh-TW": "詳細資訊",+ "ko-KR": "세부 정보",+ "no": "Detaljer",+ "ar": "التفاصيل",+ "de": "Details",+ "fr": "Détails",+ "it": "Dettagli",+ "pt": "Detalhes",+ "es": "Detalles",+ "tr": "Ayrıntılar",+ "uk": "Деталі",+ "ca": "Detalls"+ },+ "SETTINGS$SKILLS_NO_MATCH": {+ "en": "No skills match your search.",+ "ja": "検索に一致するスキルがありません。",+ "zh-CN": "没有匹配您搜索的技能。",+ "zh-TW": "沒有符合搜尋的技能。",+ "ko-KR": "검색과 일치하는 스킬이 없습니다.",+ "no": "Ingen ferdigheter samsvarer med søket ditt.",+ "ar": "لا توجد مهارات تطابق بحثك.",+ "de": "Keine Fähigkeiten stimmen mit Ihrer Suche überein.",+ "fr": "Aucune compétence ne correspond à votre recherche.",+ "it": "Nessuna competenza corrisponde alla tua ricerca.",+ "pt": "Nenhuma habilidade corresponde à sua pesquisa.",+ "es": "Ninguna habilidad coincide con tu búsqueda.",+ "tr": "Aramanızla eşleşen yetenek yok.",+ "uk": "Жодна навичка не відповідає вашому пошуку.",+ "ca": "Cap habilitat coincideix amb la cerca."+ },+ "SETTINGS$SKILLS_COUNT": {+ "en": "Showing {{shown}} of {{total}}",+ "ja": "{{total}}件中{{shown}}件を表示",+ "zh-CN": "显示 {{total}} 项中的 {{shown}} 项",+ "zh-TW": "顯示 {{total}} 項中的 {{shown}} 項",+ "ko-KR": "{{total}}개 중 {{shown}}개 표시",+ "no": "Viser {{shown}} av {{total}}",+ "ar": "عرض {{shown}} من {{total}}",+ "de": "Zeige {{shown}} von {{total}}",+ "fr": "Affichage de {{shown}} sur {{total}}",+ "it": "Mostrando {{shown}} di {{total}}",+ "pt": "Mostrando {{shown}} de {{total}}",+ "es": "Mostrando {{shown}} de {{total}}",+ "tr": "{{total}} öğeden {{shown}} tanesi gösteriliyor",+ "uk": "Показано {{shown}} з {{total}}",+ "ca": "Mostrant {{shown}} de {{total}}"+ },+ "SETTINGS$SKILLS_NO_DESCRIPTION": {+ "en": "No description provided.",+ "ja": "説明はありません。",+ "zh-CN": "未提供描述。",+ "zh-TW": "未提供描述。",+ "ko-KR": "설명이 제공되지 않았습니다.",+ "no": "Ingen beskrivelse oppgitt.",+ "ar": "لا يوجد وصف.",+ "de": "Keine Beschreibung angegeben.",+ "fr": "Aucune description fournie.",+ "it": "Nessuna descrizione fornita.",+ "pt": "Nenhuma descrição fornecida.",+ "es": "No se proporcionó descripción.",+ "tr": "Açıklama sağlanmadı.",+ "uk": "Опис не надано.",+ "ca": "No s'ha proporcionat cap descripció."+ },+ "SETTINGS$SKILLS_DISABLE_MODEL_INVOCATION": {+ "en": "Model invocation off",+ "ja": "モデル呼び出しオフ",+ "zh-CN": "已关闭模型调用",+ "zh-TW": "已關閉模型呼叫",+ "ko-KR": "모델 호출 꺼짐",+ "no": "Modellanrop av",+ "ar": "استدعاء النموذج معطل",+ "de": "Modellaufruf aus",+ "fr": "Invocation modèle désactivée",+ "it": "Invocazione modello disattivata",+ "pt": "Invocação de modelo desativada",+ "es": "Invocación del modelo desactivada",+ "tr": "Model çağrısı kapalı",+ "uk": "Виклик моделі вимкнено",+ "ca": "Invocació del model desactivada"+ },+ "SETTINGS$SKILLS_COPY_PATH": {+ "en": "Copy source path",+ "ja": "ソースパスをコピー",+ "zh-CN": "复制源路径",+ "zh-TW": "複製來源路徑",+ "ko-KR": "원본 경로 복사",+ "no": "Kopier kildebane",+ "ar": "نسخ مسار المصدر",+ "de": "Quellpfad kopieren",+ "fr": "Copier le chemin source",+ "it": "Copia percorso origine",+ "pt": "Copiar caminho de origem",+ "es": "Copiar ruta de origen",+ "tr": "Kaynak yolunu kopyala",+ "uk": "Копіювати шлях джерела",+ "ca": "Copia el camí d'origen"+ },+ "SETTINGS$SKILLS_COPIED": {+ "en": "Path copied",+ "ja": "パスをコピーしました",+ "zh-CN": "已复制路径",+ "zh-TW": "已複製路徑",+ "ko-KR": "경로가 복사됨",+ "no": "Bane kopiert",+ "ar": "تم نسخ المسار",+ "de": "Pfad kopiert",+ "fr": "Chemin copié",+ "it": "Percorso copiato",+ "pt": "Caminho copiado",+ "es": "Ruta copiada",+ "tr": "Yol kopyalandı",+ "uk": "Шлях скопійовано",+ "ca": "Camí copiat"+ },"HOOKS_MODAL$TITLE": {"en": "Available Hooks","ja": "利用可能なフック",diff --git a/src/routes/skills-settings.tsx b/src/routes/skills-settings.tsxindex 4b77ce2ebe..b96bc44274 100644--- a/src/routes/skills-settings.tsx+++ b/src/routes/skills-settings.tsx@@ -4,7 +4,9 @@ import { useSaveSettings } from "#/hooks/mutation/use-save-settings";import { useSettings } from "#/hooks/query/use-settings";import { useSkills } from "#/hooks/query/use-skills";import { BrandButton } from "#/components/features/settings/brand-button";-import { SettingsSwitch } from "#/components/features/settings/settings-switch";+import { SkillCard } from "#/components/features/skills/skill-card";+import { SkillsToolbar } from "#/components/features/skills/skills-toolbar";+import type { SkillTypeFilter } from "#/components/features/skills/skill-type-filter";import { I18nKey } from "#/i18n/declaration";import { Typography } from "#/ui/typography";import InfoCircleIcon from "#/icons/info-circle.svg?react";@@ -13,6 +15,21 @@ import {displaySuccessToast,} from "#/utils/custom-toast-handlers";import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";+import type { SkillInfo } from "#/types/settings";++function matchesSearch(skill: SkillInfo, query: string): boolean {+ if (!query) return true;+ const haystacks = [+ skill.name,+ skill.description ?? "",+ skill.license ?? "",+ skill.compatibility ?? "",+ ...(skill.triggers ?? []),+ ...(skill.allowed_tools ?? []),+ ];+ const lowered = query.toLowerCase();+ return haystacks.some((value) => value.toLowerCase().includes(lowered));+}function SkillsSettingsScreen() {const { t } = useTranslation("openhands");@@ -21,11 +38,11 @@ function SkillsSettingsScreen() {const { data: settings, isLoading: settingsLoading } = useSettings();const { data: skills, isLoading: skillsLoading } = useSkills();- // Local state: set of skill names the user has toggled offconst [disabledSet, setDisabledSet] = React.useState<Set<string>>(new Set());const [hasChanges, setHasChanges] = React.useState(false);+ const [searchQuery, setSearchQuery] = React.useState("");+ const [typeFilter, setTypeFilter] = React.useState<SkillTypeFilter>("all");- // Sync local state with server settings when data first arrivesReact.useEffect(() => {if (settings?.disabled_skills) {setDisabledSet(new Set(settings.disabled_skills));@@ -63,6 +80,23 @@ function SkillsSettingsScreen() {const isLoading = settingsLoading || skillsLoading || !settings;+ const sortedSkills = React.useMemo(() => {+ if (!skills) return [];+ return [...skills].sort((a, b) => a.name.localeCompare(b.name));+ }, [skills]);++ const filteredSkills = React.useMemo(+ () =>+ sortedSkills.filter((skill) => {+ const typeMatch = typeFilter === "all" || skill.type === typeFilter;+ return typeMatch && matchesSearch(skill, searchQuery.trim());+ }),+ [sortedSkills, searchQuery, typeFilter],+ );++ const totalSkills = sortedSkills.length;+ const shownSkills = filteredSkills.length;+return (<div data-testid="skills-settings-screen" className="flex flex-col h-full"><div@@ -77,47 +111,53 @@ function SkillsSettingsScreen() {<div className="flex-1 overflow-auto custom-scrollbar-always">{isLoading && (- <div className="flex flex-col gap-4">- {[1, 2, 3].map((i) => (+ <div className="grid grid-cols-1 gap-3 lg:grid-cols-2">+ {[1, 2, 3, 4].map((i) => (<divkey={i}- className="h-8 w-64 rounded bg-tertiary animate-pulse"+ className="h-32 rounded-2xl border border-border bg-surface-card animate-pulse"/>))}</div>)}- {!isLoading && (!skills || skills.length === 0) && (- <p className="text-sm text-tertiary">+ {!isLoading && totalSkills === 0 && (+ <p className="text-sm text-content-muted">{t(I18nKey.SETTINGS$SKILLS_NO_SKILLS)}</p>)}- {!isLoading && skills && skills.length > 0 && (- <div className="flex flex-col gap-4">- {skills.map((skill) => (- <div key={skill.name} className="flex flex-col gap-0.5">- <SettingsSwitch- testId={`skill-toggle-${skill.name}`}- isToggled={!disabledSet.has(skill.name)}- onToggle={(enabled) => handleToggle(skill.name, enabled)}- >- {skill.name}- </SettingsSwitch>- {skill.triggers && skill.triggers.length > 0 && (- <span className="text-xs text-neutral-500 ml-14">- {t(I18nKey.SETTINGS$SKILLS_TRIGGERS, {- triggers: skill.triggers.join(", "),- interpolation: { escapeValue: false },- })}- </span>- )}- <span className="text-xs text-neutral-500 ml-14">- {skill.source} / {skill.type}- </span>+ {!isLoading && totalSkills > 0 && (+ <>+ <SkillsToolbar+ search={searchQuery}+ onSearchChange={setSearchQuery}+ typeFilter={typeFilter}+ onTypeFilterChange={setTypeFilter}+ shown={shownSkills}+ total={totalSkills}+ />++ {shownSkills === 0 ? (+ <p+ data-testid="skills-no-match"+ className="text-sm text-content-muted"+ >+ {t(I18nKey.SETTINGS$SKILLS_NO_MATCH)}+ </p>+ ) : (+ <div className="grid grid-cols-1 gap-3 lg:grid-cols-2">+ {filteredSkills.map((skill) => (+ <SkillCard+ key={skill.name}+ skill={skill}+ enabled={!disabledSet.has(skill.name)}+ onToggle={(enabled) => handleToggle(skill.name, enabled)}+ />+ ))}</div>- ))}- </div>+ )}+ </>)}</div>diff --git a/src/types/settings.ts b/src/types/settings.tsindex 2b256221c6..cdaf3b1ac0 100644--- a/src/types/settings.ts+++ b/src/types/settings.ts@@ -89,11 +89,21 @@ export type SettingsSchema = {sections: SettingsSectionSchema[];};+export type SkillType = "repo" | "knowledge" | "agentskills";+export type SkillInfo = {name: string;- type: string;- source: string;+ type: SkillType;+ source: string | null;+ description?: string | null;triggers?: string[];+ version?: string;+ license?: string | null;+ compatibility?: string | null;+ metadata?: Record<string, string> | null;+ allowed_tools?: string[] | null;+ is_agentskills_format?: boolean;+ disable_model_invocation?: boolean;};export type SettingsScope = "personal";