fix(import): match conflict-rename map by raw or sanitized server name

After #729, ImportedServer.OriginalName carries the raw source name while
the Web UI wizard keys its conflict-rename map by the sanitized preview
name (Server.Name). For a server whose name needs sanitizing and is
selected from 2+ sources, the httpapi rename lookup against OriginalName
missed and the conflict rename was silently dropped.

Match the rename map against either the raw OriginalName (CLI/documented
contract) or the sanitized Server.Name (wizard), keeping both paths
resolving. Add a regression test covering the conflict-rename +
sanitizable-name combination on both key shapes, and update the rename
field doc + regenerated OpenAPI.

Related #729

Author: Dumbris

internal/httpapi/import.go

@@ -164,10 +164,13 @@ type ImportFromPathRequest struct {
 	Path        string   `json:"path"`                   // File path to import from
 	Format      string   `json:"format,omitempty"`       // Optional format hint
 	ServerNames []string `json:"server_names,omitempty"` // Optional: import only these servers
-	// Rename maps OriginalName → new name. Applied after parsing so the
+	// Rename maps a server name → new name. Applied after parsing so the
 	// caller can disambiguate cross-source name collisions (Spec 046 v2 —
-	// e.g. "mcpproxy" → "mcpproxy_claude_code"). Keys not present in the
-	// imported set are ignored.
+	// e.g. "mcpproxy" → "mcpproxy_claude_code"). Keys are matched against
+	// either the raw source name (OriginalName) or the sanitized name shown
+	// in the preview (Server.Name); these differ for names that need
+	// sanitizing (e.g. "Figma Desktop" → "Figma_Desktop"). Keys not present
+	// in the imported set are ignored.
 	Rename map[string]string `json:"rename,omitempty"`
 }
 
@@ -392,13 +395,21 @@ func (s *Server) runImport(r *http.Request, content []byte, formatHint string, s
 		return nil, err
 	}
 
-	// Spec 046 v2: apply caller-supplied renames before persisting. Keyed
-	// by OriginalName so the caller doesn't need to know the parser's name-
-	// sanitization rules. Server.Name is rewritten in place; OriginalName is
-	// preserved on the response so the caller can reconcile the mapping.
+	// Spec 046 v2: apply caller-supplied renames before persisting. The CLI and
+	// the documented contract key the map by OriginalName (the raw source name),
+	// while the Web UI wizard keys it by the sanitized preview name it shows the
+	// user (Server.Name). After #729 those diverge for names that need
+	// sanitizing (e.g. "Figma Desktop" -> "Figma_Desktop"), so match either key
+	// to keep the conflict rename resolving on both paths (MCP-3003). Server.Name
+	// is rewritten in place; OriginalName is preserved on the response so the
+	// caller can reconcile the mapping.
 	if len(rename) > 0 {
 		for i := range result.Imported {
-			if newName, ok := rename[result.Imported[i].OriginalName]; ok && newName != "" {
+			newName, ok := rename[result.Imported[i].OriginalName]
+			if !ok {
+				newName, ok = rename[result.Imported[i].Server.Name]
+			}
+			if ok && newName != "" {
 				result.Imported[i].Server.Name = newName
 			}
 		}

internal/httpapi/import_test.go

@@ -214,6 +214,61 @@ func TestImportServersJSON_WithServerNamesFilter(t *testing.T) {
 	}
 }
 
+// TestRunImport_ConflictRenameSanitizableName covers the latent mismatch widened
+// by #729 (MCP-3003): after #729, ImportedServer.OriginalName carries the raw
+// source name ("Figma Desktop") while the wizard keys its conflict-rename map by
+// the sanitized preview name ("Figma_Desktop"). The rename map must resolve when
+// keyed by EITHER the raw OriginalName (CLI/documented contract) or the sanitized
+// Server.Name (Web UI wizard), otherwise the conflict rename is silently dropped.
+func TestRunImport_ConflictRenameSanitizableName(t *testing.T) {
+	const content = `{
+		"mcpServers": {
+			"Figma Desktop": {"command": "figma-mcp"}
+		},
+		"globalShortcut": "Ctrl+M"
+	}`
+
+	tests := []struct {
+		name     string
+		renameBy string // map key the caller used
+	}{
+		{name: "wizard keys by sanitized Server.Name", renameBy: "Figma_Desktop"},
+		{name: "CLI keys by raw OriginalName", renameBy: "Figma Desktop"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			logger := zap.NewNop().Sugar()
+			mock := &mockImportController{apiKey: "test-key"}
+			server := NewServer(mock, logger, nil)
+
+			req := httptest.NewRequest("POST", "/api/v1/servers/import/path", http.NoBody)
+			req.Header.Set("X-API-Key", "test-key")
+
+			const want = "Figma_Desktop_claude_desktop"
+			rename := map[string]string{tt.renameBy: want}
+
+			resp, err := server.runImport(req, []byte(content), "claude-desktop", nil, true, rename)
+			if err != nil {
+				t.Fatalf("runImport returned error: %v", err)
+			}
+			if len(resp.Imported) != 1 {
+				t.Fatalf("expected 1 imported server, got %d", len(resp.Imported))
+			}
+			got := resp.Imported[0]
+			// OriginalName remains the raw source name (post-#729 contract).
+			if got.OriginalName != "Figma Desktop" {
+				t.Errorf("OriginalName = %q, want %q", got.OriginalName, "Figma Desktop")
+			}
+			// The conflict rename must have been applied regardless of which key
+			// the caller used.
+			if got.Name != want {
+				t.Errorf("renamed Server.Name = %q, want %q (rename keyed by %q was dropped)", got.Name, want, tt.renameBy)
+			}
+		})
+	}
+}
+
 func TestImportServers_FileUpload(t *testing.T) {
 	logger := zap.NewNop().Sugar()
 	mock := &mockImportController{apiKey: "test-key"}

oas/docs.go

@@ -2341,10 +2341,13 @@ components:
           additionalProperties:
             type: string
           description: |-
-            Rename maps OriginalName → new name. Applied after parsing so the
+            Rename maps a server name → new name. Applied after parsing so the
             caller can disambiguate cross-source name collisions (Spec 046 v2 —
-            e.g. "mcpproxy" → "mcpproxy_claude_code"). Keys not present in the
-            imported set are ignored.
+            e.g. "mcpproxy" → "mcpproxy_claude_code"). Keys are matched against
+            either the raw source name (OriginalName) or the sanitized name shown
+            in the preview (Server.Name); these differ for names that need
+            sanitizing (e.g. "Figma Desktop" → "Figma_Desktop"). Keys not present
+            in the imported set are ignored.
           type: object
         server_names:
           description: 'Optional: import only these servers'