feat(servers): Phase 4 — Wire entry points

Autonomous decisions:
- Plus icon for guided custom, FileJson for manifest — distinguishes panel vs full JSON editor at a glance
- Reused P2 customServerPanelSpace state — already wired; no rename to customServerPanelOpen

Signed-off-by: crimsonsunset <jsangio1@gmail.com>

Author: crimsonsunset

apps/desktop/src/components/ConfigEditorModal.tsx

@@ -8,6 +8,7 @@ import { useToast, ToastContainer } from '@mcpmux/ui';
 import USER_SPACE_CONFIG_SCHEMA from '../../../../schemas/user-space.schema.json';
 import { RequestServerCTA } from './Contribute';
 import { MonacoJsonEditor } from './monaco-json-editor.component';
+import { CustomServerPanel } from '@/features/servers/CustomServerPanel';
 
 const EDITOR_MOUNT_TIMEOUT_MS = 10_000;
 
@@ -23,39 +24,6 @@ type SpaceConfigJson = {
   [key: string]: unknown;
 };
 
-const CUSTOM_SERVER_BASE_KEY = 'custom-server';
-
-function nextCustomServerKey(servers: Record<string, unknown>): string {
-  let suffix = 1;
-
-  while (true) {
-    const key = suffix === 1 ? CUSTOM_SERVER_BASE_KEY : CUSTOM_SERVER_BASE_KEY + '-' + suffix;
-    if (!(key in servers)) {
-      return key;
-    }
-    suffix += 1;
-  }
-}
-
-function addCustomServerDraft(config: SpaceConfigJson): SpaceConfigJson {
-  const mcpServers = { ...(config.mcpServers ?? {}) };
-  const key = nextCustomServerKey(mcpServers);
-  const suffix =
-    key === CUSTOM_SERVER_BASE_KEY ? '' : ' ' + key.replace(CUSTOM_SERVER_BASE_KEY + '-', '');
-
-  mcpServers[key] = {
-    name: 'New Custom Server' + suffix,
-    command: '',
-    args: [],
-    env: {},
-  };
-
-  return {
-    ...config,
-    mcpServers,
-  };
-}
-
 export function ConfigEditorModal({
   spaceId,
   spaceName,
@@ -72,6 +40,7 @@ export function ConfigEditorModal({
   const [editorReady, setEditorReady] = useState(false);
   const [editorMounted, setEditorMounted] = useState(false);
   const [editorLoadFailed, setEditorLoadFailed] = useState(false);
+  const [showCustomServerPanel, setShowCustomServerPanel] = useState(false);
   const editorRef = useRef<editor.IStandaloneCodeEditor | null>(null);
   const { toasts, success, error: showError } = useToast();
 
@@ -185,19 +154,12 @@ export function ConfigEditorModal({
     editorRef.current?.getAction('actions.find')?.run();
   }, []);
 
+  /**
+   * Open the guided custom-server panel docked over this manifest editor.
+   */
   const handleInsertCustomServer = useCallback(() => {
-    try {
-      const parsed = JSON.parse(content || '{"mcpServers":{}}') as SpaceConfigJson;
-      setContent(JSON.stringify(addCustomServerDraft(parsed), null, 2));
-      setIsValidJson(true);
-      setError(null);
-    } catch (e) {
-      const message = e instanceof Error ? e.message : String(e);
-      setIsValidJson(false);
-      setError(t('configEditorModal.validation.invalidJson', { message }));
-      showError(t('configEditorModal.toast.invalidJsonTitle'), message);
-    }
-  }, [content, showError, t]);
+    setShowCustomServerPanel(true);
+  }, []);
 
   // Configure Monaco before mount to set up JSON schema validation
   const handleEditorBeforeMount = (monaco: Monaco) => {
@@ -434,6 +396,17 @@ export function ConfigEditorModal({
           )}
         </div>
       </div>
+
+      {showCustomServerPanel && (
+        <CustomServerPanel
+          spaceId={spaceId}
+          spaceName={spaceName}
+          onClose={() => setShowCustomServerPanel(false)}
+          onSaved={() => {
+            void loadConfig();
+          }}
+        />
+      )}
     </>
   );
 }

apps/desktop/src/features/servers/AddServerMenu.tsx

@@ -11,14 +11,16 @@ import {
 interface AddServerMenuProps {
   /** Opens the Discover page to browse the community server registry. */
   onDiscover: () => void;
-  /** Opens the Space JSON editor to add a custom server definition. */
+  /** Opens the guided custom-server panel (Form / JSON). */
   onCustom: () => void;
+  /** Opens the full-space JSON manifest editor. */
+  onViewManifest: () => void;
 }
 
 /**
- * Dropdown for the two ways to add MCP servers: registry discover vs custom JSON.
+ * Dropdown for adding MCP servers: registry discover, guided custom setup, or full manifest.
  */
-export function AddServerMenu({ onDiscover, onCustom }: AddServerMenuProps) {
+export function AddServerMenu({ onDiscover, onCustom, onViewManifest }: AddServerMenuProps) {
   const { t } = useTranslation('servers');
 
   return (
@@ -39,12 +41,19 @@ export function AddServerMenu({ onDiscover, onCustom }: AddServerMenuProps) {
           data-testid="add-server-option-discover"
         />
         <DropdownMenuItem
-          icon={FileJson}
+          icon={Plus}
           label={t('addMenu.custom')}
           description={t('addMenu.customDesc')}
           onSelect={onCustom}
           data-testid="add-server-option-custom"
         />
+        <DropdownMenuItem
+          icon={FileJson}
+          label={t('addMenu.viewManifest')}
+          description={t('addMenu.viewManifestDesc')}
+          onSelect={onViewManifest}
+          data-testid="add-server-option-view-manifest"
+        />
       </DropdownMenuContent>
     </DropdownMenu>
   );

apps/desktop/src/features/servers/ServersPage.tsx

@@ -1670,6 +1670,9 @@ export function ServersPage() {
                 onCustom={() =>
                   setCustomServerPanelSpace({ id: viewSpace.id, name: viewSpace.name })
                 }
+                onViewManifest={() =>
+                  setEditConfigSpace({ id: viewSpace.id, name: viewSpace.name })
+                }
               />
             </div>
           )}
@@ -1712,6 +1715,9 @@ export function ServersPage() {
                 onCustom={() =>
                   setCustomServerPanelSpace({ id: viewSpace.id, name: viewSpace.name })
                 }
+                onViewManifest={() =>
+                  setEditConfigSpace({ id: viewSpace.id, name: viewSpace.name })
+                }
               />
             </div>
           )}

apps/desktop/src/locales/en/servers.json

@@ -189,7 +189,9 @@
     "discover": "Discover from registry",
     "discoverDesc": "Browse the community catalog — install with guided setup, OAuth, and credential fields.",
     "custom": "Add custom server",
-    "customDesc": "Edit your Space JSON config for local CLIs, private servers, or anything not in the registry."
+    "customDesc": "Guided setup for local CLIs, private servers, or anything not in the registry.",
+    "viewManifest": "View full server manifest",
+    "viewManifestDesc": "Edit the entire Space JSON file — all servers, metadata, and raw config."
   },
   "filters": {
     "appliedTitle": "Applied filters",