mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-09-07 08:27:12 +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>
228 lines
6.5 KiB
TypeScript
228 lines
6.5 KiB
TypeScript
import {
|
|
BoltIcon,
|
|
ChartBarSquareIcon,
|
|
CircleStackIcon,
|
|
CodeBracketIcon,
|
|
Cog6ToothIcon,
|
|
CpuChipIcon,
|
|
CubeTransparentIcon,
|
|
KeyIcon,
|
|
PuzzlePieceIcon,
|
|
ShieldCheckIcon,
|
|
Square3Stack3DIcon,
|
|
} from "@heroicons/react/24/outline";
|
|
import { Fragment } from "react";
|
|
import { Link, Outlet, useLocation, useMatches } from "react-router";
|
|
|
|
export function meta({}: any) {
|
|
return [{ title: "Settings — Fabro" }];
|
|
}
|
|
|
|
export const handle = { hideHeader: true };
|
|
|
|
export type NavItem = {
|
|
name: string;
|
|
href: string;
|
|
icon: typeof Cog6ToothIcon;
|
|
description: string;
|
|
match: (pathname: string) => boolean;
|
|
};
|
|
|
|
export type NavSection = {
|
|
key: string;
|
|
label?: string;
|
|
items: NavItem[];
|
|
};
|
|
|
|
export const navSections: NavSection[] = [
|
|
{
|
|
key: "general",
|
|
label: "General",
|
|
items: [
|
|
{
|
|
name: "Models",
|
|
href: "/settings/models",
|
|
icon: CpuChipIcon,
|
|
description: "LLM providers and credentials.",
|
|
match: (p) => p.startsWith("/settings/models"),
|
|
},
|
|
{
|
|
name: "Integrations",
|
|
href: "/settings/integrations",
|
|
icon: PuzzlePieceIcon,
|
|
description: "Slack, GitHub, and other services.",
|
|
match: (p) => p.startsWith("/settings/integrations"),
|
|
},
|
|
{
|
|
name: "Sandboxes",
|
|
href: "/settings/sandboxes",
|
|
icon: CubeTransparentIcon,
|
|
description: "Where workflow stages execute.",
|
|
match: (p) => p.startsWith("/settings/sandboxes"),
|
|
},
|
|
],
|
|
},
|
|
{
|
|
key: "workflows",
|
|
label: "Workflows",
|
|
items: [
|
|
{
|
|
name: "Environments",
|
|
href: "/settings/environments",
|
|
icon: Square3Stack3DIcon,
|
|
description: "Server-managed runtime definitions for runs.",
|
|
match: (p) => p.startsWith("/settings/environments"),
|
|
},
|
|
{
|
|
name: "MCP servers",
|
|
href: "/settings/mcps",
|
|
icon: PuzzlePieceIcon,
|
|
description: "Server-managed MCP servers you can enable by name in workflows.",
|
|
match: (p) => p.startsWith("/settings/mcps"),
|
|
},
|
|
{
|
|
name: "Variables",
|
|
href: "/settings/variables",
|
|
icon: CodeBracketIcon,
|
|
description: "Non-sensitive values for run config interpolation.",
|
|
match: (p) => p.startsWith("/settings/variables"),
|
|
},
|
|
{
|
|
name: "Secrets",
|
|
href: "/settings/secrets",
|
|
icon: KeyIcon,
|
|
description: "Write-only values for workflow runs.",
|
|
match: (p) => p.startsWith("/settings/secrets"),
|
|
},
|
|
],
|
|
},
|
|
{
|
|
key: "administration",
|
|
label: "Administration",
|
|
items: [
|
|
{
|
|
name: "Server",
|
|
href: "/settings/server",
|
|
icon: Cog6ToothIcon,
|
|
description: "URLs, listen address, scheduler.",
|
|
match: (p) => p.startsWith("/settings/server"),
|
|
},
|
|
{
|
|
name: "Security",
|
|
href: "/settings/security",
|
|
icon: ShieldCheckIcon,
|
|
description: "Authentication methods and access.",
|
|
match: (p) => p.startsWith("/settings/security"),
|
|
},
|
|
{
|
|
name: "Storage",
|
|
href: "/settings/storage",
|
|
icon: CircleStackIcon,
|
|
description: "Database, runs, and artifacts.",
|
|
match: (p) => p.startsWith("/settings/storage"),
|
|
},
|
|
{
|
|
name: "Monitoring",
|
|
href: "/settings/monitoring",
|
|
icon: ChartBarSquareIcon,
|
|
description: "CPU, memory, disk, concurrency.",
|
|
match: (p) => p.startsWith("/settings/monitoring"),
|
|
},
|
|
],
|
|
},
|
|
{
|
|
key: "diagnostics",
|
|
items: [
|
|
{
|
|
name: "Live Events",
|
|
href: "/settings/live-events",
|
|
icon: BoltIcon,
|
|
description: "Real-time event stream.",
|
|
match: (p) => p.startsWith("/settings/live-events"),
|
|
},
|
|
],
|
|
},
|
|
];
|
|
|
|
const allItems = navSections.flatMap((s) => s.items);
|
|
|
|
function classNames(...classes: Array<string | false | null | undefined>) {
|
|
return classes.filter(Boolean).join(" ");
|
|
}
|
|
|
|
export default function SettingsLayout() {
|
|
const { pathname } = useLocation();
|
|
const matches = useMatches();
|
|
const currentName =
|
|
allItems.find((item) => item.match(pathname))?.name ?? "Settings";
|
|
const fullHeight = matches.some(
|
|
(m) => (m.handle as { fullHeight?: boolean } | undefined)?.fullHeight,
|
|
);
|
|
|
|
return (
|
|
<div
|
|
className={classNames(
|
|
"flex flex-col gap-6 lg:flex-row",
|
|
fullHeight && "min-h-0 flex-1",
|
|
)}
|
|
>
|
|
<aside className="lg:w-56 lg:shrink-0">
|
|
<nav className="sticky top-6">
|
|
<ul className="flex gap-1 overflow-x-auto lg:flex-col lg:gap-0.5">
|
|
{navSections.map((section, sectionIdx) => (
|
|
<Fragment key={section.key}>
|
|
{section.label ? (
|
|
<li
|
|
className={classNames(
|
|
"hidden lg:block lg:px-2.5 lg:pb-1 lg:text-xs lg:font-medium lg:uppercase lg:tracking-wider lg:text-fg-muted",
|
|
sectionIdx === 0 ? "lg:pt-0" : "lg:pt-4",
|
|
)}
|
|
>
|
|
{section.label}
|
|
</li>
|
|
) : sectionIdx > 0 ? (
|
|
<li
|
|
aria-hidden="true"
|
|
className="mx-1 self-stretch border-l border-line lg:mx-0 lg:my-2 lg:self-auto lg:border-l-0 lg:border-t"
|
|
/>
|
|
) : null}
|
|
{section.items.map((item) => {
|
|
const current = item.match(pathname);
|
|
return (
|
|
<li key={item.href}>
|
|
<Link
|
|
to={item.href}
|
|
aria-current={current ? "page" : undefined}
|
|
className={classNames(
|
|
"flex items-center gap-2 rounded-md px-2.5 py-2 text-sm whitespace-nowrap transition-colors",
|
|
current
|
|
? "bg-overlay text-fg"
|
|
: "text-fg-3 hover:bg-overlay hover:text-fg",
|
|
)}
|
|
>
|
|
<item.icon className="size-4 shrink-0" aria-hidden="true" />
|
|
{item.name}
|
|
</Link>
|
|
</li>
|
|
);
|
|
})}
|
|
</Fragment>
|
|
))}
|
|
</ul>
|
|
</nav>
|
|
</aside>
|
|
|
|
<div
|
|
className={classNames(
|
|
"min-w-0 flex-1",
|
|
fullHeight && "flex min-h-0 flex-col",
|
|
)}
|
|
>
|
|
<h1 className="mb-2 text-xl font-semibold tracking-tight text-fg">
|
|
{currentName}
|
|
</h1>
|
|
<Outlet />
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|