Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

Plugins settings: one list with Installed badge, inline switch, install-state filter, category chips and trusted-code access copy (#36100)

Neila892fca5a126
diff --git a/docs/reference/plugin-manifest.md b/docs/reference/plugin-manifest.md
index d7f27feb087..6b62f7414f4 100644
--- a/docs/reference/plugin-manifest.md
+++ b/docs/reference/plugin-manifest.md
@@ -67,7 +67,7 @@ A sidebar panel. Requires the `sandboxed-ui` execution profile or higher.
| `id` | string | yes | 1.4.160 | Panel id, unique among this plugin's panels. The reserved names `constructor` and `prototype` are refused. Example: `"dashboard"` |
| `title` | string | yes | 1.4.160 | Title shown on the panel tab and its tooltip. Example: `"Dashboard"` |
| `icon` | `"activity"` \| `"bar-chart-3"` \| `"bell"` \| `"blocks"` \| `"book"` \| `"bot"` \| `"bug"` \| `"calendar"` \| `"cloud"` \| `"code"` \| `"database"` \| `"file-text"` \| `"flag"` \| `"folder"` \| `"gauge"` \| `"globe"` \| `"hammer"` \| `"layers"` \| `"lightbulb"` \| `"package"` \| `"plug"` \| `"puzzle"` \| `"rocket"` \| `"star"` \| `"terminal"` \| `"wrench"` \| `"zap"` | no | 1.4.160 | Icon shown in the right-sidebar activity bar. Defaults to `plug`. Example: `"database"` |
-| `entry` | string | yes | 1.4.160 | HTML file, relative to the plugin root, rendered inside a sandboxed panel frame. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused. Example: `"dist/panel.html"` |
+| `entry` | string | yes | 1.4.160 | HTML file, relative to the plugin root, rendered inside a panel frame. It is trusted code: install panels you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused. Example: `"dist/panel.html"` |
## CommandContribution
@@ -151,7 +151,7 @@ An editor for the listed files, shown in the editor tab beside Source. It must l
| `icon` | string | no | 1.4.245 | Square image shown on the tab of a file this editor opens. Defaults to the plugin icon. PNG, WEBP, static, at least 128×128, square, at most 256 KB. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused. Example: `"images/editor-icon.png"` |
| `extensions` | string[] | no | 1.4.245 | File-name suffixes, with the dot, this editor opens, ignoring case. A longer suffix such as `.excalidraw.json` wins over a shorter one, and a file named only the suffix never matches. At most 32. Example: `[".excalidraw",".excalidraw.json"]` |
| `filenames` | string[] | no | 1.4.245 | Exact file names this editor opens, ignoring case; a name beats any extension. Names must be portable: no path separators, `.`, `..` or characters Windows forbids. At most 32. Example: `[]` |
-| `entry` | string | yes | 1.4.245 | HTML file rendered inside a sandboxed editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused. Example: `"editor/index.html"` |
+| `entry` | string | yes | 1.4.245 | HTML file rendered inside an editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused. Example: `"editor/index.html"` |
| `priority` | `"default"` \| `"option"` | no | 1.4.245 | `default` (the default) opens matching files in this editor; `option` only offers it in the view toggle, so files open in Source. Files Orca opens itself (such as `.json`, `.ts`, `.md`, `.csv`, `.yaml`, lockfiles and `.env` files) always behave as `option`. Example: `"default"` |
| `contentKind` | `"text"` \| `"bytes"` | no | 1.4.245 | `text` (the default) sends the file as text and accepts full-text edits. `bytes` sends the file's raw bytes, for binary formats such as spreadsheets, and accepts full-byte edits. Example: `"bytes"` |
diff --git a/docs/schemas/plugins/orca-plugin.v2.schema.json b/docs/schemas/plugins/orca-plugin.v2.schema.json
index 01e3392d8ef..69576d0a84e 100644
--- a/docs/schemas/plugins/orca-plugin.v2.schema.json
+++ b/docs/schemas/plugins/orca-plugin.v2.schema.json
@@ -505,7 +505,7 @@
"minLength": 1,
"maxLength": 1024,
"pattern": "^[^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ](?:[\\\\/][^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ])*$",
- "description": "HTML file, relative to the plugin root, rendered inside a sandboxed panel frame. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
+ "description": "HTML file, relative to the plugin root, rendered inside a panel frame. It is trusted code: install panels you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
"x-orca-since": "1.4.160",
"examples": [
"dist/panel.html"
@@ -958,7 +958,7 @@
"minLength": 1,
"maxLength": 1024,
"pattern": "^[^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ](?:[\\\\/][^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ])*$",
- "description": "HTML file rendered inside a sandboxed editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
+ "description": "HTML file rendered inside an editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
"x-orca-since": "1.4.245",
"examples": [
"editor/index.html"
diff --git a/examples/plugins/hello-orca/orca-plugin.json b/examples/plugins/hello-orca/orca-plugin.json
index 6d2a0c01f0f..c526ad68c6d 100644
--- a/examples/plugins/hello-orca/orca-plugin.json
+++ b/examples/plugins/hello-orca/orca-plugin.json
@@ -5,7 +5,7 @@
"publisher": "your-github-user",
"name": "Hello Orca",
"version": "1.0.0",
- "description": "Sample plugin combining a sandboxed panel, a worker command, and event subscriptions.",
+ "description": "Sample plugin combining a panel, a worker command, and event subscriptions.",
"engines": { "orca": ">=1.4.245" },
"pluginApi": 1,
"main": "main.mjs",
diff --git a/examples/plugins/orca-gleam-syntax/orca-plugin.v2.schema.json b/examples/plugins/orca-gleam-syntax/orca-plugin.v2.schema.json
index 01e3392d8ef..69576d0a84e 100644
--- a/examples/plugins/orca-gleam-syntax/orca-plugin.v2.schema.json
+++ b/examples/plugins/orca-gleam-syntax/orca-plugin.v2.schema.json
@@ -505,7 +505,7 @@
"minLength": 1,
"maxLength": 1024,
"pattern": "^[^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ](?:[\\\\/][^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ])*$",
- "description": "HTML file, relative to the plugin root, rendered inside a sandboxed panel frame. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
+ "description": "HTML file, relative to the plugin root, rendered inside a panel frame. It is trusted code: install panels you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
"x-orca-since": "1.4.160",
"examples": [
"dist/panel.html"
@@ -958,7 +958,7 @@
"minLength": 1,
"maxLength": 1024,
"pattern": "^[^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ](?:[\\\\/][^<>:\"|?*\\x00-\\x1f\\\\/]*[^<>:\"|?*\\x00-\\x1f\\\\/. ])*$",
- "description": "HTML file rendered inside a sandboxed editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
+ "description": "HTML file rendered inside an editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust. Relative to the plugin root; `..` segments and Windows device names such as `CON` are refused.",
"x-orca-since": "1.4.245",
"examples": [
"editor/index.html"
diff --git a/src/renderer/src/components/plugins/catalog/InstalledPluginCarousel.tsx b/src/renderer/src/components/plugins/catalog/InstalledPluginCarousel.tsx
deleted file mode 100644
index d55c22fd45c..00000000000
--- a/src/renderer/src/components/plugins/catalog/InstalledPluginCarousel.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { useEffect, useId, useRef, useState } from 'react'
-import { ArrowRight, ChevronLeft, ChevronRight } from 'lucide-react'
-import { translate } from '@/i18n/i18n'
-import { Button } from '../../ui/button'
-import type { PluginListEntry } from '../list/plugin-list-entries'
-import { CatalogCard, type CatalogCardHandlers } from './PluginCatalogGroups'
-
-// Why: the catalog grid's column breakpoints (PluginListGroup), as container widths.
-const COLUMN_BREAKPOINTS = [460, 720, 1056]
-
-/** The All tab's top row: every installed plugin as its card, scrolled a page at a time. */
-export function InstalledPluginCarousel({
- entries,
- handlers,
- onSeeAll
-}: {
- entries: readonly PluginListEntry[]
- handlers: CatalogCardHandlers
- onSeeAll: () => void
-}): React.JSX.Element | null {
- const headingId = useId()
- const listRef = useRef<HTMLUListElement>(null)
- const [edges, setEdges] = useState({ start: true, end: true })
- const [columns, setColumns] = useState(1)
- const measure = (): void => {
- const list = listRef.current
- if (list) {
- // Why 1px slack: fractional card widths leave the end a subpixel short.
- setEdges({
- start: list.scrollLeft <= 1,
- end: list.scrollLeft + list.clientWidth >= list.scrollWidth - 1
- })
- setColumns(1 + COLUMN_BREAKPOINTS.filter((width) => list.clientWidth >= width).length)
- }
- }
- useEffect(() => {
- const list = listRef.current
- if (!list) {
- return
- }
- const observer = new ResizeObserver(measure)
- observer.observe(list)
- return () => observer.disconnect()
- // Why columns: toggling the peek resizes the cards, not the list, so the edges need a re-measure.
- }, [entries.length, columns])
- if (entries.length === 0) {
- return null
- }
- // Why by card pitch: a page of whole cards keeps the next one on its snap point.
- const page = (direction: 1 | -1): void => {
- const list = listRef.current
- const [first, second] = list ? Array.from(list.children) : []
- if (!list || !(first instanceof HTMLElement)) {
- return
- }
- const pitch =
- second instanceof HTMLElement ? second.offsetLeft - first.offsetLeft : first.offsetWidth
- const perPage = Math.max(1, Math.round(list.clientWidth / pitch))
- list.scrollBy({ left: direction * pitch * perPage })
- }
- return (
- <section data-installed-carousel="" aria-labelledby={headingId}>
- <div className="flex items-center gap-2 px-0.5 pb-2.5">
- <h3
- id={headingId}
- className="text-2xs font-semibold tracking-[0.05em] text-muted-foreground uppercase"
- >
- {translate('auto.components.settings.InstalledPluginCarousel.heading', 'Installed')}
- </h3>
- <Button variant="outline" size="xs" onClick={onSeeAll}>
- {translate(
- 'auto.components.settings.InstalledPluginCarousel.seeAllCount',
- 'See all {{value0}}',
- { value0: entries.length }
- )}
- <ArrowRight />
- </Button>
- {edges.start && edges.end ? null : (
- <div className="ml-auto flex items-center gap-1">
- <Button
- variant="outline"
- size="icon-xs"
- disabled={edges.start}
- aria-label={translate(
- 'auto.components.settings.InstalledPluginCarousel.previous',
- 'Previous installed plugins'
- )}
- onClick={() => page(-1)}
- >
- <ChevronLeft />
- </Button>
- <Button
- variant="outline"
- size="icon-xs"
- disabled={edges.end}
- aria-label={translate(
- 'auto.components.settings.InstalledPluginCarousel.next',
- 'Next installed plugins'
- )}
- onClick={() => page(1)}
- >
- <ChevronRight />
- </Button>
- </div>
- )}
- </div>
- {/* Why the cards' widths: the catalog grid's columns, less a peek of the next card when more follow. Why no scrollbar: the arrows page it; wheel, trackpad and focus still scroll. */}
- <ul
- ref={listRef}
- onScroll={measure}
- data-peek={entries.length > columns}
- className="flex snap-x snap-mandatory scroll-px-0.5 gap-4 overflow-x-auto p-0.5 scrollbar-none [--peek-gap:0px] [--peek:0] motion-safe:scroll-smooth data-[peek=true]:[--peek-gap:1rem] data-[peek=true]:[--peek:0.2] *:shrink-0 *:basis-[calc((100%-var(--peek-gap))/(1+var(--peek)))] *:snap-start @min-[460px]/plugin-catalog:*:basis-[calc((100%-1rem-var(--peek-gap))/(2+var(--peek)))] @min-[720px]/plugin-catalog:*:basis-[calc((100%-2rem-var(--peek-gap))/(3+var(--peek)))] @min-[1056px]/plugin-catalog:*:basis-[calc((100%-3rem-var(--peek-gap))/(4+var(--peek)))]"
- >
- {entries.map((entry) => (
- <CatalogCard key={entry.pluginKey} entry={entry} handlers={handlers} />
- ))}
- </ul>
- </section>
- )
-}
diff --git a/src/renderer/src/components/plugins/catalog/PluginCardAction.tsx b/src/renderer/src/components/plugins/catalog/PluginCardAction.tsx
index 2384c6e4b14..4e93d922562 100644
--- a/src/renderer/src/components/plugins/catalog/PluginCardAction.tsx
+++ b/src/renderer/src/components/plugins/catalog/PluginCardAction.tsx
@@ -1,4 +1,4 @@
-import { Check, Loader2 } from 'lucide-react'
+import { Loader2 } from 'lucide-react'
import { translate } from '@/i18n/i18n'
import { Button } from '../../ui/button'
import { StatusWord } from '../list/PluginStatusWord'
@@ -49,25 +49,25 @@ export function PluginCardAction({
const controls = installedPluginControls(installed, entry, {
busy,
canCheckUpdate: entry.updatable,
- handlers: installedHandlers,
- toggleInMenu: true
+ handlers: installedHandlers
})
+ const switchable =
+ controls.kind !== 'review' && controls.kind !== 'invalid' && controls.kind !== 'blocked'
const healthy = controls.kind === 'enabled' || controls.kind === 'running'
+ // Why no word for on/off: the switch beside it already says it.
const status =
controls.action ??
- (!healthy ? (
+ (healthy ? (
+ inUse ? (
+ <PluginInUseAction pluginKey={entry.pluginKey} name={entry.name} inUse={inUse} />
+ ) : null
+ ) : controls.kind === 'disabled' ? null : (
controls.status
- ) : inUse ? (
- <PluginInUseAction pluginKey={entry.pluginKey} name={entry.name} inUse={inUse} />
- ) : (
- <span className="inline-flex items-center gap-1 text-xs text-muted-foreground">
- <Check className="size-3.5 text-status-success" aria-hidden="true" />
- {translate('auto.components.settings.PluginCardAction.installed', 'Installed')}
- </span>
))
return (
<>
{status}
+ {switchable ? controls.toggle : null}
{controls.more}
</>
)
diff --git a/src/renderer/src/components/plugins/list/PluginCard.tsx b/src/renderer/src/components/plugins/list/PluginCard.tsx
index c325dac4293..4a030057303 100644
--- a/src/renderer/src/components/plugins/list/PluginCard.tsx
+++ b/src/renderer/src/components/plugins/list/PluginCard.tsx
@@ -1,5 +1,6 @@
-import { BadgeCheck } from 'lucide-react'
+import { BadgeCheck, Check } from 'lucide-react'
import { translate } from '@/i18n/i18n'
+import { Badge } from '../../ui/badge'
import { PluginCardArt, type PluginArtPalette } from './PluginCardArt'
import type { PluginListEntry } from './plugin-list-entries'
import { pluginArtShortcut, pluginArtTypes } from './PluginRowArt'
@@ -41,7 +42,7 @@ export function PluginCard({
onPointerEnter={onIntent}
onPointerLeave={onIntentEnd}
>
- <div className="border-b border-border/70">
+ <div className="relative border-b border-border/70">
{cover ? (
// Why alt="": the name link says what this is; the cover is decoration here.
<img
@@ -62,6 +63,13 @@ export function PluginCard({
tintKey={entry.pluginKey}
/>
)}
+ {entry.installed ? (
+ // Why on the art: the first thing a scan of the grid hits, readable over any cover.
+ <Badge variant="dot" data-plugin-installed-badge="" className="absolute top-2 left-2">
+ <Check className="text-status-success" aria-hidden="true" />
+ {translate('auto.components.settings.PluginCardAction.installed', 'Installed')}
+ </Badge>
+ ) : null}
</div>
<div className="flex flex-1 flex-col gap-1 px-3.5 pt-3 pb-3">
<div className="flex min-w-0 items-center gap-1.5">
@@ -97,8 +105,8 @@ export function PluginCard({
{/* Why the footer wraps: the card clips overflow, so when chips and the action can't share a row the action drops below them instead of a chip being cut off. */}
<div className="mt-auto flex min-h-6 flex-wrap items-center gap-x-1.5 gap-y-1 pt-1.5">
<div className="flex min-w-0 flex-wrap gap-1">{chips}</div>
- {/* Why a fixed width: Install, then "Installed ⋯", fill one slot, so the footer never moves when the action changes. It matches the button. */}
- <div className="relative z-10 ml-auto flex w-32 shrink-0 items-center justify-end gap-1.5">
+ {/* Why a minimum width: Install and its in-flight label share one slot, so the footer never moves mid-install; installed controls may be wider. */}
+ <div className="relative z-10 ml-auto flex min-w-32 shrink-0 items-center justify-end gap-1.5">
{action}
</div>
</div>
diff --git a/src/renderer/src/components/plugins/list/PluginCatalogLayout.tsx b/src/renderer/src/components/plugins/list/PluginCatalogLayout.tsx
index 61c2bb1ab16..3e478aa908c 100644
--- a/src/renderer/src/components/plugins/list/PluginCatalogLayout.tsx
+++ b/src/renderer/src/components/plugins/list/PluginCatalogLayout.tsx
@@ -4,7 +4,7 @@ import { Button } from '../../ui/button'
import { Input } from '../../ui/input'
import { Tabs, TabsList, TabsTrigger } from '../../ui/tabs'
-export type PluginCatalogFilter = 'all' | 'installed' | 'updates'
+export type PluginCatalogFilter = 'all' | 'installed' | 'available' | 'updates'
type PluginCatalogLayoutProps = {
filter: PluginCatalogFilter
@@ -14,14 +14,16 @@ type PluginCatalogLayoutProps = {
installedCount: number
updateCount: number
toolbar?: React.ReactNode
+ /** A row under the search, e.g. the category chips. */
+ filters?: React.ReactNode
children: React.ReactNode
}
function isPluginCatalogFilter(value: string): value is PluginCatalogFilter {
- return value === 'all' || value === 'installed' || value === 'updates'
+ return value === 'all' || value === 'installed' || value === 'available' || value === 'updates'
}
-/** Filter tabs, search and tools above the plugin list. */
+/** Install-state filter, search and tools above the one plugin list. */
export function PluginCatalogLayout({
filter,
onFilterChange,
@@ -30,6 +32,7 @@ export function PluginCatalogLayout({
installedCount,
updateCount,
toolbar,
+ filters,
children
}: PluginCatalogLayoutProps): React.JSX.Element {
return (
@@ -64,6 +67,12 @@ export function PluginCatalogLayout({
{installedCount}
</span>
</TabsTrigger>
+ <TabsTrigger value="available">
+ {translate(
+ 'auto.components.pluginCatalog.PluginCatalogLayout.notInstalled',
+ 'Not installed'
+ )}
+ </TabsTrigger>
{updateCount > 0 ? (
<TabsTrigger value="updates">
{translate('auto.components.pluginCatalog.PluginCatalogLayout.updates', 'Updates')}
@@ -106,6 +115,7 @@ export function PluginCatalogLayout({
</div>
{toolbar ? <div className="ml-auto flex items-center gap-1">{toolbar}</div> : null}
</div>
+ {filters}
{children}
</section>
diff --git a/src/renderer/src/components/plugins/list/PluginCategoryBadge.tsx b/src/renderer/src/components/plugins/list/PluginCategoryBadge.tsx
index c1d251b8f58..0ee50fa898f 100644
--- a/src/renderer/src/components/plugins/list/PluginCategoryBadge.tsx
+++ b/src/renderer/src/components/plugins/list/PluginCategoryBadge.tsx
@@ -1,21 +1,22 @@
-import { Code, Command, FolderTree, Languages, Palette, Server, Tag } from 'lucide-react'
+import { createElement } from 'react'
import { Badge } from '../../ui/badge'
import { pluginCategoryLabel } from './plugin-category-label'
+import { pluginCategoryIcon, pluginEntryCategoryIcon } from './plugin-category-icons'
import type { PluginListEntry } from './plugin-list-entries'
-import { isPluginFilterKind, pluginFilterKinds, type PluginFilterKind } from './plugin-list-filter'
+import { pluginFilterKinds } from './plugin-list-filter'
-const KIND_ICON: Record<PluginFilterKind, typeof Palette> = {
- themes: Palette,
- icons: FolderTree,
- languages: Languages,
- commands: Command,
- machines: Server
+/** A category's icon, for places that show a category without a plugin. */
+export function PluginCategoryIcon({ category }: { category: string }): React.JSX.Element {
+ return createElement(pluginCategoryIcon(category), { 'aria-hidden': true })
}
-/** A category's icon; the filter list and the card badges share it. */
-export function PluginCategoryIcon({ category }: { category: string }): React.JSX.Element {
- const Icon = isPluginFilterKind(category) ? KIND_ICON[category] : Tag
- return <Icon aria-hidden="true" />
+function KindBadge({ entry, kind }: { entry: PluginListEntry; kind: string }): React.JSX.Element {
+ return (
+ <Badge variant="hostContext">
+ {createElement(pluginEntryCategoryIcon(entry, kind), { 'aria-hidden': true })}
+ {pluginCategoryLabel(kind)}
+ </Badge>
+ )
}
/** What kind of plugin this is, as a chip with its icon; nothing when the kind is unknown. */
@@ -25,18 +26,24 @@ export function PluginCategoryBadge({
entry: PluginListEntry
}): React.JSX.Element | null {
const [kind] = pluginFilterKinds(entry)
- if (!kind) {
+ return kind ? <KindBadge entry={entry} kind={kind} /> : null
+}
+
+/** Every kind a plugin belongs to, as chips; the plugin page lists them all. */
+export function PluginCategoryBadges({
+ entry
+}: {
+ entry: PluginListEntry
+}): React.JSX.Element | null {
+ const kinds = [...pluginFilterKinds(entry)]
+ if (kinds.length === 0) {
return null
}
- // Why: syntax packs share the Languages category with interface languages but are for code.
- const forCode =
- kind === 'languages' &&
- entry.types.includes('syntax') &&
- !entry.types.includes('interface-language')
return (
- <Badge variant="hostContext">
- {forCode ? <Code aria-hidden="true" /> : <PluginCategoryIcon category={kind} />}
- {pluginCategoryLabel(kind)}
- </Badge>
+ <span className="flex flex-wrap justify-end gap-1">
+ {kinds.map((kind) => (
+ <KindBadge key={kind} entry={entry} kind={kind} />
+ ))}
+ </span>
)
}
diff --git a/src/renderer/src/components/plugins/list/PluginCategoryChips.tsx b/src/renderer/src/components/plugins/list/PluginCategoryChips.tsx
new file mode 100644
index 00000000000..3331fc7b55b
--- /dev/null
+++ b/src/renderer/src/components/plugins/list/PluginCategoryChips.tsx
@@ -0,0 +1,41 @@
+import { translate } from '@/i18n/i18n'
+import { ToggleGroup, ToggleGroupItem } from '../../ui/toggle-group'
+import { pluginCategoryLabel } from './plugin-category-label'
+import { PluginCategoryIcon } from './PluginCategoryBadge'
+import type { PluginListEntry } from './plugin-list-entries'
+import { pluginFilterCategories, type PluginListFilter } from './plugin-list-filter'
+
+/** One category at a time as always-visible chips; clicking the active one returns to all. */
+export function PluginCategoryChips({
+ entries,
+ filter,
+ onChange
+}: {
+ entries: readonly PluginListEntry[]
+ filter: PluginListFilter
+ onChange: (filter: PluginListFilter) => void
+}): React.JSX.Element | null {
+ const categories = pluginFilterCategories(entries).map(([category]) => category)
+ if (categories.length === 0) {
+ return null
+ }
+ return (
+ <ToggleGroup
+ type="single"
+ variant="segmented"
+ size="xs"
+ spacing={1}
+ value={[...filter.categories][0] ?? ''}
+ onValueChange={(next) => onChange({ ...filter, categories: new Set(next ? [next] : []) })}
+ aria-label={translate('auto.components.settings.PluginFilterPopover.kind', 'Category')}
+ className="flex-wrap"
+ >
+ {categories.map((category) => (
+ <ToggleGroupItem key={category} value={category}>
+ <PluginCategoryIcon category={category} />
+ {pluginCategoryLabel(category)}
+ </ToggleGroupItem>
+ ))}
+ </ToggleGroup>
+ )
+}
diff --git a/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx b/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
index 428bfe3f1af..8c29c314d17 100644
--- a/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
+++ b/src/renderer/src/components/plugins/list/PluginFilterPopover.tsx
@@ -4,13 +4,7 @@ import { translate } from '@/i18n/i18n'
import { Button } from '../../ui/button'
import { Checkbox } from '../../ui/checkbox'
import { Popover, PopoverContent, PopoverTrigger } from '../../ui/popover'
-import {
- NO_PLUGIN_LIST_FILTER,
- pluginFilterSize,
- type PluginListFilter
-} from './plugin-list-filter'
-import { pluginCategoryLabel } from './plugin-category-label'
-import { PluginCategoryIcon } from './PluginCategoryBadge'
+import { NO_PLUGIN_LIST_FILTER, type PluginListFilter } from './plugin-list-filter'
function toggled(set: ReadonlySet<string>, value: string, on: boolean): Set<string> {
const next = new Set(set)
@@ -52,20 +46,21 @@ function FilterOption({
)
}
-/** Narrow the list by category and by catalog. */
+/** Narrow the list by catalog; categories are inline chips beside it. */
export function PluginFilterPopover({
filter,
- categories,
sources,
onChange
}: {
filter: PluginListFilter
- categories: readonly [string, number][]
sources: readonly PluginMarketplaceHostSourceState[]
onChange: (filter: PluginListFilter) => void
}): React.JSX.Element {
- const active = pluginFilterSize(filter)
- const label = translate('auto.components.settings.PluginFilterPopover.label', 'Filter plugins')
+ const active = filter.sourceIds.size
+ const label = translate(
+ 'auto.components.settings.PluginFilterPopover.catalogLabel',
+ 'Filter by catalog'
+ )
return (
<Popover>
<PopoverTrigger asChild>
@@ -75,29 +70,6 @@ export function PluginFilterPopover({
</Button>
</PopoverTrigger>
<PopoverContent align="end" className="w-64">
- {categories.length > 0 ? (
- <div
- role="group"
- aria-label={translate('auto.components.settings.PluginFilterPopover.kind', 'Category')}
- >
- <p className="px-2 pt-1.5 pb-1 text-xs font-medium text-muted-foreground">
- {translate('auto.components.settings.PluginFilterPopover.kind', 'Category')}
- </p>
- {categories.map(([category, count]) => (
- <FilterOption
- key={category}
- id={`plugin-filter-category-${category}`}
- label={pluginCategoryLabel(category)}
- icon={<PluginCategoryIcon category={category} />}
- count={count}
- checked={filter.categories.has(category)}
- onChange={(on) =>
- onChange({ ...filter, categories: toggled(filter.categories, category, on) })
- }
- />
- ))}
- </div>
- ) : null}
{sources.length > 0 ? (
<div
role="group"
@@ -105,7 +77,6 @@ export function PluginFilterPopover({
'auto.components.settings.PluginFilterPopover.catalog',
'Catalog'
)}
- className="mt-1 border-t border-border pt-1"
>
<p className="px-2 pt-1.5 pb-1 text-xs font-medium text-muted-foreground">
{translate('auto.components.settings.PluginFilterPopover.catalog', 'Catalog')}
@@ -129,7 +100,7 @@ export function PluginFilterPopover({
size="sm"
className="w-full justify-start"
disabled={active === 0}
- onClick={() => onChange(NO_PLUGIN_LIST_FILTER)}
+ onClick={() => onChange({ ...filter, sourceIds: NO_PLUGIN_LIST_FILTER.sourceIds })}
>
{translate('auto.components.settings.PluginFilterPopover.clear', 'Clear filters')}
</Button>
diff --git a/src/renderer/src/components/plugins/list/PluginListEmptyStates.tsx b/src/renderer/src/components/plugins/list/PluginListEmptyStates.tsx
index 4abd8b5f10d..5b35efea571 100644
--- a/src/renderer/src/components/plugins/list/PluginListEmptyStates.tsx
+++ b/src/renderer/src/components/plugins/list/PluginListEmptyStates.tsx
@@ -1,4 +1,4 @@
-import { ChevronLeft, Loader2, SearchX } from 'lucide-react'
+import { Blocks, ChevronLeft, Loader2, PackageCheck, SearchX } from 'lucide-react'
import { translate } from '@/i18n/i18n'
import { Button } from '../../ui/button'
import { PluginCatalogEmptyState } from './PluginCatalogEmptyState'
@@ -74,3 +74,46 @@ export function PluginPageMissing({
</div>
)
}
+
+/** The Installed or Updates filter with nothing installed. */
+export function PluginNoneInstalled({ onBrowse }: { onBrowse: () => void }): React.JSX.Element {
+ return (
+ <PluginCatalogEmptyState
+ icon={Blocks}
+ title={translate(
+ 'auto.components.settings.PluginManager.noneInstalledTitle',
+ 'No plugins installed'
+ )}
+ action={
+ <Button variant="outline" size="sm" onClick={onBrowse}>
+ {translate('auto.components.settings.PluginManager.browseAll', 'Browse all plugins')}
+ </Button>
+ }
+ />
+ )
+}
+
+/** The Not installed filter once every catalog plugin is installed. */
+export function PluginAllInstalled({
+ onShowInstalled
+}: {
+ onShowInstalled: () => void
+}): React.JSX.Element {
+ return (
+ <PluginCatalogEmptyState
+ icon={PackageCheck}
+ title={translate(
+ 'auto.components.settings.PluginManager.allInstalledTitle',
+ 'Every catalog plugin is installed'
+ )}
+ action={
+ <Button variant="outline" size="sm" onClick={onShowInstalled}>
+ {translate(
+ 'auto.components.settings.PluginManager.showInstalled',
+ 'Show installed plugins'
+ )}
+ </Button>
+ }
+ />
+ )
+}
diff --git a/src/renderer/src/components/plugins/list/PluginListToolbar.tsx b/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
index efc8095fdc9..040602f6ed5 100644
--- a/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
+++ b/src/renderer/src/components/plugins/list/PluginListToolbar.tsx
@@ -6,12 +6,11 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '../../ui/tooltip'
import type { PluginListFilter } from './plugin-list-filter'
import { PluginFilterPopover } from './PluginFilterPopover'
-/** Tools beside the search: Update all (on the Updates tab), filter, and refresh. */
+/** Tools beside the search: Update all (on the Updates filter), catalog filter, and refresh. */
export function PluginListToolbar({
updateCount,
onUpdateAll,
filter,
- categories,
sources,
onFilterChange,
refreshBusy,
@@ -21,7 +20,6 @@ export function PluginListToolbar({
updateCount: number
onUpdateAll: () => void
filter: PluginListFilter
- categories: readonly [string, number][]
sources: readonly PluginMarketplaceHostSourceState[]
onFilterChange: (filter: PluginListFilter) => void
refreshBusy: boolean
@@ -38,12 +36,9 @@ export function PluginListToolbar({
{translate('auto.components.settings.PluginManager.updateAll', 'Update all…')}
</Button>
) : null}
- <PluginFilterPopover
- filter={filter}
- categories={categories}
- sources={sources}
- onChange={onFilterChange}
- />
+ {sources.length > 0 ? (
+ <PluginFilterPopover filter={filter} sources={sources} onChange={onFilterChange} />
+ ) : null}
<Tooltip>
<TooltipTrigger asChild>
<Button
diff --git a/src/renderer/src/components/plugins/list/PluginManager.test.tsx b/src/renderer/src/components/plugins/list/PluginManager.test.tsx
index a6061a065b5..b3e0d3064f3 100644
--- a/src/renderer/src/components/plugins/list/PluginManager.test.tsx
+++ b/src/renderer/src/components/plugins/list/PluginManager.test.tsx
@@ -170,15 +170,16 @@ afterEach(() => {
describe('PluginManager', () => {
it('lists each catalog plugin once, in catalog order, capped with Show all', async () => {
- const container = await render()
+ const pastCap = { ...installedPlugin, pluginKey: 'stablyai.extra-13', name: 'Extra 13' }
+ const container = await render([installedPlugin, pastCap])
const catalogCards = (): Element[] =>
- Array.from(container.querySelectorAll('[data-plugin-key]')).filter(
- (card) => !card.closest('[data-installed-carousel]')
- )
+ Array.from(container.querySelectorAll('[data-plugin-key]'))
const rows = catalogCards().map((row) => row.getAttribute('data-plugin-key'))
// Why one grid: an installed catalog plugin keeps its card, so installing never moves it.
expect(rows.filter((key) => key === 'stablyai.orca-nord-theme')).toHaveLength(1)
- expect(rows).toHaveLength(PLUGIN_GROUP_ROW_CAP)
+ // Why: an installed plugin past the cap keeps its card, so its switch never hides behind Show all.
+ expect(rows).toHaveLength(PLUGIN_GROUP_ROW_CAP + 1)
+ expect(rows).toContain('stablyai.extra-13')
await act(async () =>
buttonNamed(container, `Show all ${PLUGIN_GROUP_ROW_CAP + 3} plugins`)?.click()
@@ -186,6 +187,67 @@ describe('PluginManager', () => {
expect(catalogCards()).toHaveLength(PLUGIN_GROUP_ROW_CAP + 3)
})
+ it('filters one list by install state, keeping local plugins and inline switches', async () => {
+ const dev: PluginHostListEntry = {
+ ...installedPlugin,
+ pluginKey: 'local.dev-theme',
+ name: 'Dev Theme',
+ isDev: true,
+ source: undefined
+ }
+ const container = await render([installedPlugin, dev])
+ const keys = (): (string | null)[] =>
+ Array.from(container.querySelectorAll('[data-plugin-key]'), (card) =>
+ card.getAttribute('data-plugin-key')
+ )
+ const showFilter = (name: RegExp): void => {
+ const tab = Array.from(container.querySelectorAll('[role="tab"]')).find((node) =>
+ name.test(node.textContent ?? '')
+ )
+ act(() => {
+ tab?.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, button: 0 }))
+ })
+ }
+ const nord = container.querySelector('[data-plugin-key="stablyai.orca-nord-theme"]')
+ expect(nord?.querySelector('[data-plugin-installed-badge]')).not.toBeNull()
+ expect(buttonNamed(container, 'Disable Orca Nord')?.getAttribute('role')).toBe('switch')
+ expect(keys()).toContain('local.dev-theme')
+ expect(container.textContent).toContain('not from a catalog')
+
+ showFilter(/^Not installed/)
+ expect(keys()).not.toContain('stablyai.orca-nord-theme')
+ expect(keys()).not.toContain('local.dev-theme')
+ expect(container.querySelector('[data-plugin-installed-badge]')).toBeNull()
+
+ showFilter(/^Installed/)
+ expect(keys().sort()).toEqual(['local.dev-theme', 'stablyai.orca-nord-theme'])
+ })
+
+ it('filters by one inline category chip at a time', async () => {
+ installApi({
+ listMarketplacePlugins: vi
+ .fn()
+ .mockResolvedValue([
+ ...catalogListings,
+ listing('stablyai.gleam', { categories: ['syntax'] })
+ ])
+ })
+ const container = await render()
+ const chip = Array.from(container.querySelectorAll('[data-slot="toggle-group-item"]')).find(
+ (node) => node.textContent === 'Languages'
+ )
+ expect(chip?.querySelector('svg')).not.toBeNull()
+ await act(async () => chip?.dispatchEvent(new MouseEvent('click', { bubbles: true })))
+ expect(
+ Array.from(container.querySelectorAll('[data-plugin-key]'), (card) =>
+ card.getAttribute('data-plugin-key')
+ )
+ ).toEqual(['stablyai.gleam'])
+ // Why: single-select; clicking the active chip returns to every category.
+ await act(async () => chip?.dispatchEvent(new MouseEvent('click', { bubbles: true })))
+ expect(container.querySelectorAll('[data-plugin-key]').length).toBeGreaterThan(1)
+ })
+
it('labels cards by category with an icon, keeping a chip only for full access', async () => {
const worker: PluginHostListEntry = {
...installedPlugin,
diff --git a/src/renderer/src/components/plugins/list/PluginManager.tsx b/src/renderer/src/components/plugins/list/PluginManager.tsx
index 336cccb5710..53d0343c534 100644
--- a/src/renderer/src/components/plugins/list/PluginManager.tsx
+++ b/src/renderer/src/components/plugins/list/PluginManager.tsx
@@ -1,10 +1,8 @@
import { useCallback, useMemo, useState } from 'react'
-import { Blocks } from 'lucide-react'
import type { PluginHostListEntry } from '../../../../../preload/api-types'
import { translate } from '@/i18n/i18n'
import { Button } from '../../ui/button'
import { PluginCatalogLayout, type PluginCatalogFilter } from './PluginCatalogLayout'
-import { PluginCatalogEmptyState } from './PluginCatalogEmptyState'
import { PluginListGroup } from './PluginListGroup'
import {
buildPluginListEntries,
@@ -25,16 +23,20 @@ import {
PluginCatalogGroups,
type CatalogCardHandlers
} from '../catalog/PluginCatalogGroups'
-import { InstalledPluginCarousel } from '../catalog/InstalledPluginCarousel'
import { PluginListToolbar } from './PluginListToolbar'
-import { PluginNoMatches, PluginPageMissing } from './PluginListEmptyStates'
+import { PluginCategoryChips } from './PluginCategoryChips'
+import {
+ PluginAllInstalled,
+ PluginNoMatches,
+ PluginNoneInstalled,
+ PluginPageMissing
+} from './PluginListEmptyStates'
import { sortByAttention } from '../presentation/plugin-status-presentation'
import { usePluginAutoUpdatesStore } from '@/store/plugin-auto-updates'
import { PluginUpdateAllDialog } from '../dialogs/PluginUpdateAllDialog'
import {
matchesPluginFilter,
NO_PLUGIN_LIST_FILTER,
- pluginFilterCategories,
pluginFilterSize,
type PluginListFilter
} from './plugin-list-filter'
@@ -53,6 +55,11 @@ function resultCountLabel(count: number): string {
/** Rows a group shows before "Show all"; search and filters show everything. 12 fills whole rows at 1–4 columns. */
export const PLUGIN_GROUP_ROW_CAP = 12
+/** A capped group's rows: the first ones, plus every installed one so its switch stays in view. */
+export function cappedPluginRows(rows: readonly PluginListEntry[]): PluginListEntry[] {
+ return rows.filter((entry, index) => index < PLUGIN_GROUP_ROW_CAP || entry.installed)
+}
+
type PluginManagerProps = {
plugins: readonly PluginHostListEntry[]
pluginsLoading: boolean
@@ -153,15 +160,19 @@ export function PluginManager({
matchesPluginSearch(entry, query) && matchesPluginFilter(entry, listFilter)
const installed = entries.installed.filter(matches)
const updates = entries.installed.filter((entry) => entry.updateVersion)
- // Why: once the last update lands the Updates tab is gone, so the list falls back to Installed.
+ // Why: once the last update lands the Updates filter is gone, so the list falls back to Installed.
const filter: PluginCatalogFilter =
chosenTab === 'updates' && updates.length === 0 ? 'installed' : chosenTab
const visibleInstalled = filter === 'updates' ? updates.filter(matches) : installed
const capped = (groupId: string, rows: PluginListEntry[]): PluginListEntry[] =>
- narrowed || expandedGroups.has(groupId) ? rows : rows.slice(0, PLUGIN_GROUP_ROW_CAP)
+ narrowed || expandedGroups.has(groupId) ? rows : cappedPluginRows(rows)
const showAll = (groupId: string) => () =>
setExpandedGroups((current) => new Set(current).add(groupId))
-
+ const listedInCatalog = (entry: PluginListEntry): boolean =>
+ catalog.sources.some((source) => source.id === entry.listing?.marketplaceSourceId)
+ // Why: dev folders, local installs and bundled plugins have no catalog card to carry their switch.
+ const uncataloged = catalog.loading ? [] : installed.filter((entry) => !listedInCatalog(entry))
+ const catalogInstalled = filter === 'available' ? [] : entries.installed
const openUpdates = (entries: readonly PluginListEntry[]): void => {
setUpdateAllOpens((count) => count + 1)
setUpdateEntries(entries)
@@ -181,28 +192,32 @@ export function PluginManager({
installedHandlers: rowHandlers,
busyPluginKeys
}
- const visibleAvailableCount = [
+ const visibleCatalogCount = [
...entries.available,
- ...entries.installed.filter((entry) => entry.listing)
- ].filter(
- (entry) =>
- catalog.sources.some((source) => source.id === entry.listing?.marketplaceSourceId) &&
- matches(entry)
- ).length
- const nothingMatches =
- narrowed && visibleInstalled.length === 0 && (filter !== 'all' || visibleAvailableCount === 0)
+ ...catalogInstalled.filter((entry) => entry.listing)
+ ].filter((entry) => listedInCatalog(entry) && matches(entry)).length
+ const resultCount =
+ filter === 'installed' || filter === 'updates'
+ ? visibleInstalled.length
+ : visibleCatalogCount + (filter === 'all' ? uncataloged.length : 0)
+ const nothingMatches = narrowed && resultCount === 0
+ const everythingInstalled =
+ filter === 'available' &&
+ !narrowed &&
+ !catalog.loading &&
+ !catalog.error &&
+ catalog.sources.length > 0 &&
+ catalog.sources.every((source) => !source.error) &&
+ visibleCatalogCount === 0
+ const installedTitle = translate('auto.components.settings.PluginManager.installed', 'Installed')
const installedGroup = pluginsLoading ? (
- <PluginListGroup
- layout="grid"
- title={translate('auto.components.settings.PluginManager.installed', 'Installed')}
- showHeading={false}
- >
+ <PluginListGroup layout="grid" title={installedTitle} showHeading={false}>
<PluginCardSkeletons />
</PluginListGroup>
) : pluginsError ? (
<PluginListGroup
- title={translate('auto.components.settings.PluginManager.installed', 'Installed')}
+ title={installedTitle}
showHeading={false}
notice={
<CatalogNotice
@@ -221,18 +236,32 @@ export function PluginManager({
}
/>
) : filter === 'all' ? (
- <InstalledPluginCarousel
- entries={visibleInstalled}
- handlers={cardHandlers}
- onSeeAll={() => setTab('installed')}
- />
+ uncataloged.length > 0 ? (
+ <PluginListGroup
+ layout="grid"
+ title={installedTitle}
+ detail={
+ // Why: with no catalog loaded every installed plugin lands here, listed or not.
+ catalog.sources.length > 0
+ ? translate(
+ 'auto.components.settings.PluginManager.notFromCatalog',
+ 'not from a catalog'
+ )
+ : undefined
+ }
+ >
+ {uncataloged.map((entry) => (
+ <CatalogCard key={entry.pluginKey} entry={entry} handlers={cardHandlers} />
+ ))}
+ </PluginListGroup>
+ ) : null
) : (
<PluginListGroup
layout="grid"
title={
filter === 'updates'
? translate('auto.components.settings.PluginManager.updatesTitle', 'Updates')
- : translate('auto.components.settings.PluginManager.installed', 'Installed')
+ : installedTitle
}
showHeading={false}
>
@@ -308,12 +337,18 @@ export function PluginManager({
onSearchChange={setSearch}
installedCount={plugins.length}
updateCount={updates.length}
+ filters={
+ <PluginCategoryChips
+ entries={[...entries.installed, ...entries.available]}
+ filter={listFilter}
+ onChange={setListFilter}
+ />
+ }
toolbar={
<PluginListToolbar
updateCount={filter === 'updates' ? updates.length : 0}
onUpdateAll={() => openUpdates(updates)}
filter={listFilter}
- categories={pluginFilterCategories([...entries.installed, ...entries.available])}
sources={catalog.sources}
onFilterChange={setListFilter}
refreshBusy={catalog.refreshBusy}
@@ -342,49 +377,36 @@ export function PluginManager({
setListFilter(NO_PLUGIN_LIST_FILTER)
}}
/>
- ) : filter !== 'all' &&
+ ) : (filter === 'installed' || filter === 'updates') &&
!pluginsLoading &&
!pluginsError &&
visibleInstalled.length === 0 ? (
- <PluginCatalogEmptyState
- icon={Blocks}
- title={translate(
- 'auto.components.settings.PluginManager.noneInstalledTitle',
- 'No plugins installed'
- )}
- action={
- <Button variant="outline" size="sm" onClick={() => setTab('all')}>
- {translate(
- 'auto.components.settings.PluginManager.browseAll',
- 'Browse all plugins'
- )}
- </Button>
- }
- />
- ) : filter === 'all' ? (
+ <PluginNoneInstalled onBrowse={() => setTab('all')} />
+ ) : everythingInstalled ? (
+ <PluginAllInstalled onShowInstalled={() => setTab('installed')} />
+ ) : filter === 'all' || filter === 'available' ? (
<div className="@container/plugin-catalog space-y-8">
- {installedGroup}
- <PluginCatalogGroups
- catalog={catalog}
- available={entries.available}
- installed={entries.installed}
- cardHandlers={cardHandlers}
- matches={matches}
- narrowed={narrowed}
- capped={capped}
- showAll={showAll}
- openSources={() => setSourcesOpen(true)}
- />
+ {/* Why the error and loading too: until installed plugins are read, Not installed can't tell what you have. */}
+ {filter === 'all' || pluginsError || pluginsLoading ? installedGroup : null}
+ {filter === 'available' && (pluginsLoading || pluginsError) ? null : (
+ <PluginCatalogGroups
+ catalog={catalog}
+ available={entries.available}
+ installed={catalogInstalled}
+ cardHandlers={cardHandlers}
+ matches={matches}
+ narrowed={narrowed}
+ capped={capped}
+ showAll={showAll}
+ openSources={() => setSourcesOpen(true)}
+ />
+ )}
</div>
) : (
<div className="@container/plugin-catalog">{installedGroup}</div>
)}
<p className="sr-only" aria-live="polite">
- {narrowed
- ? resultCountLabel(
- visibleInstalled.length + (filter === 'all' ? visibleAvailableCount : 0)
- )
- : ''}
+ {narrowed ? resultCountLabel(resultCount) : ''}
</p>
</PluginCatalogLayout>
{dialogs}
diff --git a/src/renderer/src/components/plugins/list/PluginManagerRows.tsx b/src/renderer/src/components/plugins/list/PluginManagerRows.tsx
index e74f5bcc371..96d3e2c0de1 100644
--- a/src/renderer/src/components/plugins/list/PluginManagerRows.tsx
+++ b/src/renderer/src/components/plugins/list/PluginManagerRows.tsx
@@ -45,16 +45,13 @@ export function installedPluginControls(
busy,
canCheckUpdate,
handlers,
- inPage = false,
- toggleInMenu = false
+ inPage = false
}: {
busy: boolean
canCheckUpdate: boolean
handlers: InstalledRowHandlers
/** On the plugin's own page, so "Details" would reopen it. */
inPage?: boolean
- /** A card has no room for the switch, so Enable and Disable move into its menu. */
- toggleInMenu?: boolean
}
): InstalledPluginControls {
const { kind, enabled, statusText, removable, primary, switchable } = installedPluginPresentation(
@@ -163,7 +160,6 @@ export function installedPluginControls(
)
}
- const toggleItem = toggleInMenu && kind !== 'review' && kind !== 'invalid' && kind !== 'blocked'
return {
kind,
statusText,
@@ -236,7 +232,7 @@ export function installedPluginControls(
)}
</DropdownMenuItem>
) : null}
- {plugin.source?.kind === 'marketplace' || removable || plugin.bundled || toggleItem ? (
+ {plugin.source?.kind === 'marketplace' || removable || plugin.bundled ? (
<DropdownMenuSeparator />
) : null}
{plugin.source?.kind === 'marketplace' ? (
@@ -245,18 +241,6 @@ export function installedPluginControls(
onSelect={() => handlers.onRollbackRequest(plugin.pluginKey)}
/>
) : null}
- {toggleItem ? (
- // Why inset, no icon: sits with Remove as a lifecycle action, text aligned with iconed rows.
- <DropdownMenuItem
- inset
- disabled={!switchable}
- onSelect={() => handlers.onToggleEnabled(plugin.pluginKey)}
- >
- {enabled && !needsReview
- ? translate('auto.components.settings.PluginCardAction.disable', 'Disable')
- : translate('auto.components.settings.PluginCardAction.enable', 'Enable')}
- </DropdownMenuItem>
- ) : null}
{removable ? (
<DropdownMenuItem
variant="destructive"
diff --git a/src/renderer/src/components/plugins/list/plugin-category-icons.ts b/src/renderer/src/components/plugins/list/plugin-category-icons.ts
new file mode 100644
index 00000000000..572bf634cd6
--- /dev/null
+++ b/src/renderer/src/components/plugins/list/plugin-category-icons.ts
@@ -0,0 +1,89 @@
+import {
+ Server,
+ Bot,
+ Code,
+ FilePen,
+ Gamepad2,
+ Keyboard,
+ Languages,
+ Palette,
+ PanelRight,
+ Plug,
+ Puzzle,
+ Shapes,
+ Terminal,
+ type LucideIcon
+} from 'lucide-react'
+import type { PluginCatalogType } from '../../../../../shared/plugins/catalog/plugin-catalog-types'
+import type { PluginListEntry } from './plugin-list-entries'
+import { pluginFilterKinds } from './plugin-list-filter'
+
+/**
+ * The one catalog category→icon table, mirrored by the marketing site. Filter kinds (themes,
+ * languages, icons, editors, commands, machines) are keys too, so a chip reads its kind's row.
+ */
+export const PLUGIN_CATEGORY_ICONS: Readonly<Record<string, LucideIcon>> = {
+ themes: Palette,
+ 'app-themes': Palette,
+ 'terminal-themes': Palette,
+ languages: Code,
+ syntax: Code,
+ syntaxes: Code,
+ 'language-packs': Languages,
+ localization: Languages,
+ icons: Shapes,
+ 'icon-themes': Shapes,
+ editors: FilePen,
+ 'file-viewers': FilePen,
+ commands: Terminal,
+ keybindings: Keyboard,
+ panels: PanelRight,
+ integrations: Plug,
+ agents: Bot,
+ 'vm-recipes': Server,
+ machines: Server,
+ recipes: Server,
+ games: Gamepad2
+}
+
+export const PLUGIN_UNKNOWN_CATEGORY_ICON: LucideIcon = Puzzle
+
+// Why: local and dev plugins have no catalog categories, so what they add picks the icon.
+const TYPE_ICONS: Partial<Readonly<Record<PluginCatalogType, LucideIcon>>> = {
+ 'interface-language': Languages,
+ panel: PanelRight,
+ editor: FilePen
+}
+
+export function pluginCategoryIcon(category: string): LucideIcon {
+ return Object.hasOwn(PLUGIN_CATEGORY_ICONS, category)
+ ? PLUGIN_CATEGORY_ICONS[category]
+ : PLUGIN_UNKNOWN_CATEGORY_ICON
+}
+
+/** One plugin's icon for a kind it belongs to: its most specific category or type in that kind. */
+export function pluginEntryCategoryIcon(
+ entry: Pick<PluginListEntry, 'categories' | 'types'>,
+ kind: string
+): LucideIcon {
+ const inKind = (category: string): boolean =>
+ pluginFilterKinds({ categories: [category] }).has(kind)
+ const specific = entry.categories.find(
+ (category) =>
+ category !== kind && inKind(category) && Object.hasOwn(PLUGIN_CATEGORY_ICONS, category)
+ )
+ if (specific) {
+ return PLUGIN_CATEGORY_ICONS[specific]
+ }
+ if (entry.categories.length === 0) {
+ const type = entry.types.find(
+ (candidate) =>
+ TYPE_ICONS[candidate] && pluginFilterKinds({ categories: [], types: [candidate] }).has(kind)
+ )
+ const icon = type ? TYPE_ICONS[type] : undefined
+ if (icon) {
+ return icon
+ }
+ }
+ return pluginCategoryIcon(kind)
+}
diff --git a/src/renderer/src/components/plugins/list/plugin-category-label.ts b/src/renderer/src/components/plugins/list/plugin-category-label.ts
index 07da335176a..c2974783f63 100644
--- a/src/renderer/src/components/plugins/list/plugin-category-label.ts
+++ b/src/renderer/src/components/plugins/list/plugin-category-label.ts
@@ -10,13 +10,12 @@ function kindLabel(kind: PluginFilterKind): string {
return translate('auto.components.settings.PluginFilterPopover.languages', 'Languages')
case 'icons':
return translate('auto.components.settings.PluginFilterPopover.icons', 'Icons')
+ case 'editors':
+ return translate('auto.components.settings.PluginFilterPopover.editors', 'Editors')
case 'commands':
return translate('auto.components.settings.PluginFilterPopover.commands', 'Commands & panels')
case 'machines':
- return translate(
- 'auto.components.settings.PluginFilterPopover.machines',
- 'Machines & recipes'
- )
+ return translate('auto.components.settings.PluginFilterPopover.remoteVms', 'Remote/VMs')
}
}
diff --git a/src/renderer/src/components/plugins/list/plugin-list-filter.ts b/src/renderer/src/components/plugins/list/plugin-list-filter.ts
index 30a40f0e07b..d86d4735060 100644
--- a/src/renderer/src/components/plugins/list/plugin-list-filter.ts
+++ b/src/renderer/src/components/plugins/list/plugin-list-filter.ts
@@ -27,6 +27,8 @@ const KIND_BY_CATEGORY: Readonly<Record<string, PluginFilterKind>> = {
syntaxes: 'languages',
'language-packs': 'languages',
localization: 'languages',
+ editors: 'editors',
+ 'file-viewers': 'editors',
keybindings: 'commands',
commands: 'commands',
panels: 'commands',
@@ -35,7 +37,14 @@ const KIND_BY_CATEGORY: Readonly<Record<string, PluginFilterKind>> = {
recipes: 'machines'
}
-const PLUGIN_FILTER_KINDS = ['themes', 'languages', 'icons', 'commands', 'machines'] as const
+const PLUGIN_FILTER_KINDS = [
+ 'themes',
+ 'languages',
+ 'icons',
+ 'editors',
+ 'commands',
+ 'machines'
+] as const
export type PluginFilterKind = (typeof PLUGIN_FILTER_KINDS)[number]
export function isPluginFilterKind(value: string): value is PluginFilterKind {
@@ -50,7 +59,7 @@ const KIND_BY_TYPE: Readonly<Record<PluginCatalogType, PluginFilterKind>> = {
'interface-language': 'languages',
instructions: 'commands',
panel: 'commands',
- editor: 'commands',
+ editor: 'editors',
worker: 'commands'
}
diff --git a/src/renderer/src/components/plugins/page/PluginDetailInfo.tsx b/src/renderer/src/components/plugins/page/PluginDetailInfo.tsx
index d71155303be..8000c4dca66 100644
--- a/src/renderer/src/components/plugins/page/PluginDetailInfo.tsx
+++ b/src/renderer/src/components/plugins/page/PluginDetailInfo.tsx
@@ -2,20 +2,29 @@ import { ArrowUpRight } from 'lucide-react'
import { translate } from '@/i18n/i18n'
import { Button } from '../../ui/button'
import type { PluginListEntry } from '../list/plugin-list-entries'
-import { pluginCategoryLabel } from '../list/plugin-category-label'
+import { PluginCategoryBadges } from '../list/PluginCategoryBadge'
+import { pluginFilterKinds } from '../list/plugin-list-filter'
import { DetailSection } from './PluginDetailSections'
import { formatPluginReleaseDate } from '../presentation/plugin-release-date'
import { usePluginRollbackVersion } from '../state/use-plugin-rollback-version'
import { openAppHttpLink } from '@/lib/app-http-link-open'
-function InfoRow({ label, value, mono = false }: { label: string; value: string; mono?: boolean }) {
+function InfoRow({
+ label,
+ value,
+ mono = false
+}: {
+ label: string
+ value: React.ReactNode
+ mono?: boolean
+}) {
return (
<div className="flex justify-between gap-3 py-1 text-xs">
<dt className="shrink-0 text-muted-foreground">{label}</dt>
<dd
data-mono={mono}
className="min-w-0 truncate text-right data-[mono=true]:font-mono"
- title={value}
+ title={typeof value === 'string' ? value : undefined}
>
{value}
</dd>
@@ -54,8 +63,6 @@ export function PluginDetailInfo({
const rollbackVersion = usePluginRollbackVersion(
plugin?.source?.kind === 'marketplace' ? plugin.pluginKey : null
)
- // Why: "official" is trust, already shown by the verified mark.
- const categories = entry.categories.filter((category) => category !== 'official')
const updated = formatPluginReleaseDate(listing?.updatedAt)
const license = plugin?.license ?? listing?.license
const repository =
@@ -111,10 +118,10 @@ export function PluginDetailInfo({
value={license}
/>
) : null}
- {categories.length > 0 ? (
+ {pluginFilterKinds(entry).size > 0 ? (
<InfoRow
label={translate('auto.components.settings.PluginDetailPage.categories', 'Categories')}
- value={[...new Set(categories.map(pluginCategoryLabel))].join(', ')}
+ value={<PluginCategoryBadges entry={entry} />}
/>
) : null}
<InfoRow
diff --git a/src/renderer/src/components/plugins/presentation/plugin-access-profile.test.ts b/src/renderer/src/components/plugins/presentation/plugin-access-profile.test.ts
index ca7b09a82ac..365b584ddb4 100644
--- a/src/renderer/src/components/plugins/presentation/plugin-access-profile.test.ts
+++ b/src/renderer/src/components/plugins/presentation/plugin-access-profile.test.ts
@@ -5,7 +5,7 @@ import {
pluginPointsFromManifest,
pluginTrust
} from './plugin-access-profile'
-import { pluginTrustWarnings } from './plugin-consent-copy'
+import { pluginTrustLabel, pluginTrustWarnings } from './plugin-consent-copy'
const commandManifest = pluginManifestSchema.parse({
manifestVersion: 1,
@@ -89,18 +89,32 @@ describe('pluginTrust', () => {
execution: 'sandboxed-ui',
points: pluginPointsFromManifest(commandManifest)
})
- expect(trust).toEqual({ worker: false, declarative: true, panel: true })
- expect(pluginTrustWarnings(trust)).toEqual(['Its commands can act for you or your agents'])
+ expect(trust).toMatchObject({ worker: false, declarative: true, panel: true })
+ expect(pluginTrustWarnings(trust)).toEqual([
+ 'Its commands can act for you or your agents',
+ "Runs the publisher's code inside Orca to draw its view. Orca shows what it can access and asks before enabling it."
+ ])
})
- it('adds no warning for a panel known to carry no instructions', () => {
+ it('says a panel runs the publisher code, never that it is sandboxed', () => {
const trust = pluginTrust({ execution: 'sandboxed-ui', points: new Set(['panels']) })
- expect(pluginTrustWarnings(trust)).toEqual([])
+ expect(pluginTrustLabel(trust)).toBe('Adds a panel')
+ expect(pluginTrustWarnings(trust)).toEqual([
+ "Runs the publisher's code inside Orca to draw its view. Orca shows what it can access and asks before enabling it."
+ ])
+ expect(
+ pluginTrustLabel(
+ pluginTrust({ execution: 'sandboxed-ui', points: new Set(['customEditors']) })
+ )
+ ).toBe('Opens and edits files')
+ expect(
+ pluginTrustLabel(pluginTrust({ execution: 'declarative', points: new Set(['vmRecipes']) }))
+ ).toBe('Adds VM recipes')
})
it('over-warns when the profile or contributions are unknown', () => {
expect(pluginTrust({ execution: 'sandboxed-ui', points: null }).declarative).toBe(true)
- expect(pluginTrust({ execution: null, points: null })).toEqual({
+ expect(pluginTrust({ execution: null, points: null })).toMatchObject({
worker: false,
declarative: true,
panel: false
@@ -109,7 +123,7 @@ describe('pluginTrust', () => {
})
it('claims nothing runs only for content-only plugins', () => {
- expect(pluginTrust({ execution: 'data', points: null })).toEqual({
+ expect(pluginTrust({ execution: 'data', points: null })).toMatchObject({
worker: false,
declarative: false,
panel: false
diff --git a/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts b/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
index 79e06a6119b..c6004f47199 100644
--- a/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
+++ b/src/renderer/src/components/plugins/presentation/plugin-access-profile.ts
@@ -49,8 +49,14 @@ export type PluginTrust = {
worker: boolean
/** Commands, shortcuts, recipes or agent instructions that act under your authority. */
declarative: boolean
- /** A sandboxed panel; bounded by its capabilities. */
+ /** Publisher code drawing a view inside Orca (a panel or an editor); trusted, not sandboxed. */
panel: boolean
+ /** Known to add a file editor. */
+ editor: boolean
+ /** Known to add a sidebar panel. */
+ sidebarPanel: boolean
+ /** Its only declarative contributions are VM recipes. */
+ recipesOnly: boolean
}
/** Contribution points a plugin is known to use; null when nothing verified says yet. */
@@ -89,7 +95,7 @@ export function pluginTrust({
hasWorker?: boolean
}): PluginTrust {
if (execution === 'data') {
- return { worker: false, declarative: false, panel: false }
+ return NOTHING_RUNS
}
const worker =
execution === 'trusted-worker' || hasWorker || usesProfile(points, 'trusted-worker') === true
@@ -98,7 +104,31 @@ export function pluginTrust({
execution === 'sandboxed-ui' ||
points?.has('panels') === true ||
points?.has('customEditors') === true
- return { worker, declarative, panel }
+ const declarativePoints = points
+ ? [...points].filter(
+ (point) => PLUGIN_CONTRIBUTION_POINT_POLICY[point].execution === 'declarative'
+ )
+ : null
+ return {
+ worker,
+ declarative,
+ panel,
+ editor: points?.has('customEditors') === true,
+ sidebarPanel: points?.has('panels') === true,
+ recipesOnly:
+ declarativePoints !== null &&
+ declarativePoints.length > 0 &&
+ declarativePoints.every((point) => point === 'vmRecipes')
+ }
+}
+
+const NOTHING_RUNS: PluginTrust = {
+ worker: false,
+ declarative: false,
+ panel: false,
+ editor: false,
+ sidebarPanel: false,
+ recipesOnly: false
}
/** An installed plugin's trust, from its manifest once read, else what its list entry shows. */
diff --git a/src/renderer/src/components/plugins/presentation/plugin-consent-copy.ts b/src/renderer/src/components/plugins/presentation/plugin-consent-copy.ts
index ecb7a5a6d56..6d76d6ef251 100644
--- a/src/renderer/src/components/plugins/presentation/plugin-consent-copy.ts
+++ b/src/renderer/src/components/plugins/presentation/plugin-consent-copy.ts
@@ -7,15 +7,24 @@ export function pluginTrustLabel(trust: PluginTrust): string {
return translate('auto.components.settings.pluginConsentCopy.fullAccess', 'Full access')
}
if (trust.declarative) {
- return translate('auto.components.settings.pluginConsentCopy.addsCommands', 'Adds commands')
+ return trust.recipesOnly
+ ? translate('auto.components.settings.pluginConsentCopy.addsVmRecipes', 'Adds VM recipes')
+ : translate('auto.components.settings.pluginConsentCopy.addsCommands', 'Adds commands')
}
if (trust.panel) {
- return translate('auto.components.settings.pluginConsentCopy.addsPanel', 'Adds a panel')
+ return trust.editor
+ ? translate(
+ 'auto.components.settings.pluginConsentCopy.opensAndEditsFiles',
+ 'Opens and edits files'
+ )
+ : trust.sidebarPanel
+ ? translate('auto.components.settings.pluginConsentCopy.addsPanel', 'Adds a panel')
+ : translate('auto.components.settings.pluginConsentCopy.runsPluginCode', 'Runs plugin code')
}
return translate('auto.components.settings.pluginConsentCopy.contentOnly', 'Content only')
}
-/** Every warning that applies. A sandboxed panel has none: its capabilities say what it can do. */
+/** Every warning that applies. Panels and editors are the publisher's code, not a sandbox. */
export function pluginTrustWarnings(trust: PluginTrust): string[] {
const warnings: string[] = []
if (trust.worker) {
@@ -34,7 +43,15 @@ export function pluginTrustWarnings(trust: PluginTrust): string[] {
)
)
}
- if (warnings.length === 0 && !trust.panel) {
+ if (trust.panel && !trust.worker) {
+ warnings.push(
+ translate(
+ 'auto.components.settings.PluginConsentDialog.uiWarning',
+ "Runs the publisher's code inside Orca to draw its view. Orca shows what it can access and asks before enabling it."
+ )
+ )
+ }
+ if (warnings.length === 0) {
warnings.push(
translate(
'auto.components.settings.PluginConsentDialog.declarativeWarning',
diff --git a/src/renderer/src/components/plugins/review/PluginInstallConsent.test.tsx b/src/renderer/src/components/plugins/review/PluginInstallConsent.test.tsx
index 856fb3b81a3..4e641194bc5 100644
--- a/src/renderer/src/components/plugins/review/PluginInstallConsent.test.tsx
+++ b/src/renderer/src/components/plugins/review/PluginInstallConsent.test.tsx
@@ -11,7 +11,14 @@ function renderConsent(
): void {
render(
<PluginInstallConsent
- trust={{ worker, declarative: false, panel: !worker }}
+ trust={{
+ worker,
+ declarative: false,
+ panel: !worker,
+ editor: false,
+ sidebarPanel: !worker,
+ recipesOnly: false
+ }}
capabilities={capabilities}
shortcuts={[]}
installed={null}
diff --git a/src/renderer/src/components/plugins/review/PluginInstallConsent.tsx b/src/renderer/src/components/plugins/review/PluginInstallConsent.tsx
index ddc13de077b..e4735204a67 100644
--- a/src/renderer/src/components/plugins/review/PluginInstallConsent.tsx
+++ b/src/renderer/src/components/plugins/review/PluginInstallConsent.tsx
@@ -91,7 +91,10 @@ export function PluginInstallConsent({
</h3>
<span className="shrink-0 rounded-md border border-border px-1.5 py-px text-2xs font-medium text-muted-foreground">
{!trust.worker && !trust.declarative && (editorFileTypes?.length ?? 0) > 0
- ? translate('auto.components.settings.pluginConsentCopy.addsEditor', 'Adds an editor')
+ ? translate(
+ 'auto.components.settings.pluginConsentCopy.opensAndEditsFiles',
+ 'Opens and edits files'
+ )
: pluginTrustLabel(trust)}
</span>
</div>
diff --git a/src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx b/src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx
index 7dd6624d388..729976bbb26 100644
--- a/src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx
+++ b/src/renderer/src/components/settings/PluginsSettingsSection.lifecycle.test.tsx
@@ -211,17 +211,22 @@ function installApi(overrides: Record<string, unknown> = {}): {
return { unsubscribe }
}
-/** A card's Enable or Disable menu item; cards carry no switch. */
+/** A card's enable switch. */
function toggleItem(container: HTMLElement, pluginKey: string): HTMLButtonElement {
- const item = Array.from(
- container.querySelectorAll<HTMLButtonElement>(`[data-plugin-key="${pluginKey}"] button`)
- ).find((button) => ['Disable', 'Enable'].includes(button.textContent?.trim() ?? ''))
+ const item = container.querySelector<HTMLButtonElement>(
+ `[data-plugin-key="${pluginKey}"] [role="switch"]`
+ )
if (!item) {
throw new Error('missing plugin toggle')
}
return item
}
+/** What the switch does next: "Enable" or "Disable". */
+function toggleAction(item: HTMLButtonElement): string | undefined {
+ return item.getAttribute('aria-label')?.split(' ')[0]
+}
+
beforeEach(() => installApi())
afterEach(() => {
@@ -284,7 +289,7 @@ describe('PluginsSettingsSection lifecycle', () => {
it('routes enablement and confirmed removal through plugin IPC', async () => {
const { container } = await renderSection()
- expect(toggleItem(container, plugin.pluginKey).textContent).toBe('Disable')
+ expect(toggleAction(toggleItem(container, plugin.pluginKey))).toBe('Disable')
vi.mocked(applyPluginThemesNow).mockClear()
await act(async () => click(toggleItem(container, plugin.pluginKey)))
@@ -326,7 +331,7 @@ describe('PluginsSettingsSection lifecycle', () => {
})
const { container } = await renderSection()
const pluginSwitch = toggleItem(container, plugin.pluginKey)
- expect(pluginSwitch.textContent).toBe('Enable')
+ expect(toggleAction(pluginSwitch)).toBe('Enable')
await act(async () => click(pluginSwitch))
@@ -363,7 +368,7 @@ describe('PluginsSettingsSection lifecycle', () => {
await act(async () => click(restart))
expect(list).toHaveBeenCalledTimes(2)
- expect(toggleItem(container, plugin.pluginKey).textContent).toBe('Enable')
+ expect(toggleAction(toggleItem(container, plugin.pluginKey))).toBe('Enable')
})
it('confirms marketplace rollback before invoking plugin IPC', async () => {
@@ -440,8 +445,8 @@ describe('PluginsSettingsSection lifecycle', () => {
])
)
expect(notes().disabled).toBe(false)
- expect(notes().textContent).toBe('Enable')
- expect(tasks().textContent).toBe('Enable')
+ expect(toggleAction(notes())).toBe('Enable')
+ expect(toggleAction(tasks())).toBe('Enable')
})
it('fetches bounded logs only when their disclosure opens', async () => {
@@ -469,7 +474,7 @@ describe('PluginsSettingsSection lifecycle', () => {
const { container } = await renderSection()
expect(container.textContent).toContain('Restarting')
- expect(toggleItem(container, plugin.pluginKey).textContent).toBe('Disable')
+ expect(toggleAction(toggleItem(container, plugin.pluginKey))).toBe('Disable')
})
it('prunes dialogs and stale logs after external removal and same-key reinstall', async () => {
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 933f8e37c27..b394b956455 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -11963,7 +11963,8 @@
"terminalRun": "Run commands in your terminals, including SSH"
},
"decisionFailed": "Could not save the permission decision. Try again.",
- "fullAccessWarning": "Full access: runs as a normal program and can read your files, use the network and run other programs."
+ "fullAccessWarning": "Full access: runs as a normal program and can read your files, use the network and run other programs.",
+ "uiWarning": "Runs the publisher's code inside Orca to draw its view. Orca shows what it can access and asks before enabling it."
},
"PluginConsentProvenance": {
"official": "Official",
@@ -13101,7 +13102,10 @@
"browseAll": "Browse all plugins",
"resultCount": "{{value0}} plugins match",
"resultCountOne": "1 plugin matches",
- "updateAll": "Update all…"
+ "updateAll": "Update all…",
+ "notFromCatalog": "not from a catalog",
+ "allInstalledTitle": "Every catalog plugin is installed",
+ "showInstalled": "Show installed plugins"
},
"PluginDetailPage": {
"bundled": "Bundled with Orca",
@@ -13183,7 +13187,6 @@
"offTitle": "Plugins are off"
},
"PluginFilterPopover": {
- "label": "Filter plugins",
"kind": "Category",
"catalog": "Catalog",
"clear": "Clear filters",
@@ -13191,7 +13194,9 @@
"languages": "Languages",
"icons": "Icons",
"commands": "Commands & panels",
- "machines": "Machines & recipes"
+ "catalogLabel": "Filter by catalog",
+ "editors": "Editors",
+ "remoteVms": "Remote/VMs"
},
"PluginUpdateAllDialog": {
"previewError": "Couldn’t read this update",
@@ -13242,9 +13247,7 @@
"installing": "Installing…",
"reviewLabel": "Review and install {{value0}}",
"review": "Review & install",
- "retry": "Try again",
- "disable": "Disable",
- "enable": "Enable"
+ "retry": "Try again"
},
"PluginInstallConsent": {
"install": "Install & enable",
@@ -13283,7 +13286,9 @@
"addsPanel": "Adds a panel",
"contentOnly": "Content only",
"fullAccess": "Full access",
- "addsEditor": "Adds an editor"
+ "addsVmRecipes": "Adds VM recipes",
+ "opensAndEditsFiles": "Opens and edits files",
+ "runsPluginCode": "Runs plugin code"
},
"PluginContributionActionCommand": {
"run": "Run",
@@ -13332,12 +13337,6 @@
"updatedTo": "Updated to {{value0}}",
"devUnverified": "Dev · unverified"
},
- "InstalledPluginCarousel": {
- "previous": "Previous installed plugins",
- "next": "Next installed plugins",
- "heading": "Installed",
- "seeAllCount": "See all {{value0}}"
- },
"PluginInUseAction": {
"inUseDark": "In use · Dark",
"inUseLight": "In use · Light",
@@ -18462,7 +18461,8 @@
"searchLabel": "Search plugins",
"searchPlaceholder": "Search plugins",
"updates": "Updates",
- "clearSearch": "Clear search"
+ "clearSearch": "Clear search",
+ "notInstalled": "Not installed"
},
"PluginListGroup": {
"showAll": "Show {{value0}} more",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 6c92ed81878..900b4ce78a6 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -11676,9 +11676,7 @@
"installing": "Instalando…",
"reviewLabel": "Revisar e instalar {{value0}}",
"review": "Revisar e instalar",
- "retry": "Reintentar",
- "disable": "Desactivar",
- "enable": "Activar"
+ "retry": "Reintentar"
},
"PluginSettingsRow": {
"loadingLogs": "Cargando registros…",
@@ -12783,15 +12781,13 @@
"offTitle": "Los plugins están desactivados"
},
"PluginFilterPopover": {
- "label": "Filtrar plugins",
"kind": "Categoría",
"catalog": "Catálogo",
"clear": "Borrar filtros",
"themes": "Temas",
"languages": "Lenguajes",
"icons": "Iconos",
- "commands": "Comandos y paneles",
- "machines": "Máquinas y recetas"
+ "commands": "Comandos y paneles"
},
"PluginUpdateAllDialog": {
"previewError": "No se pudo leer esta actualización",
@@ -12847,10 +12843,6 @@
"PluginSettingsMenu": {
"autoUpdateHint": "Solo vuelve a preguntar por accesos nuevos"
},
- "InstalledPluginCarousel": {
- "previous": "Plugins instalados anteriores",
- "next": "Siguientes plugins instalados"
- },
"PluginInUseAction": {
"inUseDark": "En uso · Oscuro",
"inUseLight": "En uso · Claro",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 05951e8cb73..115f7153b92 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -11891,9 +11891,7 @@
"installing": "Installation…",
"reviewLabel": "Vérifier et installer {{value0}}",
"review": "Vérifier et installer",
- "retry": "Réessayer",
- "disable": "Désactiver",
- "enable": "Activer"
+ "retry": "Réessayer"
},
"PluginSettingsRow": {
"loadingLogs": "Chargement des logs…",
@@ -13007,15 +13005,13 @@
"offTitle": "Les plugins sont désactivés"
},
"PluginFilterPopover": {
- "label": "Filtrer les plugins",
"kind": "Catégorie",
"catalog": "Catalogue",
"clear": "Effacer les filtres",
"themes": "Thèmes",
"languages": "Langages",
"icons": "Icônes",
- "commands": "Commandes et panneaux",
- "machines": "Machines et recettes"
+ "commands": "Commandes et panneaux"
},
"PluginUpdateAllDialog": {
"previewError": "Impossible de lire cette mise à jour",
@@ -13071,10 +13067,6 @@
"PluginSettingsMenu": {
"autoUpdateHint": "Ne redemande que pour un nouvel accès"
},
- "InstalledPluginCarousel": {
- "previous": "Plugins installés précédents",
- "next": "Plugins installés suivants"
- },
"PluginInUseAction": {
"inUseDark": "Utilisé · Sombre",
"inUseLight": "Utilisé · Clair",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index ca3b286a1cb..2beea7b418e 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -11393,9 +11393,7 @@
"installing": "インストール中…",
"reviewLabel": "{{value0}} を確認してインストール",
"review": "確認してインストール",
- "retry": "再試行",
- "disable": "無効にする",
- "enable": "有効にする"
+ "retry": "再試行"
},
"PluginSettingsRow": {
"loadingLogs": "ログを読み込み中…",
@@ -12497,15 +12495,13 @@
"offTitle": "プラグインはオフです"
},
"PluginFilterPopover": {
- "label": "プラグインを絞り込む",
"kind": "カテゴリ",
"catalog": "カタログ",
"clear": "絞り込みをクリア",
"themes": "テーマ",
"languages": "言語",
"icons": "アイコン",
- "commands": "コマンドとパネル",
- "machines": "マシンとレシピ"
+ "commands": "コマンドとパネル"
},
"PluginUpdateAllDialog": {
"previewError": "このアップデートを読み取れませんでした",
@@ -12561,10 +12557,6 @@
"PluginSettingsMenu": {
"autoUpdateHint": "新しいアクセスがあるときだけ確認します"
},
- "InstalledPluginCarousel": {
- "previous": "前のインストール済みプラグイン",
- "next": "次のインストール済みプラグイン"
- },
"PluginInUseAction": {
"inUseDark": "使用中 · ダーク",
"inUseLight": "使用中 · ライト",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 7f468f81979..e387027fbc4 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -11393,9 +11393,7 @@
"installing": "설치 중…",
"reviewLabel": "{{value0}} 검토 후 설치",
"review": "검토 후 설치",
- "retry": "다시 시도",
- "disable": "비활성화",
- "enable": "활성화"
+ "retry": "다시 시도"
},
"PluginSettingsRow": {
"loadingLogs": "로그 로딩 중…",
@@ -12497,15 +12495,13 @@
"offTitle": "플러그인이 꺼져 있습니다"
},
"PluginFilterPopover": {
- "label": "플러그인 필터",
"kind": "카테고리",
"catalog": "카탈로그",
"clear": "필터 지우기",
"themes": "테마",
"languages": "언어",
"icons": "아이콘",
- "commands": "명령 및 패널",
- "machines": "머신 및 레시피"
+ "commands": "명령 및 패널"
},
"PluginUpdateAllDialog": {
"previewError": "이 업데이트를 읽지 못했습니다",
@@ -12561,10 +12557,6 @@
"PluginSettingsMenu": {
"autoUpdateHint": "새 접근 권한이 있을 때만 다시 묻습니다"
},
- "InstalledPluginCarousel": {
- "previous": "이전 설치된 플러그인",
- "next": "다음 설치된 플러그인"
- },
"PluginInUseAction": {
"inUseDark": "사용 중 · 다크",
"inUseLight": "사용 중 · 라이트",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index 55c80ec1e1e..074f5c7d449 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -9247,10 +9247,6 @@
"description": "Cores do app para este modo."
}
},
- "InstalledPluginCarousel": {
- "previous": "Plugins instalados anteriores",
- "next": "Próximos plugins instalados"
- },
"PluginInUseAction": {
"inUseDark": "Em uso · Escuro",
"inUseLight": "Em uso · Claro",
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 47ffcbabea2..017a84faa7f 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -11393,9 +11393,7 @@
"installing": "正在安装…",
"reviewLabel": "审核并安装 {{value0}}",
"review": "审核并安装",
- "retry": "重试",
- "disable": "禁用",
- "enable": "启用"
+ "retry": "重试"
},
"PluginSettingsRow": {
"loadingLogs": "正在加载日志…",
@@ -12530,15 +12528,13 @@
"offTitle": "插件已关闭"
},
"PluginFilterPopover": {
- "label": "筛选插件",
"kind": "类别",
"catalog": "目录",
"clear": "清除筛选",
"themes": "主题",
"languages": "语言",
"icons": "图标",
- "commands": "命令和面板",
- "machines": "机器和配方"
+ "commands": "命令和面板"
},
"PluginUpdateAllDialog": {
"previewError": "无法读取此更新",
@@ -12594,10 +12590,6 @@
"PluginSettingsMenu": {
"autoUpdateHint": "仅在需要新访问权限时再次询问"
},
- "InstalledPluginCarousel": {
- "previous": "上一组已安装插件",
- "next": "下一组已安装插件"
- },
"PluginInUseAction": {
"inUseDark": "使用中 · 深色",
"inUseLight": "使用中 · 浅色",
diff --git a/src/shared/plugins/contributions/plugin-custom-editor-contribution.ts b/src/shared/plugins/contributions/plugin-custom-editor-contribution.ts
index 0bf8087a2be..fe19ec5e9ad 100644
--- a/src/shared/plugins/contributions/plugin-custom-editor-contribution.ts
+++ b/src/shared/plugins/contributions/plugin-custom-editor-contribution.ts
@@ -51,7 +51,7 @@ export const pluginCustomEditorContributionSchema = z
}),
entry: pluginRelativePathSchema.meta(
pluginPathFieldDoc(
- 'HTML file rendered inside a sandboxed editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust.',
+ 'HTML file rendered inside an editor frame, like a panel. It receives the open document and posts edits back; it never gets a file path or file system. It is trusted code: install editors you trust.',
PLUGIN_MANIFEST_V2_SINCE,
['editor/index.html']
)
diff --git a/src/shared/plugins/contributions/plugin-panel-contribution.ts b/src/shared/plugins/contributions/plugin-panel-contribution.ts
index 83af3db9452..a54efc5e56f 100644
--- a/src/shared/plugins/contributions/plugin-panel-contribution.ts
+++ b/src/shared/plugins/contributions/plugin-panel-contribution.ts
@@ -80,7 +80,7 @@ export const pluginPanelContributionSchema = z
),
entry: pluginRelativePathSchema.meta(
pluginPathFieldDoc(
- 'HTML file, relative to the plugin root, rendered inside a sandboxed panel frame.',
+ 'HTML file, relative to the plugin root, rendered inside a panel frame. It is trusted code: install panels you trust.',
PLUGIN_SCHEMA_SINCE_V1,
['dist/panel.html']
)