mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-09 03:20:56 +00:00
Some checks are pending
Rust / Format (push) Waiting to run
Rust / Clippy (push) Waiting to run
Rust / Generated Docs (push) Waiting to run
Rust / Test (Linux) (push) Waiting to run
Rust / Test (macOS) (push) Waiting to run
TypeScript / Typecheck (push) Waiting to run
TypeScript / Test (push) Waiting to run
TypeScript / Build (push) Waiting to run
## Summary
Adds a full CRUD management UI for server-managed MCP servers at
`/settings/mcps`, consuming the already-shipped `MCPServersApi` backend.
The implementation mirrors the existing `/settings/environments` pages
exactly in structure, naming, and component conventions.
## What changed
### Step 1 — Shared `KeyValueEditor` extracted
`KeyValueEditor`, `KeyValueEntry`, `entriesFromMap`, and
`mapFromEntries` are moved from `environment-form.tsx` into a new
`components/key-value-editor.tsx`. The component gains an optional
`renderEntryHint` prop so per-row warnings can be injected without
coupling the editor to credential logic. `Label` is promoted from
`environment-form.tsx` to `settings-panel.tsx` so both forms can use it.
### Step 2–4 — Query plumbing
- `query-keys.ts`: `mcpServers.{list, detail}` keys.
- `api-client.ts`: `mcpServersApi` instance (same pattern as
`environmentsApi`).
- `queries.ts`: `useMcpServers()` and `useMcpServer(id)` SWR hooks.
### Step 5 — Credential heuristics (`lib/credential-heuristics.ts`)
Pure functions `looksLikeCredential`, `secretNameForKey`,
`secretReference`. Key-name matching covers `authorization`, `password`,
`token`, `api[-_]?key`, `_key`/`_token`/`_secret` suffixes.
Value-entropy fallback fires for strings ≥ 20 chars, no spaces, mixed
case/digit classes. Template references (`{{ secrets.* }}`) are never
flagged.
### Step 6–7 — Form model + component (`components/mcp-server-form.tsx`)
- Flat `McpServerFormValues` discriminated on `McpTransportKind`.
- `defaultMcpServerFormValues`, `mcpServerToFormValues` (populates
`env`/`headers` from `env_keys`/`header_keys` with **empty values** —
the §5 write-only design), `createRequestFromForm`,
`replaceRequestFromForm`, `isMcpServerFormValid`, `credentialWarnings`.
- `McpServerFormFields` renders stdio / http / sandbox panels switching
on `values.transport`. Per-row credential nudge opens the secrets-new
page in a new tab and substitutes a `{{ secrets.NAME }}` reference; save
is never blocked by the heuristic.
- On edit, a row with a non-empty key and empty value blocks save with
an inline error (the intentional overwrite guard).
### Step 8–10 — Route pages
| File | Mirrors |
|---|---|
| `routes/settings-mcps.tsx` | `settings-environments.tsx` |
| `routes/settings-mcps-new.tsx` | `settings-environments-new.tsx` |
| `routes/settings-mcps-edit.tsx` | `settings-environments-edit.tsx` |
The edit page shows a write-only-values banner whenever the transport
has any `env_keys`/`header_keys`, uses `key={server.revision}` to
remount the form on external change, and translates 409 responses into
the `staleAwareMessage` pattern.
### Steps 11–12 — Router + nav
Three routes registered under `settings` children. `PuzzlePieceIcon` nav
entry added to the same section as Environments.
### Plan Summary
- Extract `KeyValueEditor` to shared component with hint-injection slot
- Credential heuristics library (pure, fully unit-tested)
- MCP form model: flat values ↔ discriminated API types, write-only-key
guard
- List / new / edit pages following environments pattern exactly
- Route registration and settings nav link
### Fabro Details
<details>
<summary>Ran 9 stages in 65m 58s for $20.54</summary>
| Stage | Duration | Cost | Retries |
|---|---|---|---|
| start | 0s | – | 0 |
| toolchain | 1s | – | 0 |
| preflight_compile | 2m 47s | – | 0 |
| preflight_lint | 4m 15s | – | 0 |
| implement | 26m 29s | $12.27 | 0 |
| simplify_opus | 7m 41s | $4.95 | 0 |
| simplify_gpt | 6m 51s | $2.69 | 0 |
| verify | 15m 44s | – | 0 |
| fixup | 1m 41s | $0.63 | 0 |
| **Total** | **65m 58s** | **$20.54** | **0** |
</details>
<details>
<summary>Ran <code>ImplementPlan.fabro</code> (11 nodes and 14
edges)</summary>
```dot
digraph ImplementPlan {
graph [
goal="Implement and simplify",
model_stylesheet="
* { model: claude-opus-4-8; }
"
]
rankdir=LR
start [shape=Mdiamond, label="Start"]
exit [shape=Msquare, label="Exit"]
toolchain [label="Toolchain", shape=parallelogram, script="command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1", max_retries=0]
preflight_compile [label="Preflight Compile", shape=parallelogram, script="cargo check -q --workspace 2>&1", max_retries=0]
preflight_lint [label="Preflight Lint", shape=parallelogram, script="cargo +nightly-2026-04-14 clippy -q --workspace --all-targets -- -D warnings 2>&1", max_retries=0]
fix_lints [label="Fix Lints", prompt="The preflight lint step failed. Read the build output from context and fix all clippy lint warnings.", max_visits=3]
implement [label="Implement", prompt="Read the plan file referenced in the goal and implement every step. Make all the code changes described in the plan. Use red/green TDD.", model="gpt-55", reasoning_effort="xhigh"]
simplify_opus [label="Simplify (Opus)", prompt="@prompts/simplify.md"]
simplify_gpt [label="Simplify (GPT-55)", prompt="@prompts/simplify.md", model="gpt-55"]
verify [label="Verify", shape=parallelogram, script="git fetch origin main 2>&1 && git merge --no-edit --no-stat origin/main 2>&1 && cargo +nightly-2026-04-14 fmt --all 2>&1 && cargo dev docs refresh 2>&1 && cargo +nightly-2026-04-14 fmt --check --all 2>&1 && { command -v rg >/dev/null 2>&1 || { echo 'rg is required for verify'; exit 127; }; } && ! rg -n 'AuthMode::Disabled|RunAuthMethod|RunSubjectProvenance|\bActorRef\b|\bActorKind\b|AuthenticatedSubject|AuthenticatedService|AuthorizeRunScoped|AuthorizeRunBlob|AuthorizeStageArtifact|AuthorizeCommandLog|auth_method\s*==\s*\"disabled\"' lib/crates apps lib/packages docs/public/api-reference/fabro-api.yaml 2>&1 && cargo +nightly-2026-04-14 clippy --workspace --all-targets -- -D warnings 2>&1 && cargo nextest run --workspace --status-level slow --profile ci 2>&1 && cargo dev docs check 2>&1 && bun install --frozen-lockfile 2>&1 && (cd apps/fabro-web && bun run typecheck) 2>&1 && (cd apps/fabro-web && bun run test) 2>&1 && (cd lib/packages/fabro-api-client && bun run typecheck) 2>&1 && cargo dev build -- -p fabro-cli --release 2>&1", goal_gate=true, retry_target="fixup"]
fixup [label="Fixup", prompt="The verify step failed. Read the build output from context and fix all format, clippy, Rust test, docs, TypeScript typecheck/test, and build failures.", max_visits=3]
start -> toolchain
toolchain -> preflight_compile [condition="outcome=succeeded"]
toolchain -> exit
preflight_compile -> preflight_lint [condition="outcome=succeeded"]
preflight_compile -> exit
preflight_lint -> implement [condition="outcome=succeeded"]
preflight_lint -> fix_lints
fix_lints -> preflight_lint
implement -> simplify_opus -> simplify_gpt -> verify
verify -> exit [condition="outcome=succeeded"]
verify -> fixup
fixup -> verify
}
```
</details>
⚒️ Generated with [Fabro](https://fabro.sh)
---------
Co-authored-by: Fabro <noreply@fabro.sh>
265 lines
9 KiB
TypeScript
265 lines
9 KiB
TypeScript
import { useState } from "react";
|
|
import { Link } from "react-router";
|
|
import { useSWRConfig } from "swr";
|
|
import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
|
|
import { ChevronDownIcon, PlusIcon } from "@heroicons/react/16/solid";
|
|
import { EllipsisVerticalIcon } from "@heroicons/react/20/solid";
|
|
import type { McpServer } from "@qltysh/fabro-api-client";
|
|
|
|
import {
|
|
Badge,
|
|
Muted,
|
|
Panel,
|
|
PanelSkeleton,
|
|
SettingsPageIntro,
|
|
} from "../components/settings-panel";
|
|
import { ConfirmDialog } from "../components/ui";
|
|
import { useToast } from "../components/toast";
|
|
import { ApiError, apiData, mcpServersApi } from "../lib/api-client";
|
|
import { removeMcpServerFromList } from "../lib/mcp-server-cache";
|
|
import { MCP_TRANSPORT_KINDS, type McpTransportKind } from "../lib/mcp-transport-kinds";
|
|
import { queryKeys } from "../lib/query-keys";
|
|
import { useMcpServers } from "../lib/queries";
|
|
|
|
const MENU_ITEM_CLASS =
|
|
"flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-fg-3 transition-colors data-focus:bg-overlay data-focus:text-fg data-focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-60";
|
|
|
|
const MENU_ITEM_DANGER_CLASS =
|
|
"flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-coral transition-colors data-focus:bg-coral/10 data-focus:text-coral data-focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-60";
|
|
|
|
const NEW_BUTTON_CLASS =
|
|
"inline-flex items-center gap-1.5 rounded-md border border-line bg-panel/80 px-2.5 py-1 text-sm font-medium text-fg-3 transition-colors hover:border-line-strong hover:bg-panel hover:text-fg disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:border-line disabled:hover:bg-panel/80 disabled:hover:text-fg-3";
|
|
|
|
const DESCRIPTION =
|
|
"MCP servers are server-managed tool providers stored on this Fabro server. Workflows can enable a stored server by name without embedding connection details in each run.";
|
|
|
|
export function meta() {
|
|
return [{ title: "MCP servers — Fabro" }];
|
|
}
|
|
|
|
export default function SettingsMcps() {
|
|
const query = useMcpServers();
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<SettingsPageIntro description={DESCRIPTION} action={<NewMcpServerMenu />} />
|
|
{query.data ? (
|
|
<McpServersPanel servers={query.data.data} />
|
|
) : query.error ? (
|
|
<Panel title="MCP servers">
|
|
<div className="px-4 py-6 text-sm text-fg-2">
|
|
Couldn't load MCP servers. Please try again.
|
|
</div>
|
|
</Panel>
|
|
) : (
|
|
<PanelSkeleton />
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function NewMcpServerMenu() {
|
|
return (
|
|
<Menu as="div" className="relative inline-block">
|
|
<MenuButton className={NEW_BUTTON_CLASS}>
|
|
<PlusIcon className="size-3.5" aria-hidden="true" />
|
|
New MCP server
|
|
<ChevronDownIcon className="size-3.5" aria-hidden="true" />
|
|
</MenuButton>
|
|
<MenuItems
|
|
transition
|
|
anchor={{ to: "bottom end", gap: 4 }}
|
|
className="z-30 w-44 origin-top-right rounded-md bg-panel py-1 outline-1 -outline-offset-1 outline-line-strong transition data-closed:scale-95 data-closed:opacity-0 data-enter:duration-100 data-enter:ease-out data-leave:duration-75 data-leave:ease-in"
|
|
>
|
|
{MCP_TRANSPORT_KINDS.map((kind) => (
|
|
<MenuItem key={kind}>
|
|
<Link
|
|
to={`/settings/mcps/new?type=${encodeURIComponent(kind)}`}
|
|
className={MENU_ITEM_CLASS}
|
|
>
|
|
{transportLabel(kind)}
|
|
</Link>
|
|
</MenuItem>
|
|
))}
|
|
</MenuItems>
|
|
</Menu>
|
|
);
|
|
}
|
|
|
|
function McpServersPanel({ servers }: { servers: McpServer[] }) {
|
|
const { mutate } = useSWRConfig();
|
|
const toast = useToast();
|
|
const [pendingDelete, setPendingDelete] = useState<McpServer | null>(null);
|
|
const [deleting, setDeleting] = useState(false);
|
|
|
|
async function confirmDelete() {
|
|
if (!pendingDelete) return;
|
|
const target = pendingDelete;
|
|
setDeleting(true);
|
|
try {
|
|
await apiData(() => mcpServersApi.deleteMcpServer(target.id, target.revision));
|
|
await mutate(
|
|
queryKeys.mcpServers.list(),
|
|
(current) => removeMcpServerFromList(current, target.id),
|
|
{ revalidate: false },
|
|
);
|
|
toast.push({ message: `MCP server “${target.id}” deleted.` });
|
|
setPendingDelete(null);
|
|
void mutate(queryKeys.mcpServers.list());
|
|
} catch (cause) {
|
|
if (cause instanceof ApiError && cause.status === 409) {
|
|
await mutate(queryKeys.mcpServers.list());
|
|
toast.push({
|
|
tone: "error",
|
|
message: "This MCP server changed before it could be deleted. Refresh and try again.",
|
|
});
|
|
} else {
|
|
toast.push({
|
|
tone: "error",
|
|
message:
|
|
cause instanceof ApiError && cause.message
|
|
? cause.message
|
|
: "Couldn't delete the MCP server. Please try again.",
|
|
});
|
|
}
|
|
} finally {
|
|
setDeleting(false);
|
|
}
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<Panel title="MCP servers">
|
|
{servers.length === 0 ? (
|
|
<div className="px-4 py-6 text-sm text-fg-muted">
|
|
No MCP servers defined yet.
|
|
</div>
|
|
) : (
|
|
servers.map((server) => (
|
|
<McpServerRow
|
|
key={server.id}
|
|
server={server}
|
|
disabled={deleting}
|
|
onDelete={() => setPendingDelete(server)}
|
|
/>
|
|
))
|
|
)}
|
|
</Panel>
|
|
<ConfirmDialog
|
|
open={pendingDelete !== null}
|
|
title="Delete MCP server"
|
|
description={
|
|
<>
|
|
Delete <span className="font-mono text-fg-2">{pendingDelete?.id}</span>? Workflows
|
|
that enable this server will fail until it is recreated.
|
|
</>
|
|
}
|
|
confirmLabel="Delete"
|
|
pendingLabel="Deleting…"
|
|
pending={deleting}
|
|
onConfirm={confirmDelete}
|
|
onCancel={() => {
|
|
if (!deleting) setPendingDelete(null);
|
|
}}
|
|
/>
|
|
</>
|
|
);
|
|
}
|
|
|
|
function McpServerRow({
|
|
server,
|
|
disabled,
|
|
onDelete,
|
|
}: {
|
|
server: McpServer;
|
|
disabled: boolean;
|
|
onDelete: () => void;
|
|
}) {
|
|
const summary = transportSummary(server);
|
|
return (
|
|
<div className="grid grid-cols-[minmax(0,1.2fr)_minmax(0,1.5fr)_auto] items-center gap-4 px-4 py-3.5">
|
|
<div className="min-w-0">
|
|
<div className="flex items-center gap-2">
|
|
<span className="truncate text-sm text-fg" title={server.display_name}>
|
|
{server.display_name}
|
|
</span>
|
|
<Badge>{server.transport.type}</Badge>
|
|
</div>
|
|
<div className="mt-0.5 flex min-w-0 items-center gap-2 text-xs/5 text-fg-3">
|
|
<span className="truncate font-mono" title={server.id}>{server.id}</span>
|
|
{server.description ? <span className="truncate">{server.description}</span> : null}
|
|
</div>
|
|
</div>
|
|
<div className="min-w-0 truncate font-mono text-xs text-fg-2" title={summary ?? undefined}>
|
|
{summary ?? <Muted>No transport details</Muted>}
|
|
</div>
|
|
<RowMenu server={server} disabled={disabled} onDelete={onDelete} />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function transportSummary(server: McpServer): string | null {
|
|
switch (server.transport.type) {
|
|
case "stdio":
|
|
return server.transport.command.join(" ") || null;
|
|
case "http":
|
|
return server.transport.url;
|
|
case "sandbox": {
|
|
const command = server.transport.command.join(" ");
|
|
return command ? `${command} · port ${server.transport.port}` : `port ${server.transport.port}`;
|
|
}
|
|
}
|
|
}
|
|
|
|
function transportLabel(kind: McpTransportKind): string {
|
|
return kind.charAt(0).toUpperCase() + kind.slice(1);
|
|
}
|
|
|
|
function RowMenu({
|
|
server,
|
|
disabled,
|
|
onDelete,
|
|
}: {
|
|
server: McpServer;
|
|
disabled: boolean;
|
|
onDelete: () => void;
|
|
}) {
|
|
return (
|
|
<Menu as="div" className="relative inline-block">
|
|
<MenuButton
|
|
type="button"
|
|
disabled={disabled}
|
|
aria-label={`Actions for ${server.id}`}
|
|
title="Actions"
|
|
className="flex size-7 items-center justify-center rounded text-fg-muted transition-colors hover:bg-overlay hover:text-fg-3 disabled:cursor-not-allowed disabled:opacity-60"
|
|
>
|
|
<EllipsisVerticalIcon className="size-4" aria-hidden="true" />
|
|
</MenuButton>
|
|
<MenuItems
|
|
transition
|
|
anchor={{ to: "bottom end", gap: 4 }}
|
|
className="z-30 w-36 origin-top-right rounded-md bg-panel py-1 outline-1 -outline-offset-1 outline-line-strong transition data-closed:scale-95 data-closed:opacity-0 data-enter:duration-100 data-enter:ease-out data-leave:duration-75 data-leave:ease-in"
|
|
>
|
|
<MenuItem>
|
|
<Link
|
|
to={`/settings/mcps/${encodeURIComponent(server.id)}/edit`}
|
|
className={MENU_ITEM_CLASS}
|
|
>
|
|
Edit
|
|
</Link>
|
|
</MenuItem>
|
|
<hr className="my-1 h-px border-0 bg-line" />
|
|
<MenuItem>
|
|
<button
|
|
type="button"
|
|
onClick={onDelete}
|
|
disabled={disabled}
|
|
className={MENU_ITEM_DANGER_CLASS}
|
|
>
|
|
Delete
|
|
</button>
|
|
</MenuItem>
|
|
</MenuItems>
|
|
</Menu>
|
|
);
|
|
}
|