feat(mcp): full catalog + marketplace + sources manager (Phase 2-3.2)

Workspace-only end-to-end MCP catalog + marketplace replacing the static
presets.ts and the upstream /settings/mcp surfaces.

Phase 2 — File-backed catalog:
- assets/mcp-presets.seed.json + ~/.hermes/mcp-presets.json (atomic
  bootstrap via tmp+linkSync, mtime+ino+ctime+size cache, malformed-file
  preservation, schema validation: id regex, transport-specific fields,
  env key regex, https URLs, category allowlist, duplicate-id rejection,
  unknown-field warnings)
- src/server/mcp-input-validate.ts: shared parseMcpServerInput returning
  per-field {path, message} errors; promoted from inline definition
- src/routes/api/mcp/presets.ts GET handler

Phase 3.0 — Federated marketplace:
- src/server/mcp-hub/{cache,trust,index,types}.ts + sources/{mcp-get,
  local-file}.ts: Smithery registry adapter (replaces speculative
  registry.mcp.run NXDOMAIN), ETag/If-Modified-Since with 304 reuse,
  rate-limit handling, parallel Promise.allSettled across sources with
  8s per-source timeout, dedupe by source+id+name, fallback to
  local-file when remote degraded
- Trust hardening: shell metachar reject, transport allowlist, env-key
  regex, control-char + absolute-path attack defenses, inline-exec
  flag detection (-c, -lc, -e for sh/bash/python/node/perl/ruby)
- src/screens/mcp/components/install-confirmation-dialog.tsx: 2-click
  commit with full template preview (command/args/env masked) and
  AbortController on dismiss
- Disk persistence for tool-discovery cache (mcp-tools-cache.ts) +
  hermes-mcp CLI bridge (mcp-cli-bridge.ts) for live test/tool
  enumeration in fallback mode

Phase 3.2 — User-configurable sources:
- ~/.hermes/mcp-hub-sources.json schema (built-ins always present,
  protected from mutation; user can add HTTPS-only generic-json
  sources with trust+format)
- src/routes/api/mcp/hub-sources{,.$id}.ts CRUD with per-process mutex
  (read-modify-write race protection)
- generic-json adapter: SSRF guard (private/loopback/link-local/IPv6
  ULA all rejected after DNS resolution, redirects disabled), 5MB
  response-size cap (streaming read), trust hard-cap at 'community'
  for user-source entries, source field 'user:<id>' for dedupe
- src/screens/mcp/components/sources-manager-dialog.tsx UI

Polish:
- Placeholder detection at install confirmation (inline fill form
  blocks commit until /path/to/, <your-...>, empty *_TOKEN/_KEY/etc
  resolved)
- Test result UX hints when stdio Connection closed + placeholder args
  or http fetch failed + placeholder url
- Env-ref preserved in normalize (${VAR_NAME} no longer masked) +
  Edit dialog diagnostic

UI: Skills-pattern parity for /mcp screen (Tabs + Marketplace tab,
Switch primitive, Button primitives, DialogRoot/Content, primary-*
Tailwind classes matching skills-screen.tsx). Single-row toolbar
(tabs + search + filter). Removed All + Catalog tabs, kept Installed +
Marketplace.

Backend:
- gateway-capabilities probeMcp uses authenticated dashboardFetch
  (Codex MAJOR fix); probeMcpConfigKey + isLocalhostDeployment for
  mcpFallback capability
- routes/mcp.tsx route gate accepts mcp || mcpFallback
- mcp-normalize.ts headers.Authorization + env *_TOKEN/_KEY/_SECRET
  /_AUTH/_APIKEY auth detection upgrades authType to 'bearer'

Removed (replaced by /mcp):
- src/screens/settings/mcp-settings-screen.tsx (759 LOC)
- src/routes/settings/mcp.tsx
- src/routes/api/mcp/{servers,reload}.ts (orphaned endpoints; reload
  posted to gateway 404s)
- src/screens/mcp/presets.ts (static array, replaced by file-backed)
- settings-sidebar MCP nav entries (replaced by main /mcp route)

Tests: 263+ passing across 19+ MCP suites — input-validate, presets-
store, hub-cache/trust/unified-search, sources/{mcp-get,local-file,
generic-json}, hub-sources-store, mcp-tools-cache, ssrf-guard,
marketplace-install-confirmation, marketplace-placeholder-detection,
hub-search/-presets/-hub-sources route tests. Pre-existing 2
gateway-capabilities env-resolution failures unrelated.

Reviewers: Codex critic 4 passes (Phase 2 REJECTED → 8 fixes applied,
Phase 3.0 APPROVED-WITH-CHANGES → 4 fixes, Phase 3.2 REJECTED → 6
fixes including SSRF guard + response-size cap + concurrent-CRUD
mutex + trust cap). Architect approved final pass.

Worked with Interstellar Code

Author: Interstellar-code

assets/mcp-presets.seed.json

@@ -0,0 +1,122 @@
+{
+  "version": 1,
+  "presets": [
+    {
+      "id": "github",
+      "name": "GitHub",
+      "description": "Read repos, issues, PRs via the GitHub MCP server.",
+      "category": "Official Presets",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["dev", "git"],
+      "template": {
+        "name": "github",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-everything"],
+        "env": { "GITHUB_PERSONAL_ACCESS_TOKEN": "" },
+        "authType": "none",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "filesystem",
+      "name": "Filesystem",
+      "description": "Read and write files within an allow-listed root.",
+      "category": "Official Presets",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["files"],
+      "template": {
+        "name": "filesystem",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/root"],
+        "authType": "none",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "postgres",
+      "name": "Postgres",
+      "description": "Run read-only SQL against a Postgres database.",
+      "category": "Official Presets",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["db", "sql"],
+      "template": {
+        "name": "postgres",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": [
+          "-y",
+          "@modelcontextprotocol/server-postgres",
+          "postgresql://user:pass@host:5432/db"
+        ],
+        "authType": "none",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "slack",
+      "name": "Slack",
+      "description": "Read and post messages via the Slack MCP server.",
+      "category": "Communication",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["chat"],
+      "template": {
+        "name": "slack",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-slack"],
+        "env": { "SLACK_BOT_TOKEN": "", "SLACK_TEAM_ID": "" },
+        "authType": "none",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "linear",
+      "name": "Linear",
+      "description": "Query Linear issues and projects.",
+      "category": "Productivity",
+      "homepage": "https://linear.app",
+      "tags": ["issues"],
+      "template": {
+        "name": "linear",
+        "transportType": "http",
+        "url": "https://mcp.linear.app/mcp",
+        "authType": "oauth",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "memory",
+      "name": "Memory",
+      "description": "Persistent knowledge-graph memory for agents.",
+      "category": "Official Presets",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["memory"],
+      "template": {
+        "name": "memory",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-memory"],
+        "authType": "none",
+        "toolMode": "all"
+      }
+    },
+    {
+      "id": "fetch",
+      "name": "Fetch",
+      "description": "Fetch arbitrary HTTP content for the agent to read.",
+      "category": "Official Presets",
+      "homepage": "https://github.com/modelcontextprotocol/servers",
+      "tags": ["web"],
+      "template": {
+        "name": "fetch",
+        "transportType": "stdio",
+        "command": "npx",
+        "args": ["-y", "@modelcontextprotocol/server-fetch"],
+        "authType": "none",
+        "toolMode": "all"
+      }
+    }
+  ]
+}

src/components/settings/settings-sidebar.tsx

@@ -11,7 +11,6 @@ export type SettingsNavId =
   | 'appearance'
   | 'chat'
   | 'notifications'
-  | 'mcp'
   | 'language'
 
 type NavItem = { id: SettingsNavId; label: string }
@@ -26,7 +25,6 @@ export const SETTINGS_NAV_ITEMS: Array<NavItem> = [
   { id: 'appearance', label: 'Appearance' },
   { id: 'chat', label: 'Chat' },
   { id: 'notifications', label: 'Notifications' },
-  { id: 'mcp', label: 'MCP Servers' },
   { id: 'language', label: 'Language' },
 ]
 
@@ -55,13 +53,6 @@ function renderItem({
       {item.label}
     </>
   )
-  if (item.id === 'mcp') {
-    return (
-      <Link key={item.id} to="/settings/mcp" className={className}>
-        {content}
-      </Link>
-    )
-  }
   return (
     <Link
       key={item.id}
@@ -121,13 +112,6 @@ export function SettingsMobilePills({ activeId }: { activeId: SettingsNavId }) {
           'shrink-0 rounded-full px-3 py-1.5 text-xs font-medium transition-colors',
           isActive ? activeClass : inactiveClass,
         )
-        if (item.id === 'mcp') {
-          return (
-            <Link key={item.id} to="/settings/mcp" className={className}>
-              {item.label}
-            </Link>
-          )
-        }
         return (
           <Link
             key={item.id}

src/lib/feature-gates.ts

@@ -9,6 +9,7 @@ export type EnhancedFeature =
   | 'config'
   | 'jobs'
   | 'mcp'
+  | 'mcpFallback'
 
 const FEATURE_LABELS: Record<EnhancedFeature, string> = {
   sessions: 'Sessions',
@@ -17,6 +18,7 @@ const FEATURE_LABELS: Record<EnhancedFeature, string> = {
   config: 'Configuration',
   jobs: 'Jobs',
   mcp: 'MCP Servers',
+  mcpFallback: 'MCP Servers (config fallback)',
 }
 
 function normalizeFeature(
@@ -29,9 +31,10 @@ function normalizeFeature(
     normalized === 'memory' ||
     normalized === 'config' ||
     normalized === 'jobs' ||
-    normalized === 'mcp'
+    normalized === 'mcp' ||
+    normalized === 'mcpfallback'
   ) {
-    return normalized
+    return normalized === 'mcpfallback' ? 'mcpFallback' : normalized
   }
 
   return null