feat(ui): show Pi adapter settings on the MCP server row

Direct tools and other adapter settings were only visible on hover, so
checking which tools a server exposes to Pi meant pointing at every row.
They now sit on a line under the endpoint. Other adapter settings only
say that they are set, since they may hold anything.

Refs #289
This commit is contained in:
Willie
2026-09-22 19:35:36 +08:00
parent 72e87c0d62
commit 265f9ee9b9
15 changed files with 20 additions and 65 deletions
+1 -1
View File
@@ -192,7 +192,7 @@ export default function MCPProjectView({ data, root, offered, onChanged, onRemov
<Button size="sm" variant="secondary" onClick={() => { setAddingOff(false); setAddMode('form'); setEditing(''); }}><Plus size={14} />{t('mcp.addServer')}</Button>
</div>
{ownRows.length > 0
? <MCPServerList rows={ownRows} targets={shown} targetsOf={targetsOf} offTargets={offTargets} onToggle={toggleOwn} onMenu={openMenu} onEdit={setEditing} />
? <MCPServerList rows={ownRows} targets={shown} targetsOf={targetsOf} offTargets={offTargets} onToggle={toggleOwn} onMenu={openMenu} />
: <p className="text-[13px] text-ink-3">{t('mcp.projects.noOnlyHere')}</p>}
</section>
<Button className="flush mt-6 self-start" size="sm" variant="ghost" onClick={() => setDropping(true)}><Trash2 size={14} />{t('projects.mcp.stop')}</Button>
+6 -19
View File
@@ -1,28 +1,15 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, expect, it, vi } from 'vitest';
import { I18nProvider } from '../../i18n';
import MCPServerList from './MCPServerList';
describe('MCP server list', () => {
it('shows which Pi adapter settings a server has on focus, without their contents', async () => {
const user = userEvent.setup();
const server = { command: 'npx', targets: ['pi'], piExtension: 'pi-mcp-adapter', directTools: true, piOptions: { excludeTools: ['secret_*'] } };
it('shows which Pi adapter settings a server has on its row, without their contents', () => {
const server = { command: 'npx', targets: ['pi'], piExtension: 'pi-mcp-adapter', directTools: ['take_screenshot', 'list_pages'], piOptions: { excludeTools: ['secret_*'] } };
render(<I18nProvider><MCPServerList rows={[{ name: 'docs', server, cells: {} }]} targets={['pi']} targetsOf={() => ['pi']} onToggle={vi.fn()} onMenu={vi.fn()} /></I18nProvider>);
await user.tab();
expect(screen.getByRole('button', { name: 'Pi adapter settings for docs' })).toHaveFocus();
const tip = await screen.findByRole('tooltip');
expect(tip).toHaveTextContent('Direct tools: All tools');
expect(tip).toHaveTextContent('Other adapter settings: Set');
expect(tip).not.toHaveTextContent('secret_');
});
it('opens the server editor from the Pi settings button', async () => {
const user = userEvent.setup();
const onEdit = vi.fn();
const server = { command: 'npx', targets: ['pi'], piExtension: 'pi-mcp-adapter', directTools: true };
render(<I18nProvider><MCPServerList rows={[{ name: 'docs', server, cells: {} }]} targets={['pi']} targetsOf={() => ['pi']} onToggle={vi.fn()} onMenu={vi.fn()} onEdit={onEdit} /></I18nProvider>);
await user.click(screen.getByRole('button', { name: 'Pi adapter settings for docs' }));
expect(onEdit).toHaveBeenCalledWith('docs');
const line = screen.getByText('take_screenshot, list_pages').parentElement!;
expect(line).toHaveTextContent('Direct tools');
expect(line).toHaveTextContent('Other adapter settings');
expect(line).not.toHaveTextContent('secret_');
});
});
+12 -22
View File
@@ -1,7 +1,7 @@
import { Fragment, useState } from 'react';
import { Ellipsis, Plug, SlidersHorizontal } from 'lucide-react';
import { Ellipsis, Plug } from 'lucide-react';
import { useT } from '../../i18n';
import Tooltip from '../Tooltip';
import AgentIcon from '../AgentIcon';
import { mcpOffTargets } from '../../api/mcp';
import { describeEndpoint, type MatrixRow } from './mcpView';
import { TargetPill, TargetToggles } from './TargetPicker';
@@ -13,8 +13,6 @@ interface Props {
targetsOf: (name: string) => string[];
onToggle: (name: string, target: string, on: boolean) => void;
onMenu: (e: React.MouseEvent<HTMLButtonElement>, name: string) => void;
/** Opens the server's edit dialog, where the Pi settings live. */
onEdit?: (name: string) => void;
/** Agents a switch-only entry can go to. mcp.projects cannot reach Claude's off list. */
offTargets?: readonly string[];
}
@@ -23,7 +21,7 @@ interface Props {
* One row per server. The agents it writes to are chips inside the row, not columns:
* the list grows downwards as more CLIs gain MCP support, so it never scrolls sideways.
*/
export default function MCPServerList({ rows, targets, targetsOf, onToggle, onMenu, onEdit, offTargets = mcpOffTargets }: Props) {
export default function MCPServerList({ rows, targets, targetsOf, onToggle, onMenu, offTargets = mcpOffTargets }: Props) {
const t = useT();
const [open, setOpen] = useState<string[]>([]);
const directToolsLabel = useDirectToolsLabel();
@@ -52,26 +50,18 @@ export default function MCPServerList({ rows, targets, targetsOf, onToggle, onMe
</span>
{/* Transport and endpoint on one quiet line, the same shape as a plugin row. */}
<span className="truncate text-xs text-ink-3">{!row.server ? t('mcp.removedHint') : row.server.disabled ? t('mcp.offHere') : <>{http ? 'http' : 'stdio'} · <span className="font-mono">{describeEndpoint(row.server)}</span></>}</span>
{/* Only whether other Pi settings exist, never their contents: piOptions may hold anything. */}
{piSettings && (
<span className="flex min-w-0 items-center gap-1.5 whitespace-nowrap text-xs text-ink-2">
<AgentIcon target="pi" size={12} />
{direct !== undefined && <><span className="text-ink-3">{t('mcp.directTools')}</span><span className={`truncate ${Array.isArray(direct) ? 'font-mono' : ''}`} title={directToolsLabel(direct)}>{directToolsLabel(direct)}</span></>}
{direct !== undefined && piOptions && <span className="text-ink-3">·</span>}
{piOptions && <span>{t('mcp.piOptions')}</span>}
</span>
)}
</span>
{row.server && (
<>
{/* Only which Pi settings exist, never their contents: piOptions may hold anything. */}
{piSettings && (
<Tooltip
block
content={
<span className="flex flex-col gap-1">
<span className="font-semibold">Pi · pi-mcp-adapter</span>
{direct !== undefined && <span>{t('mcp.directTools')}: {directToolsLabel(direct)}</span>}
{piOptions && <span>{t('mcp.piOptions')}: {t('mcp.piOptionsSet')}</span>}
</span>
}
>
<button type="button" className="ss-ib" aria-label={t('mcp.piSettingsLabel', { name: row.name })} onClick={() => onEdit?.(row.name)}>
<SlidersHorizontal size={16} />
</button>
</Tooltip>
)}
<TargetPill selected={selected} text={`${selected.length}/${offered.length}`} expanded={expanded} label={t('mcp.chooseAgents', { name: row.name })} onClick={() => setOpen((prev) => (expanded ? prev.filter((x) => x !== row.name) : [...prev, row.name]))} />
<button type="button" className="ss-ib" aria-label={t('mcp.moreActions', { name: row.name })} onClick={(e) => onMenu(e, row.name)}>
<Ellipsis size={16} />
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Ein JSON-Objekt mit pi-mcp-adapter-Feldern, für die Skillshare keine eigene Einstellung hat, etwa excludeTools. Es wird unverändert in Pis Datei geschrieben, also keine Geheimnisse eintragen. Ein hier entferntes Feld bleibt in Pis Datei, bis du es dort löschst.",
"mcp.piOptionsInvalid": "Gib ein JSON-Objekt ein.",
"mcp.piOptionsTaken": "Skillshare schreibt {field} aus den eigenen Einstellungen dieses Servers. Entferne es hier.",
"mcp.piOptionsSet": "Gesetzt",
"mcp.piSettingsLabel": "Pi-Adapter-Einstellungen für {name}",
"mcp.defaults": "Standardwerte",
"mcp.defaults.targetsHint": "Server, die kein eigenes Target wählen, werden zu diesen Agents synchronisiert.",
"mcp.defaults.directToolsHint": "Gilt für pi-mcp-adapter-Server ohne eigene Einstellung. Ein Projekt kann das überschreiben.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "A JSON object of pi-mcp-adapter fields Skillshare has no setting for, such as excludeTools. It is written into Pi's file as it is, so keep secrets out of it. A field you remove here stays in Pi's file until you delete it there.",
"mcp.piOptionsInvalid": "Enter a JSON object.",
"mcp.piOptionsTaken": "Skillshare writes {field} from this server's own settings. Remove it here.",
"mcp.piOptionsSet": "Set",
"mcp.piSettingsLabel": "Pi adapter settings for {name}",
"mcp.defaults": "Defaults",
"mcp.defaults.targetsHint": "Servers that pick no target of their own sync to these Agents.",
"mcp.defaults.directToolsHint": "Applies to pi-mcp-adapter servers without their own setting. A project can override it.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Un objeto JSON con campos de pi-mcp-adapter para los que Skillshare no tiene ajuste, como excludeTools. Se escribe tal cual en el archivo de Pi, así que no incluyas secretos. Un campo que quites aquí permanece en el archivo de Pi hasta que lo borres allí.",
"mcp.piOptionsInvalid": "Introduce un objeto JSON.",
"mcp.piOptionsTaken": "Skillshare escribe {field} a partir de los ajustes propios de este servidor. Quítalo de aquí.",
"mcp.piOptionsSet": "Definido",
"mcp.piSettingsLabel": "Ajustes del adaptador de Pi para {name}",
"mcp.defaults": "Valores predeterminados",
"mcp.defaults.targetsHint": "Los servidores que no eligen un target propio se sincronizan con estos Agents.",
"mcp.defaults.directToolsHint": "Se aplica a los servidores de pi-mcp-adapter sin ajuste propio. Un proyecto puede sobrescribirlo.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "یک شیء JSON از فیلدهای pi-mcp-adapter که Skillshare تنظیمی برایشان ندارد، مانند excludeTools. همان‌طور که هست در فایل Pi نوشته می‌شود، پس اطلاعات محرمانه در آن نگذارید. فیلدی که اینجا حذف کنید تا وقتی آن را در فایل Pi پاک نکنید همان‌جا می‌ماند.",
"mcp.piOptionsInvalid": "یک شیء JSON وارد کنید.",
"mcp.piOptionsTaken": "Skillshare مقدار {field} را از تنظیمات خود این سرور می‌نویسد. آن را از اینجا حذف کنید.",
"mcp.piOptionsSet": "تنظیم شده",
"mcp.piSettingsLabel": "تنظیمات آداپتور Pi برای {name}",
"mcp.defaults": "پیش‌فرض‌ها",
"mcp.defaults.targetsHint": "سرورهایی که خودشان target انتخاب نکرده‌اند با این Agentها همگام می‌شوند.",
"mcp.defaults.directToolsHint": "برای سرورهای pi-mcp-adapter که تنظیم خودشان را ندارند اعمال می‌شود. هر پروژه می‌تواند آن را بازنویسی کند.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Un objet JSON de champs pi-mcp-adapter pour lesquels Skillshare n'a pas de réglage, comme excludeTools. Il est écrit tel quel dans le fichier de Pi, n'y mettez donc aucun secret. Un champ retiré ici reste dans le fichier de Pi jusqu'à ce que vous l'y supprimiez.",
"mcp.piOptionsInvalid": "Saisissez un objet JSON.",
"mcp.piOptionsTaken": "Skillshare écrit {field} à partir des réglages propres à ce serveur. Retirez-le d'ici.",
"mcp.piOptionsSet": "Défini",
"mcp.piSettingsLabel": "Réglages de l’adaptateur Pi pour {name}",
"mcp.defaults": "Valeurs par défaut",
"mcp.defaults.targetsHint": "Les serveurs qui ne choisissent pas leur propre target sont synchronisés vers ces Agents.",
"mcp.defaults.directToolsHint": "S'applique aux serveurs pi-mcp-adapter sans réglage propre. Un projet peut le remplacer.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Objek JSON berisi kolom pi-mcp-adapter yang tidak punya pengaturan di Skillshare, misalnya excludeTools. Isinya ditulis apa adanya ke file Pi, jadi jangan masukkan rahasia. Kolom yang dihapus di sini tetap ada di file Pi sampai Anda menghapusnya di sana.",
"mcp.piOptionsInvalid": "Masukkan objek JSON.",
"mcp.piOptionsTaken": "Skillshare menulis {field} dari pengaturan server ini sendiri. Hapus dari sini.",
"mcp.piOptionsSet": "Diatur",
"mcp.piSettingsLabel": "Pengaturan adapter Pi untuk {name}",
"mcp.defaults": "Default",
"mcp.defaults.targetsHint": "Server yang tidak memilih target sendiri disinkronkan ke Agent ini.",
"mcp.defaults.directToolsHint": "Berlaku untuk server pi-mcp-adapter tanpa pengaturan sendiri. Proyek dapat menimpanya.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Skillshare に設定項目がない pi-mcp-adapter のフィールドを JSON オブジェクトで指定します(例: excludeTools)。内容はそのまま Pi のファイルに書き込まれるため、シークレットは入れないでください。ここで削除したフィールドは Pi のファイルに残るので、そちらで削除してください。",
"mcp.piOptionsInvalid": "JSON オブジェクトを入力してください。",
"mcp.piOptionsTaken": "{field} は Skillshare がこのサーバー自身の設定から書き込みます。ここからは削除してください。",
"mcp.piOptionsSet": "設定あり",
"mcp.piSettingsLabel": "{name} の Pi アダプター設定",
"mcp.defaults": "デフォルト",
"mcp.defaults.targetsHint": "自分で target を選んでいないサーバーは、これらの Agent に同期されます。",
"mcp.defaults.directToolsHint": "独自の設定がない pi-mcp-adapter のサーバーに適用されます。プロジェクトごとに上書きできます。",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Skillshare에 설정 항목이 없는 pi-mcp-adapter 필드를 JSON 객체로 입력합니다(예: excludeTools). 내용은 그대로 Pi 파일에 기록되므로 비밀 값은 넣지 마세요. 여기서 제거한 필드는 Pi 파일에 남으므로 그쪽에서 직접 삭제해야 합니다.",
"mcp.piOptionsInvalid": "JSON 객체를 입력하세요.",
"mcp.piOptionsTaken": "{field}은(는) Skillshare가 이 서버의 자체 설정으로 기록합니다. 여기서는 제거하세요.",
"mcp.piOptionsSet": "설정됨",
"mcp.piSettingsLabel": "{name}의 Pi 어댑터 설정",
"mcp.defaults": "기본값",
"mcp.defaults.targetsHint": "target을 직접 고르지 않은 서버는 이 Agent들에 동기화됩니다.",
"mcp.defaults.directToolsHint": "자체 설정이 없는 pi-mcp-adapter 서버에 적용됩니다. 프로젝트에서 재정의할 수 있습니다.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "Um objeto JSON com campos do pi-mcp-adapter para os quais o Skillshare não tem configuração, como excludeTools. Ele é gravado como está no arquivo do Pi, então não inclua segredos. Um campo removido aqui permanece no arquivo do Pi até você apagá-lo lá.",
"mcp.piOptionsInvalid": "Informe um objeto JSON.",
"mcp.piOptionsTaken": "O Skillshare grava {field} a partir das configurações próprias deste servidor. Remova-o daqui.",
"mcp.piOptionsSet": "Definido",
"mcp.piSettingsLabel": "Configurações do adaptador do Pi para {name}",
"mcp.defaults": "Padrões",
"mcp.defaults.targetsHint": "Servidores que não escolhem um target próprio são sincronizados com estes Agents.",
"mcp.defaults.directToolsHint": "Vale para servidores pi-mcp-adapter sem configuração própria. Um projeto pode sobrescrever.",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "用 JSON 对象填写 Skillshare 没有对应字段的 pi-mcp-adapter 设置,例如 excludeTools。内容会原样写入 Pi 的文件,请不要放密钥。在这里移除的字段会留在 Pi 的文件里,需要到那边自行删除。",
"mcp.piOptionsInvalid": "请输入 JSON 对象。",
"mcp.piOptionsTaken": "{field} 由 Skillshare 根据这个服务器自己的设置写入,请从这里移除。",
"mcp.piOptionsSet": "已设置",
"mcp.piSettingsLabel": "{name} 的 Pi 适配器设置",
"mcp.defaults": "默认值",
"mcp.defaults.targetsHint": "服务器没有自己选 target 时,同步到这些 Agent。",
"mcp.defaults.directToolsHint": "应用到没有自己设置的 pi-mcp-adapter 服务器。项目可以各自覆盖。",
-2
View File
@@ -1658,8 +1658,6 @@
"mcp.piOptionsHint": "用 JSON 物件填 Skillshare 沒有對應欄位的 pi-mcp-adapter 設定,例如 excludeTools。內容會原樣寫進 Pi 的檔案,請不要放密鑰。在這裡拿掉的欄位會留在 Pi 的檔案裡,要到那邊自己刪除。",
"mcp.piOptionsInvalid": "請輸入 JSON 物件。",
"mcp.piOptionsTaken": "{field} 由 Skillshare 依這個伺服器自己的設定寫入,請從這裡移除。",
"mcp.piOptionsSet": "已設定",
"mcp.piSettingsLabel": "{name} 的 Pi 轉接器設定",
"mcp.defaults": "預設值",
"mcp.defaults.targetsHint": "伺服器沒有自己選 target 時,同步到這些 Agent。",
"mcp.defaults.directToolsHint": "套用到沒有自己設定的 pi-mcp-adapter 伺服器。專案可以各自覆寫。",
+1 -1
View File
@@ -238,7 +238,7 @@ export default function MCPPage() {
)}
<MCPUnmanagedNote entries={data.unmanaged.filter((u) => !u.project)} onImport={(from) => setImporting({ from })} />
{rows.length > 0 ? (
<MCPServerList rows={rows} targets={order.filter((x) => matrixTargets.has(x))} targetsOf={targetsOf} onToggle={(n, x, on) => void toggle(n, x, on)} onMenu={openMenu} onEdit={(n) => { setPiSetupName(null); setEditing(n); }} />
<MCPServerList rows={rows} targets={order.filter((x) => matrixTargets.has(x))} targetsOf={targetsOf} onToggle={(n, x, on) => void toggle(n, x, on)} onMenu={openMenu} />
) : (
<EmptyState
icon={Plug}