Fixes AutoMaker-Org#316, Fixes AutoMaker-Org#317 ## Problem 1: Race Condition (AutoMaker-Org#316) Success toasts and auto-tests executed before `syncSettingsToServer()` completed, causing "Server not found" errors because servers weren't persisted to disk yet. **Impact**: Add server → success toast → auto-test fails immediately ## Problem 2: JSON Format (AutoMaker-Org#317) JSON editor exported servers as object keyed by name (losing IDs), but backend required IDs to locate servers. After editing JSON, backend couldn't find servers. **Impact**: Edit JSON → server IDs lost → backend operations fail ## Solution ### Race Condition Fix Wait for sync completion before showing success notifications: ```typescript const syncSuccess = await syncSettingsToServer(); if (!syncSuccess) { toast.error('Failed to save MCP server to disk'); return; } toast.success('MCP server added'); // Only after sync succeeds ``` Applied to: - `handleSave` (edit flow) - `handleSecurityWarningConfirm` (add/import flows) - `handleToggleEnabled` (enable/disable) - `handleDelete` (remove server) ### JSON Format Fix Changed export from object to array with IDs preserved: **Before** (loses IDs): ```json { "mcpServers": { "shadcn": { "type": "stdio", "command": "cmd", ... } } } ``` **After** (preserves IDs): ```json { "mcpServers": [ { "id": "mcp-1767024860547-90lvecvle", "name": "shadcn", "type": "stdio", "command": "cmd", ... } ] } ``` Supports both formats for backward compatibility with Claude Desktop. ## Impact - ✅ Auto-test no longer fails with "Server not found" after adding - ✅ Success toasts appear only after persistence completes - ✅ JSON editor preserves server IDs - ✅ Backend operations succeed after JSON edits - ✅ Backward compatible with Claude Desktop object format ## Testing - ✅ `npm run build` passes with no TypeScript errors - ✅ Add server → sync completes → success toast → auto-test succeeds - ✅ JSON export shows array format with IDs - ✅ JSON edit preserves server IDs - ✅ Legacy object format still imports correctly - ✅ Tested with 3 MCP servers (shadcn, playwright, context7) ## Files Changed - `apps/ui/src/components/views/settings-view/mcp-servers/hooks/use-mcp-servers.ts` - Fixed async timing in 4 server operation handlers - Changed JSON export format from object to array - Added dual-format support for JSON import - Created helper functions for array and object processing 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Commits

Commits on Dec 29, 2025

docs: document MCP server bug fixes and patches

Merge branch 'main' of https://github.com/juniorcammel/automaker

Commits on Dec 30, 2025

fix: race condition and JSON format issues in MCP server management

chore: remove fork-specific documentation and patches